mirror of
https://github.com/git/git.git
synced 2025-02-06 10:03:06 +00:00
Makefile: extract script to massage Shell scripts
Same as in the preceding commits, extract a script that allows us to unify how we massage shell scripts. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
Junio C Hamano
parent
ccfba9e0c4
commit
eb98cb835c
@ -36,3 +36,7 @@ GIT_INTEROP_MAKE_OPTS=@GIT_INTEROP_MAKE_OPTS@
|
||||
GIT_TEST_INDEX_VERSION=@GIT_TEST_INDEX_VERSION@
|
||||
GIT_TEST_PERL_FATAL_WARNINGS=@GIT_TEST_PERL_FATAL_WARNINGS@
|
||||
RUNTIME_PREFIX=@RUNTIME_PREFIX@
|
||||
GITWEBDIR=@GITWEBDIR@
|
||||
USE_GETTEXT_SCHEME=@USE_GETTEXT_SCHEME@
|
||||
LOCALEDIR=@LOCALEDIR@
|
||||
BROKEN_PATH_FIX=@BROKEN_PATH_FIX@
|
||||
|
||||
34
Makefile
34
Makefile
@ -1558,10 +1558,10 @@ endif
|
||||
|
||||
ifdef SANE_TOOL_PATH
|
||||
SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
|
||||
BROKEN_PATH_FIX = 's|^\# @BROKEN_PATH_FIX@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
|
||||
BROKEN_PATH_FIX = s|^\# @BROKEN_PATH_FIX@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|
|
||||
PATH := $(SANE_TOOL_PATH):${PATH}
|
||||
else
|
||||
BROKEN_PATH_FIX = '/^\# @BROKEN_PATH_FIX@$$/d'
|
||||
BROKEN_PATH_FIX = /^\# @BROKEN_PATH_FIX@$$/d
|
||||
endif
|
||||
|
||||
ifeq (,$(HOST_CPU))
|
||||
@ -2546,26 +2546,8 @@ GIT-SCRIPT-DEFINES: FORCE
|
||||
echo "$$FLAGS" >$@; \
|
||||
fi
|
||||
|
||||
define cmd_munge_script
|
||||
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
||||
-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
|
||||
-e 's|@DIFF@|$(DIFF_SQ)|' \
|
||||
-e 's|@LOCALEDIR@|$(localedir_SQ)|g' \
|
||||
-e 's/@USE_GETTEXT_SCHEME@/$(USE_GETTEXT_SCHEME)/g' \
|
||||
-e $(BROKEN_PATH_FIX) \
|
||||
-e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \
|
||||
-e 's|@PERL_PATH@|$(PERL_PATH_SQ)|g' \
|
||||
-e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \
|
||||
$@.sh >$@+
|
||||
endef
|
||||
|
||||
$(SCRIPT_SH_GEN) : % : %.sh GIT-SCRIPT-DEFINES
|
||||
$(QUIET_GEN)$(cmd_munge_script) && \
|
||||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
|
||||
$(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
|
||||
$(QUIET_GEN)$(cmd_munge_script) && \
|
||||
$(SCRIPT_SH_GEN) $(SCRIPT_LIB) : % : %.sh generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
|
||||
$(QUIET_GEN)./generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
|
||||
mv $@+ $@
|
||||
|
||||
git.rc: git.rc.in GIT-VERSION-GEN GIT-VERSION-FILE
|
||||
@ -2635,8 +2617,8 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
|
||||
perllibdir:
|
||||
@echo '$(perllibdir_SQ)'
|
||||
|
||||
git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
|
||||
$(QUIET_GEN)$(cmd_munge_script) && \
|
||||
git-instaweb: git-instaweb.sh generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
|
||||
$(QUIET_GEN)./generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
|
||||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
else # NO_PERL
|
||||
@ -3199,6 +3181,10 @@ GIT-BUILD-OPTIONS: FORCE
|
||||
-e "s|@GIT_TEST_INDEX_VERSION@|\'$(GIT_TEST_INDEX_VERSION)\'|" \
|
||||
-e "s|@GIT_TEST_PERL_FATAL_WARNINGS@|\'$(GIT_TEST_PERL_FATAL_WARNINGS)\'|" \
|
||||
-e "s|@RUNTIME_PREFIX@|\'$(RUNTIME_PREFIX_OPTION)\'|" \
|
||||
-e "s|@GITWEBDIR@|\'$(gitwebdir_SQ)\'|" \
|
||||
-e "s|@USE_GETTEXT_SCHEME@|\'$(USE_GETTEXT_SCHEME)\'|" \
|
||||
-e "s|@LOCALEDIR@|\'$(localedir_SQ)\'|" \
|
||||
-e "s!@BROKEN_PATH_FIX@!\'$(BROKEN_PATH_FIX)\'!" \
|
||||
GIT-BUILD-OPTIONS.in >$@+
|
||||
@if grep -q '^[A-Z][A-Z_]*=@.*@$$' $@+; then echo "Unsubstituted build options in $@" >&2 && exit 1; fi
|
||||
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
|
||||
|
||||
@ -838,18 +838,23 @@ set(git_shell_scripts
|
||||
${git_sh_scripts} ${git_shlib_scripts} git-instaweb)
|
||||
|
||||
foreach(script ${git_shell_scripts})
|
||||
file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.sh content NEWLINE_CONSUME)
|
||||
string(REPLACE "@SHELL_PATH@" "${SHELL_PATH}" content "${content}")
|
||||
string(REPLACE "@DIFF@" "diff" content "${content}")
|
||||
string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
|
||||
string(REPLACE "@GITWEBDIR@" "${GITWEBDIR}" content "${content}")
|
||||
string(REPLACE "@NO_CURL@" "" content "${content}")
|
||||
string(REPLACE "@USE_GETTEXT_SCHEME@" "" content "${content}")
|
||||
string(REPLACE "# @BROKEN_PATH_FIX@" "" content "${content}")
|
||||
string(REPLACE "@PERL_PATH@" "${PERL_PATH}" content "${content}")
|
||||
string(REPLACE "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}")
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
|
||||
if ("${script}" IN_LIST git_sh_scripts)
|
||||
string(REPLACE ".sh" "" shell_gen_path "${script}")
|
||||
else()
|
||||
set(shell_gen_path "${script}")
|
||||
endif()
|
||||
|
||||
add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/${shell_gen_path}"
|
||||
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/generate-script.sh"
|
||||
"${CMAKE_SOURCE_DIR}/${script}.sh"
|
||||
"${CMAKE_BINARY_DIR}/${shell_gen_path}"
|
||||
"${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS"
|
||||
DEPENDS "${CMAKE_SOURCE_DIR}/generate-script.sh"
|
||||
"${CMAKE_SOURCE_DIR}/${script}.sh"
|
||||
VERBATIM)
|
||||
list(APPEND shell_gen ${CMAKE_BINARY_DIR}/${shell_gen_path})
|
||||
endforeach()
|
||||
add_custom_target(shell-gen ALL DEPENDS ${shell_gen})
|
||||
|
||||
#perl scripts
|
||||
parse_makefile_for_scripts(git_perl_scripts "SCRIPT_PERL" "")
|
||||
@ -1183,6 +1188,10 @@ string(REPLACE "@GIT_INTEROP_MAKE_OPTS@" "" git_build_options "${git_build_optio
|
||||
string(REPLACE "@GIT_TEST_INDEX_VERSION@" "" git_build_options "${git_build_options}")
|
||||
string(REPLACE "@GIT_TEST_PERL_FATAL_WARNINGS@" "" git_build_options "${git_build_options}")
|
||||
string(REPLACE "@RUNTIME_PREFIX@" "'${RUNTIME_PREFIX}'" git_build_options "${git_build_options}")
|
||||
string(REPLACE "@GITWEBDIR@" "'${GITWEBDIR}'" git_build_options "${git_build_options}")
|
||||
string(REPLACE "@USE_GETTEXT_SCHEME@" "" git_build_options "${git_build_options}")
|
||||
string(REPLACE "@LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
|
||||
string(REPLACE "@BROKEN_PATH_FIX@" "" git_build_options "${git_build_options}")
|
||||
if(USE_VCPKG)
|
||||
string(APPEND git_build_options "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
|
||||
endif()
|
||||
|
||||
34
generate-script.sh
Executable file
34
generate-script.sh
Executable file
@ -0,0 +1,34 @@
|
||||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
if test $# -ne 3
|
||||
then
|
||||
echo >&2 "USAGE: $0 <INPUT> <OUTPUT> <GIT-BUILD-OPTIONS>"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
INPUT="$1"
|
||||
OUTPUT="$2"
|
||||
BUILD_OPTIONS="$3"
|
||||
|
||||
. "$BUILD_OPTIONS"
|
||||
|
||||
sed -e "1s|#!.*/sh|#!$SHELL_PATH|" \
|
||||
-e "s|@SHELL_PATH@|$SHELL_PATH|" \
|
||||
-e "s|@DIFF@|$DIFF|" \
|
||||
-e "s|@LOCALEDIR@|$LOCALEDIR|g" \
|
||||
-e "s/@USE_GETTEXT_SCHEME@/$USE_GETTEXT_SCHEME/g" \
|
||||
-e "$BROKEN_PATH_FIX" \
|
||||
-e "s|@GITWEBDIR@|$GITWEBDIR|g" \
|
||||
-e "s|@PERL_PATH@|$PERL_PATH|g" \
|
||||
-e "s|@PAGER_ENV@|$PAGER_ENV|g" \
|
||||
"$INPUT" >"$OUTPUT"
|
||||
|
||||
case "$(basename "$INPUT")" in
|
||||
git-mergetool--lib.sh|git-sh-i18n.sh|git-sh-setup.sh)
|
||||
;;
|
||||
*)
|
||||
chmod a+x "$OUTPUT"
|
||||
;;
|
||||
esac
|
||||
Loading…
x
Reference in New Issue
Block a user