GIT-BUILD-OPTIONS: sort variables alphabetically
The variables declared and substituted in GIT-BUILD-OPTIONS are not ordered in any obvious way. Sort them alphabetically so that it becomes obvious where new variables should go. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
committed by
Junio C Hamano
Junio C Hamano
parent
76cf4f61c8
commit
cfa1f2ae96
@ -1,47 +1,47 @@
|
|||||||
SHELL_PATH=@SHELL_PATH@
|
BROKEN_PATH_FIX=@BROKEN_PATH_FIX@
|
||||||
TEST_SHELL_PATH=@TEST_SHELL_PATH@
|
|
||||||
PERL_PATH=@PERL_PATH@
|
|
||||||
PERL_LOCALEDIR=@PERL_LOCALEDIR@
|
|
||||||
NO_PERL_CPAN_FALLBACKS=@NO_PERL_CPAN_FALLBACKS@
|
|
||||||
DIFF=@DIFF@
|
DIFF=@DIFF@
|
||||||
PYTHON_PATH=@PYTHON_PATH@
|
FSMONITOR_DAEMON_BACKEND=@FSMONITOR_DAEMON_BACKEND@
|
||||||
TAR=@TAR@
|
FSMONITOR_OS_SETTINGS=@FSMONITOR_OS_SETTINGS@
|
||||||
|
GITWEBDIR=@GITWEBDIR@
|
||||||
|
GIT_INTEROP_MAKE_OPTS=@GIT_INTEROP_MAKE_OPTS@
|
||||||
|
GIT_PERF_LARGE_REPO=@GIT_PERF_LARGE_REPO@
|
||||||
|
GIT_PERF_MAKE_COMMAND=@GIT_PERF_MAKE_COMMAND@
|
||||||
|
GIT_PERF_MAKE_OPTS=@GIT_PERF_MAKE_OPTS@
|
||||||
|
GIT_PERF_REPEAT_COUNT=@GIT_PERF_REPEAT_COUNT@
|
||||||
|
GIT_PERF_REPO=@GIT_PERF_REPO@
|
||||||
|
GIT_TEST_CMP=@GIT_TEST_CMP@
|
||||||
|
GIT_TEST_CMP_USE_COPIED_CONTEXT=@GIT_TEST_CMP_USE_COPIED_CONTEXT@
|
||||||
|
GIT_TEST_GITPERLLIB=@GIT_TEST_GITPERLLIB@
|
||||||
|
GIT_TEST_INDEX_VERSION=@GIT_TEST_INDEX_VERSION@
|
||||||
|
GIT_TEST_MERGE_TOOLS_DIR=@GIT_TEST_MERGE_TOOLS_DIR@
|
||||||
|
GIT_TEST_OPTS=@GIT_TEST_OPTS@
|
||||||
|
GIT_TEST_PERL_FATAL_WARNINGS=@GIT_TEST_PERL_FATAL_WARNINGS@
|
||||||
|
GIT_TEST_POPATH=@GIT_TEST_POPATH@
|
||||||
|
GIT_TEST_TEMPLATE_DIR=@GIT_TEST_TEMPLATE_DIR@
|
||||||
|
GIT_TEST_TEXTDOMAINDIR=@GIT_TEST_TEXTDOMAINDIR@
|
||||||
|
GIT_TEST_UTF8_LOCALE=@GIT_TEST_UTF8_LOCALE@
|
||||||
|
LOCALEDIR=@LOCALEDIR@
|
||||||
NO_CURL=@NO_CURL@
|
NO_CURL=@NO_CURL@
|
||||||
NO_ICONV=@NO_ICONV@
|
|
||||||
NO_EXPAT=@NO_EXPAT@
|
NO_EXPAT=@NO_EXPAT@
|
||||||
USE_LIBPCRE2=@USE_LIBPCRE2@
|
NO_GETTEXT=@NO_GETTEXT@
|
||||||
|
NO_ICONV=@NO_ICONV@
|
||||||
NO_PERL=@NO_PERL@
|
NO_PERL=@NO_PERL@
|
||||||
|
NO_PERL_CPAN_FALLBACKS=@NO_PERL_CPAN_FALLBACKS@
|
||||||
NO_PTHREADS=@NO_PTHREADS@
|
NO_PTHREADS=@NO_PTHREADS@
|
||||||
NO_PYTHON=@NO_PYTHON@
|
NO_PYTHON=@NO_PYTHON@
|
||||||
NO_REGEX=@NO_REGEX@
|
NO_REGEX=@NO_REGEX@
|
||||||
NO_UNIX_SOCKETS=@NO_UNIX_SOCKETS@
|
NO_UNIX_SOCKETS=@NO_UNIX_SOCKETS@
|
||||||
PAGER_ENV=@PAGER_ENV@
|
PAGER_ENV=@PAGER_ENV@
|
||||||
SANITIZE_LEAK=@SANITIZE_LEAK@
|
PERL_LOCALEDIR=@PERL_LOCALEDIR@
|
||||||
SANITIZE_ADDRESS=@SANITIZE_ADDRESS@
|
PERL_PATH=@PERL_PATH@
|
||||||
X=@X@
|
PYTHON_PATH=@PYTHON_PATH@
|
||||||
FSMONITOR_DAEMON_BACKEND=@FSMONITOR_DAEMON_BACKEND@
|
|
||||||
FSMONITOR_OS_SETTINGS=@FSMONITOR_OS_SETTINGS@
|
|
||||||
TEST_OUTPUT_DIRECTORY=@TEST_OUTPUT_DIRECTORY@
|
|
||||||
GIT_TEST_OPTS=@GIT_TEST_OPTS@
|
|
||||||
GIT_TEST_CMP=@GIT_TEST_CMP@
|
|
||||||
GIT_TEST_CMP_USE_COPIED_CONTEXT=@GIT_TEST_CMP_USE_COPIED_CONTEXT@
|
|
||||||
GIT_TEST_UTF8_LOCALE=@GIT_TEST_UTF8_LOCALE@
|
|
||||||
NO_GETTEXT=@NO_GETTEXT@
|
|
||||||
GIT_PERF_REPEAT_COUNT=@GIT_PERF_REPEAT_COUNT@
|
|
||||||
GIT_PERF_REPO=@GIT_PERF_REPO@
|
|
||||||
GIT_PERF_LARGE_REPO=@GIT_PERF_LARGE_REPO@
|
|
||||||
GIT_PERF_MAKE_OPTS=@GIT_PERF_MAKE_OPTS@
|
|
||||||
GIT_PERF_MAKE_COMMAND=@GIT_PERF_MAKE_COMMAND@
|
|
||||||
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@
|
|
||||||
GIT_TEST_TEXTDOMAINDIR=@GIT_TEST_TEXTDOMAINDIR@
|
|
||||||
GIT_TEST_POPATH=@GIT_TEST_POPATH@
|
|
||||||
GIT_TEST_TEMPLATE_DIR=@GIT_TEST_TEMPLATE_DIR@
|
|
||||||
GIT_TEST_GITPERLLIB=@GIT_TEST_GITPERLLIB@
|
|
||||||
GIT_TEST_MERGE_TOOLS_DIR=@GIT_TEST_MERGE_TOOLS_DIR@
|
|
||||||
RUNTIME_PREFIX=@RUNTIME_PREFIX@
|
RUNTIME_PREFIX=@RUNTIME_PREFIX@
|
||||||
GITWEBDIR=@GITWEBDIR@
|
SANITIZE_ADDRESS=@SANITIZE_ADDRESS@
|
||||||
|
SANITIZE_LEAK=@SANITIZE_LEAK@
|
||||||
|
SHELL_PATH=@SHELL_PATH@
|
||||||
|
TAR=@TAR@
|
||||||
|
TEST_OUTPUT_DIRECTORY=@TEST_OUTPUT_DIRECTORY@
|
||||||
|
TEST_SHELL_PATH=@TEST_SHELL_PATH@
|
||||||
USE_GETTEXT_SCHEME=@USE_GETTEXT_SCHEME@
|
USE_GETTEXT_SCHEME=@USE_GETTEXT_SCHEME@
|
||||||
LOCALEDIR=@LOCALEDIR@
|
USE_LIBPCRE2=@USE_LIBPCRE2@
|
||||||
BROKEN_PATH_FIX=@BROKEN_PATH_FIX@
|
X=@X@
|
||||||
|
|||||||
72
Makefile
72
Makefile
@ -3145,53 +3145,53 @@ endif
|
|||||||
# and the first level quoting from the shell that runs "echo".
|
# and the first level quoting from the shell that runs "echo".
|
||||||
GIT-BUILD-OPTIONS: FORCE
|
GIT-BUILD-OPTIONS: FORCE
|
||||||
@sed \
|
@sed \
|
||||||
-e "s|@SHELL_PATH@|\'$(SHELL_PATH_SQ)\'|" \
|
-e "s!@BROKEN_PATH_FIX@!\'$(BROKEN_PATH_FIX)\'!" \
|
||||||
-e "s|@TEST_SHELL_PATH@|\'$(TEST_SHELL_PATH_SQ)\'|" \
|
|
||||||
-e "s|@PERL_PATH@|\'$(PERL_PATH_SQ)\'|" \
|
|
||||||
-e "s|@PERL_LOCALEDIR@|\'$(perl_localedir_SQ)\'|" \
|
|
||||||
-e "s|@NO_PERL_CPAN_FALLBACKS@|\'$(NO_PERL_CPAN_FALLBACKS_SQ)\'|" \
|
|
||||||
-e "s|@DIFF@|\'$(DIFF)\'|" \
|
-e "s|@DIFF@|\'$(DIFF)\'|" \
|
||||||
-e "s|@PYTHON_PATH@|\'$(PYTHON_PATH_SQ)\'|" \
|
-e "s|@FSMONITOR_DAEMON_BACKEND@|\'$(FSMONITOR_DAEMON_BACKEND)\'|" \
|
||||||
-e "s|@TAR@|\'$(TAR)\'|" \
|
-e "s|@FSMONITOR_OS_SETTINGS@|\'$(FSMONITOR_OS_SETTINGS)\'|" \
|
||||||
|
-e "s|@GITWEBDIR@|\'$(gitwebdir_SQ)\'|" \
|
||||||
|
-e "s|@GIT_INTEROP_MAKE_OPTS@|\'$(GIT_INTEROP_MAKE_OPTS)\'|" \
|
||||||
|
-e "s|@GIT_PERF_LARGE_REPO@|\'$(GIT_PERF_LARGE_REPO)\'|" \
|
||||||
|
-e "s|@GIT_PERF_MAKE_COMMAND@|\'$(GIT_PERF_MAKE_COMMAND)\'|" \
|
||||||
|
-e "s|@GIT_PERF_MAKE_OPTS@|\'$(GIT_PERF_MAKE_OPTS)\'|" \
|
||||||
|
-e "s|@GIT_PERF_REPEAT_COUNT@|\'$(GIT_PERF_REPEAT_COUNT)\'|" \
|
||||||
|
-e "s|@GIT_PERF_REPO@|\'$(GIT_PERF_REPO)\'|" \
|
||||||
|
-e "s|@GIT_TEST_CMP@|\'$(GIT_TEST_CMP)\'|" \
|
||||||
|
-e "s|@GIT_TEST_CMP_USE_COPIED_CONTEXT@|\'$(GIT_TEST_CMP_USE_COPIED_CONTEXT)\'|" \
|
||||||
|
-e "s|@GIT_TEST_GITPERLLIB@|\'$(shell pwd)/perl/build/lib\'|" \
|
||||||
|
-e "s|@GIT_TEST_INDEX_VERSION@|\'$(GIT_TEST_INDEX_VERSION)\'|" \
|
||||||
|
-e "s|@GIT_TEST_MERGE_TOOLS_DIR@|\'$(shell pwd)/mergetools\'|" \
|
||||||
|
-e "s|@GIT_TEST_OPTS@|\'$(GIT_TEST_OPTS)\'|" \
|
||||||
|
-e "s|@GIT_TEST_PERL_FATAL_WARNINGS@|\'$(GIT_TEST_PERL_FATAL_WARNINGS)\'|" \
|
||||||
|
-e "s|@GIT_TEST_POPATH@|\'$(shell pwd)/po\'|" \
|
||||||
|
-e "s|@GIT_TEST_TEMPLATE_DIR@|\'$(shell pwd)/templates/blt\'|" \
|
||||||
|
-e "s|@GIT_TEST_TEXTDOMAINDIR@|\'$(shell pwd)/po/build/locale\'|" \
|
||||||
|
-e "s|@GIT_TEST_UTF8_LOCALE@|\'$(GIT_TEST_UTF8_LOCALE)\'|" \
|
||||||
|
-e "s|@LOCALEDIR@|\'$(localedir_SQ)\'|" \
|
||||||
-e "s|@NO_CURL@|\'$(NO_CURL)\'|" \
|
-e "s|@NO_CURL@|\'$(NO_CURL)\'|" \
|
||||||
-e "s|@NO_ICONV@|\'$(NO_ICONV)\'|" \
|
|
||||||
-e "s|@NO_EXPAT@|\'$(NO_EXPAT)\'|" \
|
-e "s|@NO_EXPAT@|\'$(NO_EXPAT)\'|" \
|
||||||
-e "s|@USE_LIBPCRE2@|\'$(USE_LIBPCRE2)\'|" \
|
-e "s|@NO_GETTEXT@|\'$(NO_GETTEXT)\'|" \
|
||||||
|
-e "s|@NO_ICONV@|\'$(NO_ICONV)\'|" \
|
||||||
-e "s|@NO_PERL@|\'$(NO_PERL)\'|" \
|
-e "s|@NO_PERL@|\'$(NO_PERL)\'|" \
|
||||||
|
-e "s|@NO_PERL_CPAN_FALLBACKS@|\'$(NO_PERL_CPAN_FALLBACKS_SQ)\'|" \
|
||||||
-e "s|@NO_PTHREADS@|\'$(NO_PTHREADS)\'|" \
|
-e "s|@NO_PTHREADS@|\'$(NO_PTHREADS)\'|" \
|
||||||
-e "s|@NO_PYTHON@|\'$(NO_PYTHON)\'|" \
|
-e "s|@NO_PYTHON@|\'$(NO_PYTHON)\'|" \
|
||||||
-e "s|@NO_REGEX@|\'$(NO_REGEX)\'|" \
|
-e "s|@NO_REGEX@|\'$(NO_REGEX)\'|" \
|
||||||
-e "s|@NO_UNIX_SOCKETS@|\'$(NO_UNIX_SOCKETS)\'|" \
|
-e "s|@NO_UNIX_SOCKETS@|\'$(NO_UNIX_SOCKETS)\'|" \
|
||||||
-e "s|@PAGER_ENV@|\'$(PAGER_ENV)\'|" \
|
-e "s|@PAGER_ENV@|\'$(PAGER_ENV)\'|" \
|
||||||
-e "s|@SANITIZE_LEAK@|\'$(SANITIZE_LEAK)\'|" \
|
-e "s|@PERL_LOCALEDIR@|\'$(perl_localedir_SQ)\'|" \
|
||||||
-e "s|@SANITIZE_ADDRESS@|\'$(SANITIZE_ADDRESS)\'|" \
|
-e "s|@PERL_PATH@|\'$(PERL_PATH_SQ)\'|" \
|
||||||
-e "s|@X@|\'$(X)\'|" \
|
-e "s|@PYTHON_PATH@|\'$(PYTHON_PATH_SQ)\'|" \
|
||||||
-e "s|@FSMONITOR_DAEMON_BACKEND@|\'$(FSMONITOR_DAEMON_BACKEND)\'|" \
|
|
||||||
-e "s|@FSMONITOR_OS_SETTINGS@|\'$(FSMONITOR_OS_SETTINGS)\'|" \
|
|
||||||
-e "s|@TEST_OUTPUT_DIRECTORY@|\'$(TEST_OUTPUT_DIRECTORY)\'|" \
|
|
||||||
-e "s|@GIT_TEST_OPTS@|\'$(GIT_TEST_OPTS)\'|" \
|
|
||||||
-e "s|@GIT_TEST_CMP@|\'$(GIT_TEST_CMP)\'|" \
|
|
||||||
-e "s|@GIT_TEST_CMP_USE_COPIED_CONTEXT@|\'$(GIT_TEST_CMP_USE_COPIED_CONTEXT)\'|" \
|
|
||||||
-e "s|@GIT_TEST_UTF8_LOCALE@|\'$(GIT_TEST_UTF8_LOCALE)\'|" \
|
|
||||||
-e "s|@NO_GETTEXT@|\'$(NO_GETTEXT)\'|" \
|
|
||||||
-e "s|@GIT_PERF_REPEAT_COUNT@|\'$(GIT_PERF_REPEAT_COUNT)\'|" \
|
|
||||||
-e "s|@GIT_PERF_REPO@|\'$(GIT_PERF_REPO)\'|" \
|
|
||||||
-e "s|@GIT_PERF_LARGE_REPO@|\'$(GIT_PERF_LARGE_REPO)\'|" \
|
|
||||||
-e "s|@GIT_PERF_MAKE_OPTS@|\'$(GIT_PERF_MAKE_OPTS)\'|" \
|
|
||||||
-e "s|@GIT_PERF_MAKE_COMMAND@|\'$(GIT_PERF_MAKE_COMMAND)\'|" \
|
|
||||||
-e "s|@GIT_INTEROP_MAKE_OPTS@|\'$(GIT_INTEROP_MAKE_OPTS)\'|" \
|
|
||||||
-e "s|@GIT_TEST_INDEX_VERSION@|\'$(GIT_TEST_INDEX_VERSION)\'|" \
|
|
||||||
-e "s|@GIT_TEST_PERL_FATAL_WARNINGS@|\'$(GIT_TEST_PERL_FATAL_WARNINGS)\'|" \
|
|
||||||
-e "s|@GIT_TEST_TEXTDOMAINDIR@|\'$(shell pwd)/po/build/locale\'|" \
|
|
||||||
-e "s|@GIT_TEST_POPATH@|\'$(shell pwd)/po\'|" \
|
|
||||||
-e "s|@GIT_TEST_TEMPLATE_DIR@|\'$(shell pwd)/templates/blt\'|" \
|
|
||||||
-e "s|@GIT_TEST_GITPERLLIB@|\'$(shell pwd)/perl/build/lib\'|" \
|
|
||||||
-e "s|@GIT_TEST_MERGE_TOOLS_DIR@|\'$(shell pwd)/mergetools\'|" \
|
|
||||||
-e "s|@RUNTIME_PREFIX@|\'$(RUNTIME_PREFIX_OPTION)\'|" \
|
-e "s|@RUNTIME_PREFIX@|\'$(RUNTIME_PREFIX_OPTION)\'|" \
|
||||||
-e "s|@GITWEBDIR@|\'$(gitwebdir_SQ)\'|" \
|
-e "s|@SANITIZE_ADDRESS@|\'$(SANITIZE_ADDRESS)\'|" \
|
||||||
|
-e "s|@SANITIZE_LEAK@|\'$(SANITIZE_LEAK)\'|" \
|
||||||
|
-e "s|@SHELL_PATH@|\'$(SHELL_PATH_SQ)\'|" \
|
||||||
|
-e "s|@TAR@|\'$(TAR)\'|" \
|
||||||
|
-e "s|@TEST_OUTPUT_DIRECTORY@|\'$(TEST_OUTPUT_DIRECTORY)\'|" \
|
||||||
|
-e "s|@TEST_SHELL_PATH@|\'$(TEST_SHELL_PATH_SQ)\'|" \
|
||||||
-e "s|@USE_GETTEXT_SCHEME@|\'$(USE_GETTEXT_SCHEME)\'|" \
|
-e "s|@USE_GETTEXT_SCHEME@|\'$(USE_GETTEXT_SCHEME)\'|" \
|
||||||
-e "s|@LOCALEDIR@|\'$(localedir_SQ)\'|" \
|
-e "s|@USE_LIBPCRE2@|\'$(USE_LIBPCRE2)\'|" \
|
||||||
-e "s!@BROKEN_PATH_FIX@!\'$(BROKEN_PATH_FIX)\'!" \
|
-e "s|@X@|\'$(X)\'|" \
|
||||||
GIT-BUILD-OPTIONS.in >$@+
|
GIT-BUILD-OPTIONS.in >$@+
|
||||||
@if grep -q '^[A-Z][A-Z_]*=@.*@$$' $@+; then echo "Unsubstituted build options in $@" >&2 && exit 1; fi
|
@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
|
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
|
||||||
|
|||||||
@ -1158,53 +1158,53 @@ if(NOT PYTHON_TESTS)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
file(STRINGS ${CMAKE_SOURCE_DIR}/GIT-BUILD-OPTIONS.in git_build_options NEWLINE_CONSUME)
|
file(STRINGS ${CMAKE_SOURCE_DIR}/GIT-BUILD-OPTIONS.in git_build_options NEWLINE_CONSUME)
|
||||||
string(REPLACE "@SHELL_PATH@" "'${SHELL_PATH}'" git_build_options "${git_build_options}")
|
string(REPLACE "@BROKEN_PATH_FIX@" "" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@TEST_SHELL_PATH@" "'${TEST_SHELL_PATH}'" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@PERL_PATH@" "'${PERL_PATH}'" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@PERL_LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@NO_PERL_CPAN_FALLBACKS@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@DIFF@" "'${DIFF}'" git_build_options "${git_build_options}")
|
string(REPLACE "@DIFF@" "'${DIFF}'" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@PYTHON_PATH@" "'${PYTHON_PATH}'" git_build_options "${git_build_options}")
|
string(REPLACE "@FSMONITOR_DAEMON_BACKEND@" "win32" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@TAR@" "'${TAR}'" git_build_options "${git_build_options}")
|
string(REPLACE "@FSMONITOR_OS_SETTINGS@" "win32" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GITWEBDIR@" "'${GITWEBDIR}'" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_INTEROP_MAKE_OPTS@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_PERF_LARGE_REPO@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_PERF_MAKE_COMMAND@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_PERF_MAKE_OPTS@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_PERF_REPEAT_COUNT@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_PERF_REPO@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_CMP@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_CMP_USE_COPIED_CONTEXT@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_GITPERLLIB@" "'${CMAKE_BINARY_DIR}/perl/build/lib'" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_INDEX_VERSION@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_MERGE_TOOLS_DIR@" "'${CMAKE_BINARY_DIR}/mergetools'" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_OPTS@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_PERL_FATAL_WARNINGS@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_POPATH@" "'${CMAKE_BINARY_DIR}/po'" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_TEMPLATE_DIR@" "'${CMAKE_BINARY_DIR}/templates/blt'" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_TEXTDOMAINDIR@" "'${CMAKE_BINARY_DIR}/po/build/locale'" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@GIT_TEST_UTF8_LOCALE@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@NO_CURL@" "${NO_CURL}" git_build_options "${git_build_options}")
|
string(REPLACE "@NO_CURL@" "${NO_CURL}" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@NO_ICONV@" "${NO_ICONV}" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@NO_EXPAT@" "${NO_EXPAT}" git_build_options "${git_build_options}")
|
string(REPLACE "@NO_EXPAT@" "${NO_EXPAT}" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@USE_LIBPCRE2@" "" git_build_options "${git_build_options}")
|
string(REPLACE "@NO_GETTEXT@" "${NO_GETTEXT}" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@NO_ICONV@" "${NO_ICONV}" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@NO_PERL@" "${NO_PERL}" git_build_options "${git_build_options}")
|
string(REPLACE "@NO_PERL@" "${NO_PERL}" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@NO_PERL_CPAN_FALLBACKS@" "" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@NO_PTHREADS@" "${NO_PTHREADS}" git_build_options "${git_build_options}")
|
string(REPLACE "@NO_PTHREADS@" "${NO_PTHREADS}" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@NO_PYTHON@" "${NO_PYTHON}" git_build_options "${git_build_options}")
|
string(REPLACE "@NO_PYTHON@" "${NO_PYTHON}" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@NO_REGEX@" "" git_build_options "${git_build_options}")
|
string(REPLACE "@NO_REGEX@" "" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@NO_UNIX_SOCKETS@" "${NO_UNIX_SOCKETS}" git_build_options "${git_build_options}")
|
string(REPLACE "@NO_UNIX_SOCKETS@" "${NO_UNIX_SOCKETS}" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@PAGER_ENV@" "'${PAGER_ENV}'" git_build_options "${git_build_options}")
|
string(REPLACE "@PAGER_ENV@" "'${PAGER_ENV}'" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@SANITIZE_LEAK@" "" git_build_options "${git_build_options}")
|
string(REPLACE "@PERL_LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@SANITIZE_ADDRESS@" "" git_build_options "${git_build_options}")
|
string(REPLACE "@PERL_PATH@" "'${PERL_PATH}'" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@X@" "${EXE_EXTENSION}" git_build_options "${git_build_options}")
|
string(REPLACE "@PYTHON_PATH@" "'${PYTHON_PATH}'" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@FSMONITOR_DAEMON_BACKEND@" "win32" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@FSMONITOR_OS_SETTINGS@" "win32" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@TEST_OUTPUT_DIRECTORY@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_TEST_OPTS@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_TEST_CMP@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_TEST_CMP_USE_COPIED_CONTEXT@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_TEST_UTF8_LOCALE@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@NO_GETTEXT@" "${NO_GETTEXT}" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_PERF_REPEAT_COUNT@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_PERF_REPO@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_PERF_LARGE_REPO@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_PERF_MAKE_OPTS@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_PERF_MAKE_COMMAND@" "" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_INTEROP_MAKE_OPTS@" "" git_build_options "${git_build_options}")
|
|
||||||
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 "@GIT_TEST_TEXTDOMAINDIR@" "'${CMAKE_BINARY_DIR}/po/build/locale'" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_TEST_POPATH@" "'${CMAKE_BINARY_DIR}/po'" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_TEST_TEMPLATE_DIR@" "'${CMAKE_BINARY_DIR}/templates/blt'" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_TEST_GITPERLLIB@" "'${CMAKE_BINARY_DIR}/perl/build/lib'" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@GIT_TEST_MERGE_TOOLS_DIR@" "'${CMAKE_BINARY_DIR}/mergetools'" git_build_options "${git_build_options}")
|
|
||||||
string(REPLACE "@RUNTIME_PREFIX@" "'${RUNTIME_PREFIX}'" 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 "@SANITIZE_ADDRESS@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@SANITIZE_LEAK@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@SHELL_PATH@" "'${SHELL_PATH}'" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@TAR@" "'${TAR}'" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@TEST_OUTPUT_DIRECTORY@" "" git_build_options "${git_build_options}")
|
||||||
|
string(REPLACE "@TEST_SHELL_PATH@" "'${TEST_SHELL_PATH}'" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@USE_GETTEXT_SCHEME@" "" 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 "@USE_LIBPCRE2@" "" git_build_options "${git_build_options}")
|
||||||
string(REPLACE "@BROKEN_PATH_FIX@" "" git_build_options "${git_build_options}")
|
string(REPLACE "@X@" "${EXE_EXTENSION}" git_build_options "${git_build_options}")
|
||||||
if(USE_VCPKG)
|
if(USE_VCPKG)
|
||||||
string(APPEND git_build_options "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
|
string(APPEND git_build_options "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user