Skip to content

Commit 306ab35

Browse files
gitstergitster
committed
Merge branch 'ps/meson-test-wo-gitweb'
meson-based build without GitWeb failed the self tests. * ps/meson-test-wo-gitweb: meson: enable auto-discovered "gitweb" GIT-BUILD-OPTIONS: wire up NO_GITWEB option GIT-BUILD-OPTIONS: sort variables alphabetically
2 parents df2faf1 + d963ac9 commit 306ab35

File tree

6 files changed

+147
-135
lines changed

6 files changed

+147
-135
lines changed

‎GIT-BUILD-OPTIONS.in

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
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_GITWEB=@NO_GITWEB@
28+
NO_ICONV=@NO_ICONV@
1329
NO_PERL=@NO_PERL@
30+
NO_PERL_CPAN_FALLBACKS=@NO_PERL_CPAN_FALLBACKS@
1431
NO_PTHREADS=@NO_PTHREADS@
1532
NO_PYTHON=@NO_PYTHON@
1633
NO_REGEX=@NO_REGEX@
1734
NO_UNIX_SOCKETS=@NO_UNIX_SOCKETS@
1835
PAGER_ENV=@PAGER_ENV@
19-
SANITIZE_LEAK=@SANITIZE_LEAK@
36+
PERL_LOCALEDIR=@PERL_LOCALEDIR@
37+
PERL_PATH=@PERL_PATH@
38+
PYTHON_PATH=@PYTHON_PATH@
39+
RUNTIME_PREFIX=@RUNTIME_PREFIX@
2040
SANITIZE_ADDRESS=@SANITIZE_ADDRESS@
21-
X=@X@
22-
FSMONITOR_DAEMON_BACKEND=@FSMONITOR_DAEMON_BACKEND@
23-
FSMONITOR_OS_SETTINGS=@FSMONITOR_OS_SETTINGS@
41+
SANITIZE_LEAK=@SANITIZE_LEAK@
42+
SHELL_PATH=@SHELL_PATH@
43+
TAR=@TAR@
2444
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@
45+
TEST_SHELL_PATH=@TEST_SHELL_PATH@
4546
USE_GETTEXT_SCHEME=@USE_GETTEXT_SCHEME@
46-
LOCALEDIR=@LOCALEDIR@
47-
BROKEN_PATH_FIX=@BROKEN_PATH_FIX@
47+
USE_LIBPCRE2=@USE_LIBPCRE2@
48+
X=@X@

‎Makefile

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3145,53 +3145,54 @@ 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_GITWEB@|\'$(NO_GITWEB)\'|" \
3175+
-e "s|@NO_ICONV@|\'$(NO_ICONV)\'|" \
31603176
-e "s|@NO_PERL@|\'$(NO_PERL)\'|" \
3177+
-e "s|@NO_PERL_CPAN_FALLBACKS@|\'$(NO_PERL_CPAN_FALLBACKS_SQ)\'|" \
31613178
-e "s|@NO_PTHREADS@|\'$(NO_PTHREADS)\'|" \
31623179
-e "s|@NO_PYTHON@|\'$(NO_PYTHON)\'|" \
31633180
-e "s|@NO_REGEX@|\'$(NO_REGEX)\'|" \
31643181
-e "s|@NO_UNIX_SOCKETS@|\'$(NO_UNIX_SOCKETS)\'|" \
31653182
-e "s|@PAGER_ENV@|\'$(PAGER_ENV)\'|" \
3166-
-e "s|@SANITIZE_LEAK@|\'$(SANITIZE_LEAK)\'|" \
3183+
-e "s|@PERL_LOCALEDIR@|\'$(perl_localedir_SQ)\'|" \
3184+
-e "s|@PERL_PATH@|\'$(PERL_PATH_SQ)\'|" \
3185+
-e "s|@PYTHON_PATH@|\'$(PYTHON_PATH_SQ)\'|" \
3186+
-e "s|@RUNTIME_PREFIX@|\'$(RUNTIME_PREFIX_OPTION)\'|" \
31673187
-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)\'|" \
3188+
-e "s|@SANITIZE_LEAK@|\'$(SANITIZE_LEAK)\'|" \
3189+
-e "s|@SHELL_PATH@|\'$(SHELL_PATH_SQ)\'|" \
3190+
-e "s|@TAR@|\'$(TAR)\'|" \
31713191
-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)\'|" \
3192+
-e "s|@TEST_SHELL_PATH@|\'$(TEST_SHELL_PATH_SQ)\'|" \
31923193
-e "s|@USE_GETTEXT_SCHEME@|\'$(USE_GETTEXT_SCHEME)\'|" \
3193-
-e "s|@LOCALEDIR@|\'$(localedir_SQ)\'|" \
3194-
-e "s!@BROKEN_PATH_FIX@!\'$(BROKEN_PATH_FIX)\'!" \
3194+
-e "s|@USE_LIBPCRE2@|\'$(USE_LIBPCRE2)\'|" \
3195+
-e "s|@X@|\'$(X)\'|" \
31953196
GIT-BUILD-OPTIONS.in >$@+
31963197
@if grep -q '^[A-Z][A-Z_]*=@.*@$$' $@+; then echo "Unsubstituted build options in $@" >&2 && exit 1; fi
31973198
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi

