From 2997cb0a22623ab3f2f70c101420540d05997464 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 30 Aug 2012 01:25:45 +0200
Subject: [PATCH] Move Version.hs up from under HTools/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This is another module that is generic, and not htools-specific.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
.gitignore | 2 +-
Makefile.am | 6 +++---
htools/Ganeti/Daemon.hs | 2 +-
htools/Ganeti/HTools/CLI.hs | 2 +-
htools/Ganeti/{HTools => }/Version.hs.in | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
rename htools/Ganeti/{HTools => }/Version.hs.in (72%)
diff --git a/.gitignore b/.gitignore
index 3097b498f..1beca7f6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -121,6 +121,6 @@
/.hpc/
/*.tix
-/htools/Ganeti/HTools/Version.hs
/htools/Ganeti/Constants.hs
+/htools/Ganeti/Version.hs
/htest/Test/Ganeti/TestImports.hs
diff --git a/Makefile.am b/Makefile.am
index a38a4ec20..b5166412f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -380,7 +380,7 @@ HPCEXCL = --exclude Main \
--exclude Ganeti.Constants \
--exclude Ganeti.THH \
--exclude Ganeti.HTools.QC \
- --exclude Ganeti.HTools.Version \
+ --exclude Ganeti.Version \
--exclude Test.Ganeti.TestCommon \
--exclude Test.Ganeti.TestHTools \
--exclude Test.Ganeti.TestHelper \
@@ -467,7 +467,7 @@ HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
HS_BUILT_SRCS = \
htest/Test/Ganeti/TestImports.hs \
htools/Ganeti/Constants.hs \
- htools/Ganeti/HTools/Version.hs
+ htools/Ganeti/Version.hs
HS_BUILT_SRCS_IN = $(patsubst %,%.in,$(HS_BUILT_SRCS))
$(RUN_IN_TEMPDIR): | stamp-directories
@@ -1106,7 +1106,7 @@ regen-vcs-version:
$(MAKE) $(AM_MAKEFLAGS) vcs-version; \
fi
-htools/Ganeti/HTools/Version.hs: htools/Ganeti/HTools/Version.hs.in \
+htools/Ganeti/Version.hs: htools/Ganeti/Version.hs.in \
vcs-version $(built_base_sources)
set -e; \
VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
diff --git a/htools/Ganeti/Daemon.hs b/htools/Ganeti/Daemon.hs
index 80f74f143..8fe3a83fc 100644
--- a/htools/Ganeti/Daemon.hs
+++ b/htools/Ganeti/Daemon.hs
@@ -68,7 +68,7 @@ import Ganeti.Logging
import Ganeti.Runtime
import Ganeti.BasicTypes
import Ganeti.HTools.Utils
-import qualified Ganeti.HTools.Version as Version(version)
+import qualified Ganeti.Version as Version (version)
import qualified Ganeti.Constants as C
import qualified Ganeti.Ssconf as Ssconf
diff --git a/htools/Ganeti/HTools/CLI.hs b/htools/Ganeti/HTools/CLI.hs
index ebdc17488..6f437c77f 100644
--- a/htools/Ganeti/HTools/CLI.hs
+++ b/htools/Ganeti/HTools/CLI.hs
@@ -94,7 +94,7 @@ import System.Info
import System.Exit
import Text.Printf (printf)
-import qualified Ganeti.HTools.Version as Version(version)
+import qualified Ganeti.Version as Version (version)
import qualified Ganeti.HTools.Container as Container
import qualified Ganeti.HTools.Node as Node
import qualified Ganeti.Constants as C
diff --git a/htools/Ganeti/HTools/Version.hs.in b/htools/Ganeti/Version.hs.in
similarity index 72%
rename from htools/Ganeti/HTools/Version.hs.in
rename to htools/Ganeti/Version.hs.in
index d0721e77a..012be8247 100644
--- a/htools/Ganeti/HTools/Version.hs.in
+++ b/htools/Ganeti/Version.hs.in
@@ -2,11 +2,11 @@
{- | Auto-generated module holding version information.
-}
-module Ganeti.HTools.Version
+module Ganeti.Version
(
version
) where
-- | The version of the sources.
version :: String
-version = "(ganeti-htools) version %ver%"
+version = "(ganeti) version %ver%"
--
GitLab