[PATCH 8/3] Move build helpers to scripts/ subdirectory
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Feb 18, 2011, 04:55 UTC
- Message-ID
- <20110218045526.GI15643@elie>
- In-Reply-To
- <20110218045139.GG15643@elie>
So the toplevel directory can be less cluttered and new build system hackers can know where to look to get acquainted with it.
While we're renaming things, make the names of these scripts follow a more consistent scheme (using dashes rather than underscores to separate words and including a .sh suffix).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- I think I'd prefer to omit the .sh suffix for helpers like generate-cmdlist but this way follows the prevailing style.
Makefile | 22 ++++++++++---------- GIT-VERSION-GEN => scripts/GIT-VERSION-GEN | 0 check_bindir => scripts/check-bindir.sh | 0 check-builtins.sh => scripts/check-builtins.sh | 0 fixup-builtins => scripts/fixup-builtins.sh | 0 generate-cmdlist.sh => scripts/generate-cmdlist.sh | 0 unimplemented.sh => scripts/unimplemented.sh | 0 wrap-for-bin.sh => scripts/wrap-for-bin.sh | 0 8 files changed, 11 insertions(+), 11 deletions(-) rename GIT-VERSION-GEN => scripts/GIT-VERSION-GEN (100%) rename check_bindir => scripts/check-bindir.sh (100%) rename check-builtins.sh => scripts/check-builtins.sh (100%) rename fixup-builtins => scripts/fixup-builtins.sh (100%) rename generate-cmdlist.sh => scripts/generate-cmdlist.sh (100%) rename unimplemented.sh => scripts/unimplemented.sh (100%) rename wrap-for-bin.sh => scripts/wrap-for-bin.sh (100%)
diff --git a/Makefile b/Makefile index 61981e5..1c10e29 100644 --- a/Makefile +++ b/Makefile @@ -244,7 +244,7 @@ all:: # Define NATIVE_CRLF if your platform uses CRLF for line endings. GIT-VERSION-FILE: FORCE - @$(SHELL_PATH) ./GIT-VERSION-GEN + @$(SHELL_PATH) scripts/GIT-VERSION-GEN -include GIT-VERSION-FILE uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') @@ -1697,10 +1697,10 @@ $(BUILT_INS): git$X ln -s git$X $@ 2>/dev/null || \ cp git$X $@ -common-cmds.h: ./generate-cmdlist.sh command-list.txt +common-cmds.h: scripts/generate-cmdlist.sh command-list.txt common-cmds.h: $(wildcard Documentation/git-*.txt) - $(QUIET_GEN)./generate-cmdlist.sh > $@+ && mv $@+ $@ + $(QUIET_GEN)scripts/generate-cmdlist.sh > $@+ && mv $@+ $@ define cmd_munge_script $(RM) $@ $@+ && \ @@ -1785,11 +1785,11 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/ chmod +x $@+ && \ mv $@+ $@ else # NO_PERL -$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh +$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : scripts/unimplemented.sh $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ - unimplemented.sh >$@+ && \ + $< >$@+ && \ chmod +x $@+ && \ mv $@+ $@ endif # NO_PERL @@ -1808,11 +1808,11 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py chmod +x $@+ && \ mv $@+ $@ else # NO_PYTHON -$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : unimplemented.sh +$(patsubst %.py,%,$(SCRIPT_PYTHON)): % : scripts/unimplemented.sh $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \ - unimplemented.sh >$@+ && \ + $< >$@+ && \ chmod +x $@+ && \ mv $@+ $@ endif # NO_PYTHON @@ -2111,7 +2111,7 @@ test_bindir_programs := $(patsubst %,bin-wrappers/%,$(BINDIR_PROGRAMS_NEED_X) $( all:: $(TEST_PROGRAMS) $(test_bindir_programs) -bin-wrappers/%: wrap-for-bin.sh +bin-wrappers/%: scripts/wrap-for-bin.sh @mkdir -p bin-wrappers $(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@BUILD_DIR@@|$(shell pwd)|' \ @@ -2164,7 +2164,7 @@ check: common-cmds.h fi remove-dashes: - ./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS) + scripts/fixup-builtins.sh $(BUILT_INS) $(PROGRAMS) $(SCRIPTS) ### Installation rules @@ -2236,7 +2236,7 @@ endif ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \ cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \ done && \ - ./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X" + scripts/check-bindir.sh "z$$bindir" "z$$execdir" "$$bindir/git-add$X" install-gitweb: $(MAKE) -C gitweb install @@ -2415,7 +2415,7 @@ check-docs:: ### Make sure built-ins do not have dups and listed in git.c # check-builtins:: - ./check-builtins.sh + scripts/check-builtins.sh ### Test suite coverage testing # diff --git a/GIT-VERSION-GEN b/scripts/GIT-VERSION-GEN similarity index 100% rename from GIT-VERSION-GEN rename to scripts/GIT-VERSION-GEN diff --git a/check_bindir b/scripts/check-bindir.sh similarity index 100% rename from check_bindir rename to scripts/check-bindir.sh diff --git a/check-builtins.sh b/scripts/check-builtins.sh similarity index 100% rename from check-builtins.sh rename to scripts/check-builtins.sh diff --git a/fixup-builtins b/scripts/fixup-builtins.sh similarity index 100% rename from fixup-builtins rename to scripts/fixup-builtins.sh diff --git a/generate-cmdlist.sh b/scripts/generate-cmdlist.sh similarity index 100% rename from generate-cmdlist.sh rename to scripts/generate-cmdlist.sh diff --git a/unimplemented.sh b/scripts/unimplemented.sh similarity index 100% rename from unimplemented.sh rename to scripts/unimplemented.sh diff --git a/wrap-for-bin.sh b/scripts/wrap-for-bin.sh similarity index 100% rename from wrap-for-bin.sh rename to scripts/wrap-for-bin.sh
-- 1.7.4.1