‎contrib/buildsystems/CMakeLists.txt

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,53 +1158,54 @@ 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_GITWEB@" "1" git_build_options "${git_build_options}")
1188+
string(REPLACE "@NO_ICONV@" "${NO_ICONV}" git_build_options "${git_build_options}")
11731189
string(REPLACE "@NO_PERL@" "${NO_PERL}" git_build_options "${git_build_options}")
1190+
string(REPLACE "@NO_PERL_CPAN_FALLBACKS@" "" git_build_options "${git_build_options}")
11741191
string(REPLACE "@NO_PTHREADS@" "${NO_PTHREADS}" git_build_options "${git_build_options}")
11751192
string(REPLACE "@NO_PYTHON@" "${NO_PYTHON}" git_build_options "${git_build_options}")
11761193
string(REPLACE "@NO_REGEX@" "" git_build_options "${git_build_options}")
11771194
string(REPLACE "@NO_UNIX_SOCKETS@" "${NO_UNIX_SOCKETS}" git_build_options "${git_build_options}")
11781195
string(REPLACE "@PAGER_ENV@" "'${PAGER_ENV}'" git_build_options "${git_build_options}")
1179-
string(REPLACE "@SANITIZE_LEAK@" "" git_build_options "${git_build_options}")
1196+
string(REPLACE "@PERL_LOCALEDIR@" "'${LOCALEDIR}'" git_build_options "${git_build_options}")
1197+
string(REPLACE "@PERL_PATH@" "'${PERL_PATH}'" git_build_options "${git_build_options}")
1198+
string(REPLACE "@PYTHON_PATH@" "'${PYTHON_PATH}'" git_build_options "${git_build_options}")
1199+
string(REPLACE "@RUNTIME_PREFIX@" "'${RUNTIME_PREFIX}'" git_build_options "${git_build_options}")
11801200
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}")
1201+
string(REPLACE "@SANITIZE_LEAK@" "" git_build_options "${git_build_options}")
1202+
string(REPLACE "@SHELL_PATH@" "'${SHELL_PATH}'" git_build_options "${git_build_options}")
1203+
string(REPLACE "@TAR@" "'${TAR}'" git_build_options "${git_build_options}")
11841204
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}")
1205+
string(REPLACE "@TEST_SHELL_PATH@" "'${TEST_SHELL_PATH}'" git_build_options "${git_build_options}")
12051206
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}")
1207+
string(REPLACE "@USE_LIBPCRE2@" "" git_build_options "${git_build_options}")
1208+
string(REPLACE "@X@" "${EXE_EXTENSION}" git_build_options "${git_build_options}")
12081209
if(USE_VCPKG)
12091210
string(APPEND git_build_options "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
12101211
endif()

‎meson.build

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,34 +1456,6 @@ else
14561456
build_options_config.set('RUNTIME_PREFIX', 'false')
14571457
endif
14581458

1459-
foreach key, value : {
1460-
'DIFF': diff.full_path(),
1461-
'GIT_TEST_CMP': diff.full_path() + ' -u',
1462-
'GIT_TEST_GITPERLLIB': meson.project_build_root() / 'perl',
1463-
'GIT_TEST_MERGE_TOOLS_DIR': meson.project_source_root() / 'mergetools',
1464-
'GIT_TEST_POPATH': meson.project_source_root() / 'po',
1465-
'GIT_TEST_TEMPLATE_DIR': meson.project_build_root() / 'templates',
1466-
'GIT_TEST_TEXTDOMAINDIR': meson.project_build_root() / 'po',
1467-
'PAGER_ENV': get_option('pager_environment'),
1468-
'PERL_PATH': perl.found() ? perl.full_path() : '',
1469-
'PYTHON_PATH': python.found () ? python.full_path() : '',
1470-
'SHELL_PATH': shell.full_path(),
1471-
'TAR': tar.full_path(),
1472-
'TEST_OUTPUT_DIRECTORY': test_output_directory,
1473-
'TEST_SHELL_PATH': shell.full_path(),
1474-
}
1475-
if value != '' and cygpath.found()
1476-
value = run_command(cygpath, value, check: true).stdout().strip()
1477-
endif
1478-
build_options_config.set_quoted(key, value)
1479-
endforeach
1480-
1481-
configure_file(
1482-
input: 'GIT-BUILD-OPTIONS.in',
1483-
output: 'GIT-BUILD-OPTIONS',
1484-
configuration: build_options_config,
1485-
)
1486-
14871459
git_version_file = custom_target(
14881460
command: [
14891461
shell,
@@ -1891,8 +1863,11 @@ subdir('contrib')
18911863
# We make sure further up that Perl is required in case the gitweb option is
18921864
# enabled.
18931865
gitweb_option = get_option('gitweb').disable_auto_if(not perl.found())
1894-
if gitweb_option.enabled()
1866+
if gitweb_option.allowed()
18951867
subdir('gitweb')
1868+
build_options_config.set('NO_GITWEB', '')
1869+
else
1870+
build_options_config.set('NO_GITWEB', '1')
18961871
endif
18971872

18981873
subdir('templates')
@@ -1909,11 +1884,39 @@ if get_option('docs') != []
19091884
subdir('Documentation')
19101885
endif
19111886

1887+
foreach key, value : {
1888+
'DIFF': diff.full_path(),
1889+
'GIT_TEST_CMP': diff.full_path() + ' -u',
1890+
'GIT_TEST_GITPERLLIB': meson.project_build_root() / 'perl',
1891+
'GIT_TEST_MERGE_TOOLS_DIR': meson.project_source_root() / 'mergetools',
1892+
'GIT_TEST_POPATH': meson.project_source_root() / 'po',
1893+
'GIT_TEST_TEMPLATE_DIR': meson.project_build_root() / 'templates',
1894+
'GIT_TEST_TEXTDOMAINDIR': meson.project_build_root() / 'po',
1895+
'PAGER_ENV': get_option('pager_environment'),
1896+
'PERL_PATH': perl.found() ? perl.full_path() : '',
1897+
'PYTHON_PATH': python.found () ? python.full_path() : '',
1898+
'SHELL_PATH': shell.full_path(),
1899+
'TAR': tar.full_path(),
1900+
'TEST_OUTPUT_DIRECTORY': test_output_directory,
1901+
'TEST_SHELL_PATH': shell.full_path(),
1902+
}
1903+
if value != '' and cygpath.found()
1904+
value = run_command(cygpath, value, check: true).stdout().strip()
1905+
endif
1906+
build_options_config.set_quoted(key, value)
1907+
endforeach
1908+
1909+
configure_file(
1910+
input: 'GIT-BUILD-OPTIONS.in',
1911+
output: 'GIT-BUILD-OPTIONS',
1912+
configuration: build_options_config,
1913+
)
1914+
19121915
summary({
19131916
'curl': curl.found(),
19141917
'expat': expat.found(),
19151918
'gettext': intl.found(),
1916-
'gitweb': gitweb_option.enabled(),
1919+
'gitweb': gitweb_option.allowed(),
19171920
'https': https_backend,
19181921
'iconv': iconv.found(),
19191922
'pcre2': pcre2.found(),

‎t/lib-gitweb.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ if ! test_have_prereq PERL; then
105105
test_done
106106
fi
107107

108+
if ! test_have_prereq GITWEB; then
109+
skip_all='skipping gitweb tests, gitweb not available'
110+
test_done
111+
fi
112+
108113
perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 || {
109114
skip_all='skipping gitweb tests, perl version is too old'
110115
test_done

‎t/test-lib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,6 +1687,7 @@ esac
16871687

16881688
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
16891689
test -z "$NO_CURL" && test_set_prereq LIBCURL
1690+
test -z "$NO_GITWEB" && test_set_prereq GITWEB
16901691
test -z "$NO_ICONV" && test_set_prereq ICONV
16911692
test -z "$NO_PERL" && test_set_prereq PERL
16921693
test -z "$NO_PTHREADS" && test_set_prereq PTHREADS

0 commit comments

Comments
 (0)