Skip to content

Commit d1f07dd

Browse files
gitstergitster
committed
Merge branch 'ps/build-tweaks'
Tweak the build infrastructure by moving tools around. * ps/build-tweaks: meson: precompile "git-compat-util.h" meson: compile compatibility sources separately git-compat-util.h: move warning infra to prepare for PCHs builds: move build scripts into "tools/" contrib: move "update-unicode.sh" script into "tools/" contrib: move "coverage-diff.sh" script into "tools/" contrib: move "coccinelle/" directory into "tools/" Introduce new "tools/" directory
2 parents ebd8fa7 + 671df48 commit d1f07dd

49 files changed

Lines changed: 123 additions & 99 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,8 +1005,8 @@ SPATCH_TEST_FLAGS =
10051005
# COMPUTE_HEADER_DEPENDENCIES=no this will be unset too.
10061006
SPATCH_USE_O_DEPENDENCIES = YesPlease
10071007

1008-
# Set SPATCH_CONCAT_COCCI to concatenate the contrib/cocci/*.cocci
1009-
# files into a single contrib/cocci/ALL.cocci before running
1008+
# Set SPATCH_CONCAT_COCCI to concatenate the tools/coccinelle/*.cocci
1009+
# files into a single tools/coccinelle/ALL.cocci before running
10101010
# "coccicheck".
10111011
#
10121012
# Pros:
@@ -1025,7 +1025,7 @@ SPATCH_USE_O_DEPENDENCIES = YesPlease
10251025
# generate a specific patch, e.g. this will always use strbuf.cocci,
10261026
# not ALL.cocci:
10271027
#
1028-
# make contrib/coccinelle/strbuf.cocci.patch
1028+
# make tools/coccinelle/strbuf.cocci.patch
10291029
SPATCH_CONCAT_COCCI = YesPlease
10301030

