Skip to content

Commit cfa1f2a

Browse files
pks-tgitster
pks-t
authored and
gitster
committed
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 76cf4f6 commit cfa1f2a

File tree

3 files changed

+105
-105
lines changed

3 files changed

+105
-105
lines changed

‎GIT-BUILD-OPTIONS.in

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
SHELL_PATH=@SHELL_PATH@
2-
TEST_SHELL_PATH=@TEST_SHELL_PATH@
3-
PERL_PATH=@PERL_PATH@
4-
PERL_LOCALEDIR=@PERL_LOCALEDIR@
5-
NO_PERL_CPAN_FALLBACKS=@NO_PERL_CPAN_FALLBACKS@
1+
BROKEN_PATH_FIX=@BROKEN_PATH_FIX@
62
DIFF=@DIFF@
7-
PYTHON_PATH=@PYTHON_PATH@
8-
TAR=@TAR@
3+
FSMONITOR_DAEMON_BACKEND=@FSMONITOR_DAEMON_BACKEND@
4+
FSMONITOR_OS_SETTINGS=@FSMONITOR_OS_SETTINGS@
5+
GITWEBDIR=@GITWEBDIR@
6+
GIT_INTEROP_MAKE_OPTS=@GIT_INTEROP_MAKE_OPTS@
7+
GIT_PERF_LARGE_REPO=@GIT_PERF_LARGE_REPO@
8+
GIT_PERF_MAKE_COMMAND=@GIT_PERF_MAKE_COMMAND@
9+
GIT_PERF_MAKE_OPTS=@GIT_PERF_MAKE_OPTS@
10+
GIT_PERF_REPEAT_COUNT=@GIT_PERF_REPEAT_COUNT@
11+
GIT_PERF_REPO=@GIT_PERF_REPO@
12+
GIT_TEST_CMP=@GIT_TEST_CMP@
13+
GIT_TEST_CMP_USE_COPIED_CONTEXT=@GIT_TEST_CMP_USE_COPIED_CONTEXT@
14+
GIT_TEST_GITPERLLIB=@GIT_TEST_GITPERLLIB@
15+
GIT_TEST_INDEX_VERSION=@GIT_TEST_INDEX_VERSION@
16+
GIT_TEST_MERGE_TOOLS_DIR=@GIT_TEST_MERGE_TOOLS_DIR@
17+
GIT_TEST_OPTS=@GIT_TEST_OPTS@
18+
GIT_TEST_PERL_FATAL_WARNINGS=@GIT_TEST_PERL_FATAL_WARNINGS@
19+
GIT_TEST_POPATH=@GIT_TEST_POPATH@
20+
GIT_TEST_TEMPLATE_DIR=@GIT_TEST_TEMPLATE_DIR@
21+
GIT_TEST_TEXTDOMAINDIR=@GIT_TEST_TEXTDOMAINDIR@
22+
GIT_TEST_UTF8_LOCALE=@GIT_TEST_UTF8_LOCALE@
23+
LOCALEDIR=@LOCALEDIR@
924
NO_CURL=@NO_CURL@
10-
NO_ICONV=@NO_ICONV@
1125
NO_EXPAT=@NO_EXPAT@
12-
USE_LIBPCRE2=@USE_LIBPCRE2@
26+
NO_GETTEXT=@NO_GETTEXT@
27+
NO_ICONV=@NO_ICONV@
1328
NO_PERL=@NO_PERL@
29+
NO_PERL_CPAN_FALLBACKS=@NO_PERL_CPAN_FALLBACKS@
1430
NO_PTHREADS=@NO_PTHREADS@
1531
NO_PYTHON=@NO_PYTHON@
1632
NO_REGEX=@NO_REGEX@
1733
NO_UNIX_SOCKETS=@NO_UNIX_SOCKETS@
1834
PAGER_ENV=@PAGER_ENV@
19-
SANITIZE_LEAK=@SANITIZE_LEAK@
35+
PERL_LOCALEDIR=@PERL_LOCALEDIR@
36+
PERL_PATH=@PERL_PATH@
37+
PYTHON_PATH=@PYTHON_PATH@
38+
RUNTIME_PREFIX=@RUNTIME_PREFIX@
2039
SANITIZE_ADDRESS=@SANITIZE_ADDRESS@
21-
X=@X@
22-
FSMONITOR_DAEMON_BACKEND=@FSMONITOR_DAEMON_BACKEND@
23-
FSMONITOR_OS_SETTINGS=@FSMONITOR_OS_SETTINGS@
40+
SANITIZE_LEAK=@SANITIZE_LEAK@
41+
SHELL_PATH=@SHELL_PATH@
42+
TAR=@TAR@
2443
TEST_OUTPUT_DIRECTORY=@TEST_OUTPUT_DIRECTORY@
25-
GIT_TEST_OPTS=@GIT_TEST_OPTS@
26-
GIT_TEST_CMP=@GIT_TEST_CMP@
27-
GIT_TEST_CMP_USE_COPIED_CONTEXT=@GIT_TEST_CMP_USE_COPIED_CONTEXT@
28-
GIT_TEST_UTF8_LOCALE=@GIT_TEST_UTF8_LOCALE@
29-
NO_GETTEXT=@NO_GETTEXT@
30-
GIT_PERF_REPEAT_COUNT=@GIT_PERF_REPEAT_COUNT@
31-
GIT_PERF_REPO=@GIT_PERF_REPO@
32-
GIT_PERF_LARGE_REPO=@GIT_PERF_LARGE_REPO@
33-
GIT_PERF_MAKE_OPTS=@GIT_PERF_MAKE_OPTS@
34-
GIT_PERF_MAKE_COMMAND=@GIT_PERF_MAKE_COMMAND@
35-
GIT_INTEROP_MAKE_OPTS=@GIT_INTEROP_MAKE_OPTS@
36-
GIT_TEST_INDEX_VERSION=@GIT_TEST_INDEX_VERSION@
37-
GIT_TEST_PERL_FATAL_WARNINGS=@GIT_TEST_PERL_FATAL_WARNINGS@
38-
GIT_TEST_TEXTDOMAINDIR=@GIT_TEST_TEXTDOMAINDIR@
39-
GIT_TEST_POPATH=@GIT_TEST_POPATH@
40-
GIT_TEST_TEMPLATE_DIR=@GIT_TEST_TEMPLATE_DIR@
41-
GIT_TEST_GITPERLLIB=@GIT_TEST_GITPERLLIB@
42-
GIT_TEST_MERGE_TOOLS_DIR=@GIT_TEST_MERGE_TOOLS_DIR@
43-
RUNTIME_PREFIX=@RUNTIME_PREFIX@
44-
GITWEBDIR=@GITWEBDIR@
44+
TEST_SHELL_PATH=@TEST_SHELL_PATH@
4545
USE_GETTEXT_SCHEME=@USE_GETTEXT_SCHEME@
46-
LOCALEDIR=@LOCALEDIR@
47-
BROKEN_PATH_FIX=@BROKEN_PATH_FIX@
46+
USE_LIBPCRE2=@USE_LIBPCRE2@
47+
X=@X@

‎Makefile

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3145,53 +3145,53 @@ endif
31453145
# and the first level quoting from the shell that runs "echo".
31463146
GIT-BUILD-OPTIONS: FORCE
31473147
@sed \
3148-
-e "s|@SHELL_PATH@|\'$(SHELL_PATH_SQ)\'|" \
3149-
-e "s|@TEST_SHELL_PATH@|\'$(TEST_SHELL_PATH_SQ)\'|" \
3150-
-e "s|@PERL_PATH@|\'$(PERL_PATH_SQ)\'|" \
3151-
-e "s|@PERL_LOCALEDIR@|\'$(perl_localedir_SQ)\'|" \
3152-
-e "s|@NO_PERL_CPAN_FALLBACKS@|\'$(NO_PERL_CPAN_FALLBACKS_SQ)\'|" \
3148+
-e "s!@BROKEN_PATH_FIX@!\'$(BROKEN_PATH_FIX)\'!" \
31533149
-e "s|@DIFF@|\'$(DIFF)\'|" \
3154-
-e "s|@PYTHON_PATH@|\'$(PYTHON_PATH_SQ)\'|" \
3155-
-e "s|@TAR@|\'$(TAR)\'|" \
3150+
-e "s|@FSMONITOR_DAEMON_BACKEND@|\'$(FSMONITOR_DAEMON_BACKEND)\'|" \
3151+
-e "s|@FSMONITOR_OS_SETTINGS@|\'$(FSMONITOR_OS_SETTINGS)\'|" \
3152+
-e "s|@GITWEBDIR@|\'$(gitwebdir_SQ)\'|" \
3153+
-e "s|@GIT_INTEROP_MAKE_OPTS@|\'$(GIT_INTEROP_MAKE_OPTS)\'|" \
3154+
-e "s|@GIT_PERF_LARGE_REPO@|\'$(GIT_PERF_LARGE_REPO)\'|" \
3155+
-e "s|@GIT_PERF_MAKE_COMMAND@|\'$(GIT_PERF_MAKE_COMMAND)\'|" \
3156+
-e "s|@GIT_PERF_MAKE_OPTS@|\'$(GIT_PERF_MAKE_OPTS)\'|" \
3157+
-e "s|@GIT_PERF_REPEAT_COUNT@|\'$(GIT_PERF_REPEAT_COUNT)\'|" \
3158+
-e "s|@GIT_PERF_REPO@|\'$(GIT_PERF_REPO)\'|" \
3159+
-e "s|@GIT_TEST_CMP@|\'$(GIT_TEST_CMP)\'|" \
3160+
-e "s|@GIT_TEST_CMP_USE_COPIED_CONTEXT@|\'$(GIT_TEST_CMP_USE_COPIED_CONTEXT)\'|" \
3161+
-e "s|@GIT_TEST_GITPERLLIB@|\'$(shell pwd)/perl/build/lib\'|" \
3162+
-e "s|@GIT_TEST_INDEX_VERSION@|\'$(GIT_TEST_INDEX_VERSION)\'|" \
3163+
-e "s|@GIT_TEST_MERGE_TOOLS_DIR@|\'$(shell pwd)/mergetools\'|" \
3164+
-e "s|@GIT_TEST_OPTS@|\'$(GIT_TEST_OPTS)\'|" \
3165+
-e "s|@GIT_TEST_PERL_FATAL_WARNINGS@|\'$(GIT_TEST_PERL_FATAL_WARNINGS)\'|" \
3166+
-e "s|@GIT_TEST_POPATH@|\'$(shell pwd)/po\'|" \
3167+
-e "s|@GIT_TEST_TEMPLATE_DIR@|\'$(shell pwd)/templates/blt\'|" \
3168+
-e "s|@GIT_TEST_TEXTDOMAINDIR@|\'$(shell pwd)/po/build/locale\'|" \
3169+
-e "s|@GIT_TEST_UTF8_LOCALE@|\'$(GIT_TEST_UTF8_LOCALE)\'|" \
3170+
-e "s|@LOCALEDIR@|\'$(localedir_SQ)\'|" \
31563171
-e "s|@NO_CURL@|\'$(NO_CURL)\'|" \
3157-
-e "s|@NO_ICONV@|\'$(NO_ICONV)\'|" \
31583172
-e "s|@NO_EXPAT@|\'$(NO_EXPAT)\'|" \
3159-
-e "s|@USE_LIBPCRE2@|\'$(USE_LIBPCRE2)\'|" \
3173+
-e "s|@NO_GETTEXT@|\'$(NO_GETTEXT)\'|" \
3174+
-e "s|@NO_ICONV@|\'$(NO_ICONV)\'|" \
31603175
-e "s|@NO_PERL@|\'$(NO_PERL)\'|" \
3176+
-e "s|@NO_PERL_CPAN_FALLBACKS@|\'$(NO_PERL_CPAN_FALLBACKS_SQ)\'|" \
31613177
-e "s|@NO_PTHREADS@|\'$(NO_PTHREADS)\'|" \
31623178
-e "s|@NO_PYTHON@|\'$(NO_PYTHON)\'|" \
31633179
-e "s|@NO_REGEX@|\'$(NO_REGEX)\'|" \
31643180
-e "s|@NO_UNIX_SOCKETS@|\'$(NO_UNIX_SOCKETS)\'|" \
31653181
-e "s|@PAGER_ENV@|\'$(PAGER_ENV)\'|" \
3166-
-e "s|@SANITIZE_LEAK@|\'$(SANITIZE_LEAK)\'|" \
3182+
-e "s|@PERL_LOCALEDIR@|\'$(perl_localedir_SQ)\'|" \
3183+
-e "s|@PERL_PATH@|\'$(PERL_PATH_SQ)\'|" \
3184+
-e "s|@PYTHON_PATH@|\'$(PYTHON_PATH_SQ)\'|" \
3185+
-e "s|@RUNTIME_PREFIX@|\'$(RUNTIME_PREFIX_OPTION)\'|" \
31673186
-e "s|@SANITIZE_ADDRESS@|\'$(SANITIZE_ADDRESS)\'|" \
3168-
-e "s|@X@|\'$(X)\'|" \
3169-
-e "s|@FSMONITOR_DAEMON_BACKEND@|\'$(FSMONITOR_DAEMON_BACKEND)\'|" \
3170-
-e "s|@FSMONITOR_OS_SETTINGS@|\'$(FSMONITOR_OS_SETTINGS)\'|" \
3187+
-e "s|@SANITIZE_LEAK@|\'$(SANITIZE_LEAK)\'|" \
3188+
-e "s|@SHELL_PATH@|\'$(SHELL_PATH_SQ)\'|" \
3189+
-e "s|@TAR@|\'$(TAR)\'|" \
31713190
-e "s|@TEST_OUTPUT_DIRECTORY@|\'$(TEST_OUTPUT_DIRECTORY)\'|" \
3172-
-e "s|@GIT_TEST_OPTS@|\'$(GIT_TEST_OPTS)\'|" \
3173-
-e "s|@GIT_TEST_CMP@|\'$(GIT_TEST_CMP)\'|" \
3174-
-e "s|@GIT_TEST_CMP_USE_COPIED_CONTEXT@|\'$(GIT_TEST_CMP_USE_COPIED_CONTEXT)\'|" \
3175-
-e "s|@GIT_TEST_UTF8_LOCALE@|\'$(GIT_TEST_UTF8_LOCALE)\'|" \
3176-
-e "s|@NO_GETTEXT@|\'$(NO_GETTEXT)\'|" \
3177-
-e "s|@GIT_PERF_REPEAT_COUNT@|\'$(GIT_PERF_REPEAT_COUNT)\'|" \
3178-
-e "s|@GIT_PERF_REPO@|\'$(GIT_PERF_REPO)\'|" \
3179-
-e "s|@GIT_PERF_LARGE_REPO@|\'$(GIT_PERF_LARGE_REPO)\'|" \
3180-
-e "s|@GIT_PERF_MAKE_OPTS@|\'$(GIT_PERF_MAKE_OPTS)\'|" \
3181-
-e "s|@GIT_PERF_MAKE_COMMAND@|\'$(GIT_PERF_MAKE_COMMAND)\'|" \
3182-
-e "s|@GIT_INTEROP_MAKE_OPTS@|\'$(GIT_INTEROP_MAKE_OPTS)\'|" \
3183-
-e "s|@GIT_TEST_INDEX_VERSION@|\'$(GIT_TEST_INDEX_VERSION)\'|" \
3184-
-e "s|@GIT_TEST_PERL_FATAL_WARNINGS@|\'$(GIT_TEST_PERL_FATAL_WARNINGS)\'|" \
3185-
-e "s|@GIT_TEST_TEXTDOMAINDIR@|\'$(shell pwd)/po/build/locale\'|" \
3186-
-e "s|@GIT_TEST_POPATH@|\'$(shell pwd)/po\'|" \
3187-
-e "s|@GIT_TEST_TEMPLATE_DIR@|\'$(shell pwd)/templates/blt\'|" \
3188-
-e "s|@GIT_TEST_GITPERLLIB@|\'$(shell pwd)/perl/build/lib\'|" \
3189-
-e "s|@GIT_TEST_MERGE_TOOLS_DIR@|\'$(shell pwd)/mergetools\'|" \
3190-
-e "s|@RUNTIME_PREFIX@|\'$(RUNTIME_PREFIX_OPTION)\'|" \
3191-
-e "s|@GITWEBDIR@|\'$(gitwebdir_SQ)\'|" \
3191+
-e "s|@TEST_SHELL_PATH@|\'$(TEST_SHELL_PATH_SQ)\'|" \
31923192
-e "s|@USE_GETTEXT_SCHEME@|\'$(USE_GETTEXT_SCHEME)\'|" \
3193-
-e "s|@LOCALEDIR@|\'$(localedir_SQ)\'|" \
3194-
-e "s!@BROKEN_PATH_FIX@!\'$(BROKEN_PATH_FIX)\'!" \
3193+
-e "s|@USE_LIBPCRE2@|\'$(USE_LIBPCRE2)\'|" \
3194+
-e "s|@X@|\'$(X)\'|" \
31953195
GIT-BUILD-OPTIONS.in >$@+
31963196
@if grep -q '^[A-Z][A-Z_]*=@.*@$$' $@+; then echo "Unsubstituted build options in $@" >&2 && exit 1; fi
31973197
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi

‎contrib/buildsystems/CMakeLists.txt

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,53 +1158,53 @@ if(NOT PYTHON_TESTS)
11581158
endif()
11591159

11601160
file(STRINGS ${CMAKE_SOURCE_DIR}/GIT-BUILD-OPTIONS.in git_build_options NEWLINE_CONSUME)
1161-
string(REPLACE "@SHELL_PATH@" "'${SHELL_PATH}'" git_build_options "${git_build_options}")
1162-
string(REPLACE "@TEST_SHELL_PATH@" "'${TEST_SHELL_PATH}'" git_build_options "${git_build_options}")
1163-
string(REPLACE "@PERL_PATH@" "'${PERL_PATH}'" git_build_options "${git_build_options}")
1164-
string(REPLACE "@PERL_LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
1165-
string(REPLACE "@NO_PERL_CPAN_FALLBACKS@" "" git_build_options "${git_build_options}")
1161+
string(REPLACE "@BROKEN_PATH_FIX@" "" git_build_options "${git_build_options}")
11661162
string(REPLACE "@DIFF@" "'${DIFF}'" git_build_options "${git_build_options}")
1167-
string(REPLACE "@PYTHON_PATH@" "'${PYTHON_PATH}'" git_build_options "${git_build_options}")
1168-
string(REPLACE "@TAR@" "'${TAR}'" git_build_options "${git_build_options}")
1163+
string(REPLACE "@FSMONITOR_DAEMON_BACKEND@" "win32" git_build_options "${git_build_options}")
1164+
string(REPLACE "@FSMONITOR_OS_SETTINGS@" "win32" git_build_options "${git_build_options}")
1165+
string(REPLACE "@GITWEBDIR@" "'${GITWEBDIR}'" git_build_options "${git_build_options}")
1166+
string(REPLACE "@GIT_INTEROP_MAKE_OPTS@" "" git_build_options "${git_build_options}")
1167+
string(REPLACE "@GIT_PERF_LARGE_REPO@" "" git_build_options "${git_build_options}")
1168+
string(REPLACE "@GIT_PERF_MAKE_COMMAND@" "" git_build_options "${git_build_options}")
1169+
string(REPLACE "@GIT_PERF_MAKE_OPTS@" "" git_build_options "${git_build_options}")
1170+
string(REPLACE "@GIT_PERF_REPEAT_COUNT@" "" git_build_options "${git_build_options}")
1171+
string(REPLACE "@GIT_PERF_REPO@" "" git_build_options "${git_build_options}")
1172+
string(REPLACE "@GIT_TEST_CMP@" "" git_build_options "${git_build_options}")
1173+
string(REPLACE "@GIT_TEST_CMP_USE_COPIED_CONTEXT@" "" git_build_options "${git_build_options}")
1174+
string(REPLACE "@GIT_TEST_GITPERLLIB@" "'${CMAKE_BINARY_DIR}/perl/build/lib'" git_build_options "${git_build_options}")
1175+
string(REPLACE "@GIT_TEST_INDEX_VERSION@" "" git_build_options "${git_build_options}")
1176+
string(REPLACE "@GIT_TEST_MERGE_TOOLS_DIR@" "'${CMAKE_BINARY_DIR}/mergetools'" git_build_options "${git_build_options}")
1177+
string(REPLACE "@GIT_TEST_OPTS@" "" git_build_options "${git_build_options}")
1178+
string(REPLACE "@GIT_TEST_PERL_FATAL_WARNINGS@" "" git_build_options "${git_build_options}")
1179+
string(REPLACE "@GIT_TEST_POPATH@" "'${CMAKE_BINARY_DIR}/po'" git_build_options "${git_build_options}")
1180+
string(REPLACE "@GIT_TEST_TEMPLATE_DIR@" "'${CMAKE_BINARY_DIR}/templates/blt'" git_build_options "${git_build_options}")
1181+
string(REPLACE "@GIT_TEST_TEXTDOMAINDIR@" "'${CMAKE_BINARY_DIR}/po/build/locale'" git_build_options "${git_build_options}")
1182+
string(REPLACE "@GIT_TEST_UTF8_LOCALE@" "" git_build_options "${git_build_options}")
1183+
string(REPLACE "@LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
11691184
string(REPLACE "@NO_CURL@" "${NO_CURL}" git_build_options "${git_build_options}")
1170-
string(REPLACE "@NO_ICONV@" "${NO_ICONV}" git_build_options "${git_build_options}")
11711185
string(REPLACE "@NO_EXPAT@" "${NO_EXPAT}" git_build_options "${git_build_options}")
1172-
string(REPLACE "@USE_LIBPCRE2@" "" git_build_options "${git_build_options}")
1186+
string(REPLACE "@NO_GETTEXT@" "${NO_GETTEXT}" git_build_options "${git_build_options}")
1187+
string(REPLACE "@NO_ICONV@" "${NO_ICONV}" git_build_options "${git_build_options}")
11731188
string(REPLACE "@NO_PERL@" "${NO_PERL}" git_build_options "${git_build_options}")
1189+
string(REPLACE "@NO_PERL_CPAN_FALLBACKS@" "" git_build_options "${git_build_options}")
11741190
string(REPLACE "@NO_PTHREADS@" "${NO_PTHREADS}" git_build_options "${git_build_options}")
11751191
string(REPLACE "@NO_PYTHON@" "${NO_PYTHON}" git_build_options "${git_build_options}")
11761192
string(REPLACE "@NO_REGEX@" "" git_build_options "${git_build_options}")
11771193
string(REPLACE "@NO_UNIX_SOCKETS@" "${NO_UNIX_SOCKETS}" git_build_options "${git_build_options}")
11781194
string(REPLACE "@PAGER_ENV@" "'${PAGER_ENV}'" git_build_options "${git_build_options}")
1179-
string(REPLACE "@SANITIZE_LEAK@" "" git_build_options "${git_build_options}")
1195+
string(REPLACE "@PERL_LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
1196+
string(REPLACE "@PERL_PATH@" "'${PERL_PATH}'" git_build_options "${git_build_options}")
1197+
string(REPLACE "@PYTHON_PATH@" "'${PYTHON_PATH}'" git_build_options "${git_build_options}")
1198+
string(REPLACE "@RUNTIME_PREFIX@" "'${RUNTIME_PREFIX}'" git_build_options "${git_build_options}")
11801199
string(REPLACE "@SANITIZE_ADDRESS@" "" git_build_options "${git_build_options}")
1181-
string(REPLACE "@X@" "${EXE_EXTENSION}" git_build_options "${git_build_options}")
1182-
string(REPLACE "@FSMONITOR_DAEMON_BACKEND@" "win32" git_build_options "${git_build_options}")
1183-
string(REPLACE "@FSMONITOR_OS_SETTINGS@" "win32" git_build_options "${git_build_options}")
1200+
string(REPLACE "@SANITIZE_LEAK@" "" git_build_options "${git_build_options}")
1201+
string(REPLACE "@SHELL_PATH@" "'${SHELL_PATH}'" git_build_options "${git_build_options}")
1202+
string(REPLACE "@TAR@" "'${TAR}'" git_build_options "${git_build_options}")
11841203
string(REPLACE "@TEST_OUTPUT_DIRECTORY@" "" git_build_options "${git_build_options}")
1185-
string(REPLACE "@GIT_TEST_OPTS@" "" git_build_options "${git_build_options}")
1186-
string(REPLACE "@GIT_TEST_CMP@" "" git_build_options "${git_build_options}")
1187-
string(REPLACE "@GIT_TEST_CMP_USE_COPIED_CONTEXT@" "" git_build_options "${git_build_options}")
1188-
string(REPLACE "@GIT_TEST_UTF8_LOCALE@" "" git_build_options "${git_build_options}")
1189-
string(REPLACE "@NO_GETTEXT@" "${NO_GETTEXT}" git_build_options "${git_build_options}")
1190-
string(REPLACE "@GIT_PERF_REPEAT_COUNT@" "" git_build_options "${git_build_options}")
1191-
string(REPLACE "@GIT_PERF_REPO@" "" git_build_options "${git_build_options}")
1192-
string(REPLACE "@GIT_PERF_LARGE_REPO@" "" git_build_options "${git_build_options}")
1193-
string(REPLACE "@GIT_PERF_MAKE_OPTS@" "" git_build_options "${git_build_options}")
1194-
string(REPLACE "@GIT_PERF_MAKE_COMMAND@" "" git_build_options "${git_build_options}")
1195-
string(REPLACE "@GIT_INTEROP_MAKE_OPTS@" "" git_build_options "${git_build_options}")
1196-
string(REPLACE "@GIT_TEST_INDEX_VERSION@" "" git_build_options "${git_build_options}")
1197-
string(REPLACE "@GIT_TEST_PERL_FATAL_WARNINGS@" "" git_build_options "${git_build_options}")
1198-
string(REPLACE "@GIT_TEST_TEXTDOMAINDIR@" "'${CMAKE_BINARY_DIR}/po/build/locale'" git_build_options "${git_build_options}")
1199-
string(REPLACE "@GIT_TEST_POPATH@" "'${CMAKE_BINARY_DIR}/po'" git_build_options "${git_build_options}")
1200-
string(REPLACE "@GIT_TEST_TEMPLATE_DIR@" "'${CMAKE_BINARY_DIR}/templates/blt'" git_build_options "${git_build_options}")
1201-
string(REPLACE "@GIT_TEST_GITPERLLIB@" "'${CMAKE_BINARY_DIR}/perl/build/lib'" git_build_options "${git_build_options}")
1202-
string(REPLACE "@GIT_TEST_MERGE_TOOLS_DIR@" "'${CMAKE_BINARY_DIR}/mergetools'" git_build_options "${git_build_options}")
1203-
string(REPLACE "@RUNTIME_PREFIX@" "'${RUNTIME_PREFIX}'" git_build_options "${git_build_options}")
1204-
string(REPLACE "@GITWEBDIR@" "'${GITWEBDIR}'" git_build_options "${git_build_options}")
1204+
string(REPLACE "@TEST_SHELL_PATH@" "'${TEST_SHELL_PATH}'" git_build_options "${git_build_options}")
12051205
string(REPLACE "@USE_GETTEXT_SCHEME@" "" git_build_options "${git_build_options}")
1206-
string(REPLACE "@LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
1207-
string(REPLACE "@BROKEN_PATH_FIX@" "" git_build_options "${git_build_options}")
1206+
string(REPLACE "@USE_LIBPCRE2@" "" git_build_options "${git_build_options}")
1207+
string(REPLACE "@X@" "${EXE_EXTENSION}" git_build_options "${git_build_options}")
12081208
if(USE_VCPKG)
12091209
string(APPEND git_build_options "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
12101210
endif()

0 commit comments

Comments
 (0)