From 7b695a0d7b0c0c3d02a95a67c147e7dfb8884500 Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Fri, 8 Jul 2011 11:45:10 +0200 Subject: [PATCH] htools: switch hscan to the generic binary Signed-off-by: Iustin Pop Reviewed-by: Guido Trotter --- .gitignore | 1 - Makefile.am | 4 ++-- htools/{hscan.hs => Ganeti/HTools/Program/Hscan.hs} | 2 +- htools/htools.hs | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) rename htools/{hscan.hs => Ganeti/HTools/Program/Hscan.hs} (99%) diff --git a/.gitignore b/.gitignore index fa3b3d7..3073a5c 100644 --- a/.gitignore +++ b/.gitignore @@ -98,7 +98,6 @@ /htools/.hpc /htools/coverage -/htools/hscan /htools/hspace /htools/htools /htools/test diff --git a/Makefile.am b/Makefile.am index c60eccc..7597e38 100644 --- a/Makefile.am +++ b/Makefile.am @@ -307,10 +307,9 @@ docrst = \ doc/walkthrough.rst HS_PROGS = \ - htools/hscan \ htools/hspace \ htools/htools -HS_BIN_ROLES = hbal +HS_BIN_ROLES = hbal hscan HS_ALL_PROGS = $(HS_PROGS) htools/test HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS)) @@ -344,6 +343,7 @@ HS_LIB_SRCS = \ htools/Ganeti/HTools/Utils.hs \ htools/Ganeti/HTools/Program/Hail.hs \ htools/Ganeti/HTools/Program/Hbal.hs \ + htools/Ganeti/HTools/Program/Hscan.hs \ htools/Ganeti/Jobs.hs \ htools/Ganeti/Luxi.hs \ htools/Ganeti/OpCodes.hs diff --git a/htools/hscan.hs b/htools/Ganeti/HTools/Program/Hscan.hs similarity index 99% rename from htools/hscan.hs rename to htools/Ganeti/HTools/Program/Hscan.hs index 261fce3..3fd39cb 100644 --- a/htools/hscan.hs +++ b/htools/Ganeti/HTools/Program/Hscan.hs @@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -} -module Main (main) where +module Ganeti.HTools.Program.Hscan (main) where import Control.Monad import Data.Maybe (isJust, fromJust, fromMaybe) diff --git a/htools/htools.hs b/htools/htools.hs index a2c2b48..acf1a50 100644 --- a/htools/htools.hs +++ b/htools/htools.hs @@ -32,11 +32,13 @@ import System.IO import Ganeti.HTools.Utils import qualified Ganeti.HTools.Program.Hail as Hail import qualified Ganeti.HTools.Program.Hbal as Hbal +import qualified Ganeti.HTools.Program.Hscan as Hscan -- | Supported binaries. personalities :: [(String, IO ())] personalities = [ ("hail", Hail.main) , ("hbal", Hbal.main) + , ("hscan", Hscan.main) ] -- | Display usage and exit. -- 1.7.10.4