Commit 1494a4cc authored by Iustin Pop's avatar Iustin Pop

htools: switch hspace to the generic binary

This is the last patch of the binaries conversion.

As information, we now have a single binary that is approx. 5.4MiB in
size, compared to 4 binaries that were approx. 5.1-5.2MiB in size;
this will result in a smaller package and install size, and the single
compilation phase should also help.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 7b695a0d
......@@ -98,7 +98,6 @@
/htools/.hpc
/htools/coverage
/htools/hspace
/htools/htools
/htools/test
/htools/*.prof*
......
......@@ -306,10 +306,8 @@ docrst = \
doc/upgrade.rst \
doc/walkthrough.rst
HS_PROGS = \
htools/hspace \
htools/htools
HS_BIN_ROLES = hbal hscan
HS_PROGS = htools/htools
HS_BIN_ROLES = hbal hscan hspace
HS_ALL_PROGS = $(HS_PROGS) htools/test
HS_PROG_SRCS = $(patsubst %,%.hs,$(HS_ALL_PROGS))
......@@ -344,6 +342,7 @@ HS_LIB_SRCS = \
htools/Ganeti/HTools/Program/Hail.hs \
htools/Ganeti/HTools/Program/Hbal.hs \
htools/Ganeti/HTools/Program/Hscan.hs \
htools/Ganeti/HTools/Program/Hspace.hs \
htools/Ganeti/Jobs.hs \
htools/Ganeti/Luxi.hs \
htools/Ganeti/OpCodes.hs
......
......@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-}
module Main (main) where
module Ganeti.HTools.Program.Hspace (main) where
import Control.Monad
import Data.Char (toUpper, isAlphaNum)
......
......@@ -33,12 +33,14 @@ 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
import qualified Ganeti.HTools.Program.Hspace as Hspace
-- | Supported binaries.
personalities :: [(String, IO ())]
personalities = [ ("hail", Hail.main)
, ("hbal", Hbal.main)
, ("hscan", Hscan.main)
, ("hspace", Hspace.main)
]
-- | Display usage and exit.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment