Commit 3add7574 authored by Iustin Pop's avatar Iustin Pop

Rename htools/ to src/

Per offline discussions, this is the first patch of the
renames. Tested with "make distcheck", seems to work fine.

The only change outside of the renaming is a bit of simplification in
the .gitignore rules; otherwise, simply s/htools/src/.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 75b32fff
:set -ihtools -ihtest
:set -isrc -ihtest
......@@ -11,6 +11,10 @@
*.o
*.hi
*.hp
*.tix
*.prof
*.stat
.hpc/
# /
/Makefile
......@@ -91,6 +95,9 @@
/htest/hroller
/htest/hscan
/htest/hspace
/htest/hpc-htools
/htest/hpc-mon-collector
/htest/test
# tools
/tools/kvm-ifup
......@@ -112,28 +119,14 @@
/scripts/gnt-network
/scripts/gnt-storage
# htools-specific rules
/htools/apidoc
/htools/.hpc
/htools/coverage
/htools/mon-collector
/htools/htools
/htools/hconfd
/htools/ganeti-confd
/htools/rpc-test
/htest/hpc-htools
/htest/hpc-mon-collector
/htest/test
/htools/*.prof*
/htools/*.stat
/htools/*.tix
/htest/*.prof*
/htest/*.stat
/htest/*.tix
/.hpc/
/*.tix
# haskell-specific rules
/src/mon-collector
/src/htools
/src/hconfd
/src/ganeti-confd
/src/rpc-test
/htools/Ganeti/Constants.hs
/htools/Ganeti/Version.hs
# automatically-built Haskell files
/src/Ganeti/Constants.hs
/src/Ganeti/Version.hs
/htest/Test/Ganeti/TestImports.hs
This diff is collapsed.
......@@ -759,7 +759,7 @@ def WriteHaskellCompletion(sw, script, htools=True, debug=True):
"""
if htools:
cmd = "./htools/htools"
cmd = "./src/htools"
env = {"HTOOLS": script}
script_name = script
func_name = "htools_%s" % script
......@@ -854,12 +854,12 @@ def main():
# ganeti-confd, if enabled
if _autoconf.ENABLE_CONFD:
WriteHaskellCompletion(sw, "htools/ganeti-confd", htools=False,
WriteHaskellCompletion(sw, "src/ganeti-confd", htools=False,
debug=debug)
# mon-collector, if monitoring is enabled
if _autoconf.ENABLE_MONITORING:
WriteHaskellCmdCompletion(sw, "htools/mon-collector", debug=debug)
WriteHaskellCmdCompletion(sw, "src/mon-collector", debug=debug)
# Reset extglob to original value
sw.Write("[[ -n \"$gnt_shopt_extglob\" ]] && $gnt_shopt_extglob")
......
......@@ -16,10 +16,10 @@ ln -s $PWD/doc/examples $tmpdir/doc
mv $tmpdir/lib $tmpdir/ganeti
ln -T -s $tmpdir/ganeti $tmpdir/lib
mkdir -p $tmpdir/htools $tmpdir/htest
mkdir -p $tmpdir/src $tmpdir/htest
for hfile in htools ganeti-confd mon-collector; do
if [ -e htools/$hfile ]; then
ln -s $PWD/htools/$hfile $tmpdir/htools/
if [ -e src/$hfile ]; then
ln -s $PWD/src/$hfile $tmpdir/src/
fi
done
......
......@@ -134,7 +134,7 @@ Or, more interactively::
$ ghci
λ> :set -ddump-splices
λ> :l htools/Ganeti/Objects.hs
λ> :l src/Ganeti/Objects.hs
And you will get the spliced code as the module is loaded.
......@@ -150,9 +150,9 @@ build profiling code. The recommended way is to run ``make hs-prof``,
or alternatively the manual sequence is::
$ make clean
$ make htools/htools HEXTRA="-osuf .o"
$ rm htools/htools
$ make htools/htools HEXTRA="-osuf .prof_o -prof -auto-all"
$ make src/htools HEXTRA="-osuf .o"
$ rm src/htools
$ make src/htools HEXTRA="-osuf .prof_o -prof -auto-all"
This will build the binary twice, per the TemplateHaskell
documentation, the second one with profiling enabled.
......
../htools/htools.hs
\ No newline at end of file
../src/htools.hs
\ No newline at end of file
../htools/mon-collector.hs
\ No newline at end of file
../src/mon-collector.hs
\ No newline at end of file
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