10311031
# Rebuild 'coccicheck' if $(SPATCH), its flags etc. change
@@ -1066,11 +1066,13 @@ SOURCES_CMD = ( \
10661066
'*.sh' \
10671067
':!*[tp][0-9][0-9][0-9][0-9]*' \
10681068
':!contrib' \
1069+
':!tools' \
10691070
2>/dev/null || \
10701071
$(FIND) . \
10711072
\( -name .git -type d -prune \) \
10721073
-o \( -name '[tp][0-9][0-9][0-9][0-9]*' -prune \) \
10731074
-o \( -name contrib -type d -prune \) \
1075+
-o \( -name tools -type d -prune \) \
10741076
-o \( -name build -type d -prune \) \
10751077
-o \( -name .build -type d -prune \) \
10761078
-o \( -name 'trash*' -type d -prune \) \
@@ -2697,21 +2699,21 @@ $(BUILT_INS): git$X
26972699
ln -s $< $@ 2>/dev/null || \
26982700
cp $< $@
26992701

2700-
config-list.h: generate-configlist.sh
2702+
config-list.h: tools/generate-configlist.sh
27012703
@mkdir -p .depend
2702-
$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh . $@ .depend/config-list.h.d
2704+
$(QUIET_GEN)$(SHELL_PATH) ./tools/generate-configlist.sh . $@ .depend/config-list.h.d
27032705

27042706
-include .depend/config-list.h.d
27052707

2706-
command-list.h: generate-cmdlist.sh command-list.txt
2708+
command-list.h: tools/generate-cmdlist.sh command-list.txt
27072709

27082710
command-list.h: $(wildcard Documentation/git*.adoc)
2709-
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
2711+
$(QUIET_GEN)$(SHELL_PATH) ./tools/generate-cmdlist.sh \
27102712
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
27112713
. $@
27122714

2713-
hook-list.h: generate-hooklist.sh Documentation/githooks.adoc
2714-
$(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh . $@
2715+
hook-list.h: tools/generate-hooklist.sh Documentation/githooks.adoc
2716+
$(QUIET_GEN)$(SHELL_PATH) ./tools/generate-hooklist.sh . $@
27152717

27162718
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\
27172719
$(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
@@ -2724,8 +2726,8 @@ GIT-SCRIPT-DEFINES: FORCE
27242726
echo "$$FLAGS" >$@; \
27252727
fi
27262728

2727-
$(SCRIPT_SH_GEN) $(SCRIPT_LIB) : % : %.sh generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
2728-
$(QUIET_GEN)./generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
2729+
$(SCRIPT_SH_GEN) $(SCRIPT_LIB) : % : %.sh tools/generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
2730+
$(QUIET_GEN)./tools/generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
27292731
mv $@+ $@
27302732

27312733
git.rc: git.rc.in GIT-VERSION-GEN GIT-VERSION-FILE
@@ -2765,8 +2767,8 @@ endif
27652767

27662768
PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
27672769

2768-
$(SCRIPT_PERL_GEN): % : %.perl generate-perl.sh GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
2769-
$(QUIET_GEN)$(SHELL_PATH) generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "$<" "$@+" && \
2770+
$(SCRIPT_PERL_GEN): % : %.perl tools/generate-perl.sh GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
2771+
$(QUIET_GEN)$(SHELL_PATH) tools/generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "$<" "$@+" && \
27702772
mv $@+ $@
27712773

27722774
PERL_DEFINES := $(subst $(space),:,$(PERL_DEFINES))
@@ -2794,8 +2796,8 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
27942796
perllibdir:
27952797
@echo '$(perllibdir_SQ)'
27962798

2797-
git-instaweb: git-instaweb.sh generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
2798-
$(QUIET_GEN)./generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
2799+
git-instaweb: git-instaweb.sh tools/generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
2800+
$(QUIET_GEN)./tools/generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
27992801
chmod +x $@+ && \
28002802
mv $@+ $@
28012803
else # NO_PERL
@@ -2812,9 +2814,9 @@ endif # NO_PERL
28122814
$(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
28132815

28142816
ifndef NO_PYTHON
2815-
$(SCRIPT_PYTHON_GEN): generate-python.sh
2817+
$(SCRIPT_PYTHON_GEN): tools/generate-python.sh
28162818
$(SCRIPT_PYTHON_GEN): % : %.py
2817-
$(QUIET_GEN)$(SHELL_PATH) generate-python.sh ./GIT-BUILD-OPTIONS "$<" "$@"
2819+
$(QUIET_GEN)$(SHELL_PATH) tools/generate-python.sh ./GIT-BUILD-OPTIONS "$<" "$@"
28182820
else # NO_PYTHON
28192821
$(SCRIPT_PYTHON_GEN): % : unimplemented.sh
28202822
$(QUIET_GEN) \
@@ -3234,9 +3236,9 @@ endif
32343236
NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS))
32353237
endif
32363238

3237-
perl/build/lib/%.pm: perl/%.pm generate-perl.sh GIT-BUILD-OPTIONS GIT-VERSION-FILE GIT-PERL-DEFINES
3239+
perl/build/lib/%.pm: perl/%.pm tools/generate-perl.sh GIT-BUILD-OPTIONS GIT-VERSION-FILE GIT-PERL-DEFINES
32383240
$(call mkdir_p_parent_template)
3239-
$(QUIET_GEN)$(SHELL_PATH) generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "$<" "$@"
3241+
$(QUIET_GEN)$(SHELL_PATH) tools/generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "$<" "$@"
32403242

32413243
perl/build/man/man3/Git.3pm: perl/Git.pm
32423244
$(call mkdir_p_parent_template)
@@ -3465,15 +3467,15 @@ check:
34653467
exit 1; \
34663468
fi
34673469

3468-
COCCI_GEN_ALL = .build/contrib/coccinelle/ALL.cocci
3469-
COCCI_GLOB = $(wildcard contrib/coccinelle/*.cocci)
3470+
COCCI_GEN_ALL = .build/tools/coccinelle/ALL.cocci
3471+
COCCI_GLOB = $(wildcard tools/coccinelle/*.cocci)
34703472
COCCI_RULES_TRACKED = $(COCCI_GLOB:%=.build/%)
34713473
COCCI_RULES_TRACKED_NO_PENDING = $(filter-out %.pending.cocci,$(COCCI_RULES_TRACKED))
34723474
COCCI_RULES =
34733475
COCCI_RULES += $(COCCI_GEN_ALL)
34743476
COCCI_RULES += $(COCCI_RULES_TRACKED)
34753477
COCCI_NAMES =
3476-
COCCI_NAMES += $(COCCI_RULES:.build/contrib/coccinelle/%.cocci=%)
3478+
COCCI_NAMES += $(COCCI_RULES:.build/tools/coccinelle/%.cocci=%)
34773479

34783480
COCCICHECK_PENDING = $(filter %.pending.cocci,$(COCCI_RULES))
34793481
COCCICHECK = $(filter-out $(COCCICHECK_PENDING),$(COCCI_RULES))
@@ -3488,20 +3490,20 @@ COCCICHECK_PATCHES_PENDING_INTREE = $(COCCICHECK_PATCHES_PENDING:.build/%=%)
34883490
# on $(MAKECMDGOALS) that match these $(COCCI_RULES)
34893491
COCCI_RULES_GLOB =
34903492
COCCI_RULES_GLOB += cocci%
3491-
COCCI_RULES_GLOB += .build/contrib/coccinelle/%
3493+
COCCI_RULES_GLOB += .build/tools/coccinelle/%
34923494
COCCI_RULES_GLOB += $(COCCICHECK_PATCHES)
34933495
COCCI_RULES_GLOB += $(COCCICHEC_PATCHES_PENDING)
34943496
COCCI_RULES_GLOB += $(COCCICHECK_PATCHES_INTREE)
34953497
COCCI_RULES_GLOB += $(COCCICHECK_PATCHES_PENDING_INTREE)
34963498
COCCI_GOALS = $(filter $(COCCI_RULES_GLOB),$(MAKECMDGOALS))
34973499

3498-
COCCI_TEST_RES = $(wildcard contrib/coccinelle/tests/*.res)
3500+
COCCI_TEST_RES = $(wildcard tools/coccinelle/tests/*.res)
34993501

35003502
$(COCCI_RULES_TRACKED): .build/% : %
35013503
$(call mkdir_p_parent_template)
35023504
$(QUIET_CP)cp $< $@
35033505

3504-
.build/contrib/coccinelle/FOUND_H_SOURCES: $(FOUND_H_SOURCES)
3506+
.build/tools/coccinelle/FOUND_H_SOURCES: $(FOUND_H_SOURCES)
35053507
$(call mkdir_p_parent_template)
35063508
$(QUIET_GEN) >$@
35073509

@@ -3515,12 +3517,12 @@ endif
35153517
define cocci-rule
35163518

35173519
## Rule for .build/$(1).patch/$(2); Params:
3518-
# $(1) = e.g. ".build/contrib/coccinelle/free.cocci"
3520+
# $(1) = e.g. ".build/tools/coccinelle/free.cocci"
35193521
# $(2) = e.g. "grep.c"
35203522
# $(3) = e.g. "grep.o"
3521-
COCCI_$(1:.build/contrib/coccinelle/%.cocci=%) += $(1).d/$(2).patch
3523+
COCCI_$(1:.build/tools/coccinelle/%.cocci=%) += $(1).d/$(2).patch
35223524
$(1).d/$(2).patch: GIT-SPATCH-DEFINES
3523-
$(1).d/$(2).patch: $(if $(and $(SPATCH_USE_O_DEPENDENCIES),$(wildcard $(3))),$(3),.build/contrib/coccinelle/FOUND_H_SOURCES)
3525+
$(1).d/$(2).patch: $(if $(and $(SPATCH_USE_O_DEPENDENCIES),$(wildcard $(3))),$(3),.build/tools/coccinelle/FOUND_H_SOURCES)
35243526
$(1).d/$(2).patch: $(1)
35253527
$(1).d/$(2).patch: $(1).d/%.patch : %
35263528
$$(call mkdir_p_parent_template)
@@ -3546,13 +3548,13 @@ endif
35463548

35473549
define spatch-rule
35483550

3549-
.build/contrib/coccinelle/$(1).cocci.patch: $$(COCCI_$(1))
3551+
.build/tools/coccinelle/$(1).cocci.patch: $$(COCCI_$(1))
35503552
$$(QUIET_SPATCH_CAT)cat $$^ >$$@ && \
35513553
if test -s $$@; \
35523554
then \
35533555
echo ' ' SPATCH result: $$@; \
35543556
fi
3555-
contrib/coccinelle/$(1).cocci.patch: .build/contrib/coccinelle/$(1).cocci.patch
3557+
tools/coccinelle/$(1).cocci.patch: .build/tools/coccinelle/$(1).cocci.patch
35563558
$$(QUIET_CP)cp $$< $$@
35573559

35583560
endef
@@ -3566,9 +3568,9 @@ $(COCCI_TEST_RES_GEN): GIT-SPATCH-DEFINES
35663568
$(COCCI_TEST_RES_GEN): .build/%.res : %.c
35673569
$(COCCI_TEST_RES_GEN): .build/%.res : %.res
35683570
ifdef SPATCH_CONCAT_COCCI
3569-
$(COCCI_TEST_RES_GEN): .build/contrib/coccinelle/tests/%.res : $(COCCI_GEN_ALL)
3571+
$(COCCI_TEST_RES_GEN): .build/tools/coccinelle/tests/%.res : $(COCCI_GEN_ALL)
35703572
else
3571-
$(COCCI_TEST_RES_GEN): .build/contrib/coccinelle/tests/%.res : contrib/coccinelle/%.cocci
3573+
$(COCCI_TEST_RES_GEN): .build/tools/coccinelle/tests/%.res : tools/coccinelle/%.cocci
35723574
endif
35733575
$(call mkdir_p_parent_template)
35743576
$(QUIET_SPATCH_TEST)$(SPATCH) $(SPATCH_TEST_FLAGS) \
@@ -3584,14 +3586,14 @@ coccicheck-test: $(COCCI_TEST_RES_GEN)
35843586
coccicheck: coccicheck-test
35853587

35863588
ifdef SPATCH_CONCAT_COCCI
3587-
COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = contrib/coccinelle/ALL.cocci.patch
3589+
COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = tools/coccinelle/ALL.cocci.patch
35883590
else
35893591
COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = $(COCCICHECK_PATCHES_INTREE)
35903592
endif
35913593
coccicheck: $(COCCICHECK_PATCH_MUST_BE_EMPTY_FILES)
35923594
! grep ^ $(COCCICHECK_PATCH_MUST_BE_EMPTY_FILES) /dev/null
35933595

3594-
# See contrib/coccinelle/README
3596+
# See tools/coccinelle/README
35953597
coccicheck-pending: coccicheck-test
35963598
coccicheck-pending: $(COCCICHECK_PATCHES_PENDING_INTREE)
35973599

@@ -3865,8 +3867,8 @@ profile-clean:
38653867

38663868
cocciclean:
38673869
$(RM) GIT-SPATCH-DEFINES
3868-
$(RM) -r .build/contrib/coccinelle
3869-
$(RM) contrib/coccinelle/*.cocci.patch
3870+
$(RM) -r .build/tools/coccinelle
3871+
$(RM) tools/coccinelle/*.cocci.patch
38703872

38713873
clean: profile-clean coverage-clean cocciclean
38723874
$(RM) -r .build $(UNIT_TEST_BIN)
@@ -3944,7 +3946,7 @@ check-docs::
39443946
### Make sure built-ins do not have dups and listed in git.c
39453947
#
39463948
check-builtins::
3947-
./check-builtins.sh
3949+
./tools/check-builtins.sh
39483950

39493951
### Test suite coverage testing
39503952
#

‎ci/run-static-analysis.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ make coccicheck
1010
set +x
1111

1212
fail=
13-
for cocci_patch in contrib/coccinelle/*.patch
13+
for cocci_patch in tools/coccinelle/*.patch
1414
do
1515
if test -s "$cocci_patch"
1616
then

‎config.mak.dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ifndef COMPILER_FEATURES
2-
COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
2+
COMPILER_FEATURES := $(shell ./tools/detect-compiler $(CC))
33
endif
44

55
ifeq ($(filter no-error,$(DEVOPTS)),)

‎contrib/buildsystems/CMakeLists.txt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -636,22 +636,22 @@ set(EXCLUSION_PROGS_CACHE ${EXCLUSION_PROGS} CACHE STRING "Programs not built" F
636636
if(NOT EXISTS ${CMAKE_BINARY_DIR}/command-list.h OR NOT EXCLUSION_PROGS_CACHE STREQUAL EXCLUSION_PROGS)
637637
list(REMOVE_ITEM EXCLUSION_PROGS empty)
638638
message("Generating command-list.h")
639-
execute_process(COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/generate-cmdlist.sh"
639+
execute_process(COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/tools/generate-cmdlist.sh"
640640
${EXCLUSION_PROGS}
641641
"${CMAKE_SOURCE_DIR}"
642642
"${CMAKE_BINARY_DIR}/command-list.h")
643643
endif()
644644

645645
if(NOT EXISTS ${CMAKE_BINARY_DIR}/config-list.h)
646646
message("Generating config-list.h")
647-
execute_process(COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/generate-configlist.sh"
647+
execute_process(COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/tools/generate-configlist.sh"
648648
"${CMAKE_SOURCE_DIR}"
649649
"${CMAKE_BINARY_DIR}/config-list.h")
650650
endif()
651651

652652
if(NOT EXISTS ${CMAKE_BINARY_DIR}/hook-list.h)
653653
message("Generating hook-list.h")
654-
execute_process(COMMAND "${SH_EXE}" ${CMAKE_SOURCE_DIR}/generate-hooklist.sh
654+
execute_process(COMMAND "${SH_EXE}" ${CMAKE_SOURCE_DIR}/tools/generate-hooklist.sh
655655
"${CMAKE_SOURCE_DIR}"
656656
"${CMAKE_BINARY_DIR}/hook-list.h")
657657
endif()
@@ -832,11 +832,11 @@ foreach(script ${git_shell_scripts})
832832
endif()
833833

834834
add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/${shell_gen_path}"
835-
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/generate-script.sh"
835+
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/tools/generate-script.sh"
836836
"${CMAKE_SOURCE_DIR}/${script}.sh"
837837
"${CMAKE_BINARY_DIR}/${shell_gen_path}"
838838
"${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS"
839-
DEPENDS "${CMAKE_SOURCE_DIR}/generate-script.sh"
839+
DEPENDS "${CMAKE_SOURCE_DIR}/tools/generate-script.sh"
840840
"${CMAKE_SOURCE_DIR}/${script}.sh"
841841
VERBATIM)
842842
list(APPEND shell_gen ${CMAKE_BINARY_DIR}/${shell_gen_path})
@@ -875,13 +875,13 @@ foreach(script ${git_perl_scripts} ${perl_modules})
875875
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${perl_gen_dir}")
876876

877877
add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/${perl_gen_path}"
878-
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/generate-perl.sh"
878+
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/tools/generate-perl.sh"
879879
"${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS"
880880
"${CMAKE_BINARY_DIR}/GIT-VERSION-FILE"
881881
"${CMAKE_BINARY_DIR}/GIT-PERL-HEADER"
882882
"${CMAKE_SOURCE_DIR}/${script}"
883883
"${CMAKE_BINARY_DIR}/${perl_gen_path}"
884-
DEPENDS "${CMAKE_SOURCE_DIR}/generate-perl.sh"
884+
DEPENDS "${CMAKE_SOURCE_DIR}/tools/generate-perl.sh"
885885
"${CMAKE_SOURCE_DIR}/${script}"
886886
"${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS"
887887
"${CMAKE_BINARY_DIR}/GIT-VERSION-FILE"
@@ -892,11 +892,11 @@ add_custom_target(perl-gen ALL DEPENDS ${perl_gen})
892892

893893
# Python script
894894
add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/git-p4"
895-
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/generate-python.sh"
895+
COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/tools/generate-python.sh"
896896
"${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS"
897897
"${CMAKE_SOURCE_DIR}/git-p4.py"
898898
"${CMAKE_BINARY_DIR}/git-p4"
899-
DEPENDS "${CMAKE_SOURCE_DIR}/generate-python.sh"
899+
DEPENDS "${CMAKE_SOURCE_DIR}/tools/generate-python.sh"
900900
"${CMAKE_SOURCE_DIR}/git-p4.py"
901901
"${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS"
902902
VERBATIM)

‎contrib/meson.build‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ foreach feature : get_option('contrib')
22
subdir(feature)
33
endforeach
44

5-
subdir('coccinelle')
65
subdir('credential')

‎contrib/subtree/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ git_subtree = custom_target(
33
output: 'git-subtree',
44
command: [
55
shell,
6-
meson.project_source_root() / 'generate-script.sh',
6+
meson.project_source_root() / 'tools/generate-script.sh',
77
'@INPUT@',
88
'@OUTPUT@',
99
meson.project_build_root() / 'GIT-BUILD-OPTIONS',

‎git-compat-util.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ struct strbuf;
3434
# define DISABLE_WARNING(warning)
3535
#endif
3636

37-
#ifdef DISABLE_SIGN_COMPARE_WARNINGS
38-
DISABLE_WARNING(-Wsign-compare)
39-
#endif
40-
4137
#undef FLEX_ARRAY
4238
#define FLEX_ARRAY /* empty - weather balloon to require C99 FAM */
4339

@@ -1099,3 +1095,7 @@ extern int not_supposed_to_survive;
10991095
#endif /* CHECK_ASSERTION_SIDE_EFFECTS */
11001096

11011097
#endif
1098+
1099+
#ifdef DISABLE_SIGN_COMPARE_WARNINGS
1100+
DISABLE_WARNING(-Wsign-compare)
1101+
#endif

0 commit comments

Comments
 (0)