Skip to content

Commit 2d733b9

Browse files
gitstergitster
committed
Merge branch 'ps/build-tweaks' into rs/use-strvec-pushv
The topic moves the coccinelle rules from contrib/ to tools/ directory, breaking merges with this topic. * 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 6e8d538 + 671df48 commit 2d733b9

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 \) \
@@ -2693,21 +2695,21 @@ $(BUILT_INS): git$X
26932695
ln -s $< $@ 2>/dev/null || \
26942696
cp $< $@
26952697

2696-
config-list.h: generate-configlist.sh
2698+
config-list.h: tools/generate-configlist.sh
26972699
@mkdir -p .depend
2698-
$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh . $@ .depend/config-list.h.d
2700+
$(QUIET_GEN)$(SHELL_PATH) ./tools/generate-configlist.sh . $@ .depend/config-list.h.d
26992701

27002702
-include .depend/config-list.h.d
27012703

2702-
command-list.h: generate-cmdlist.sh command-list.txt
2704+
command-list.h: tools/generate-cmdlist.sh command-list.txt
27032705

27042706
command-list.h: $(wildcard Documentation/git*.adoc)
2705-
$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
2707+
$(QUIET_GEN)$(SHELL_PATH) ./tools/generate-cmdlist.sh \
27062708
$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
27072709
. $@
27082710

2709-
hook-list.h: generate-hooklist.sh Documentation/githooks.adoc
2710-
$(QUIET_GEN)$(SHELL_PATH) ./generate-hooklist.sh . $@
2711+
hook-list.h: tools/generate-hooklist.sh Documentation/githooks.adoc
2712+
$(QUIET_GEN)$(SHELL_PATH) ./tools/generate-hooklist.sh . $@
27112713

27122714
SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):\
27132715
$(localedir_SQ):$(USE_GETTEXT_SCHEME):$(SANE_TOOL_PATH_SQ):\
@@ -2720,8 +2722,8 @@ GIT-SCRIPT-DEFINES: FORCE
27202722
echo "$$FLAGS" >$@; \
27212723
fi
27222724

2723-
$(SCRIPT_SH_GEN) $(SCRIPT_LIB) : % : %.sh generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
2724-
$(QUIET_GEN)./generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
2725+
$(SCRIPT_SH_GEN) $(SCRIPT_LIB) : % : %.sh tools/generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
2726+
$(QUIET_GEN)./tools/generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
27252727
mv $@+ $@
27262728

27272729
git.rc: git.rc.in GIT-VERSION-GEN GIT-VERSION-FILE
@@ -2761,8 +2763,8 @@ endif
27612763

27622764
PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
27632765

2764-
$(SCRIPT_PERL_GEN): % : %.perl generate-perl.sh GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
2765-
$(QUIET_GEN)$(SHELL_PATH) generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "$<" "$@+" && \
2766+
$(SCRIPT_PERL_GEN): % : %.perl tools/generate-perl.sh GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
2767+
$(QUIET_GEN)$(SHELL_PATH) tools/generate-perl.sh ./GIT-BUILD-OPTIONS ./GIT-VERSION-FILE GIT-PERL-HEADER "$<" "$@+" && \
27662768
mv $@+ $@
27672769

27682770
PERL_DEFINES := $(subst $(space),:,$(PERL_DEFINES))
@@ -2790,8 +2792,8 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
27902792
perllibdir:
27912793
@echo '$(perllibdir_SQ)'
27922794

2793-
git-instaweb: git-instaweb.sh generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
2794-
$(QUIET_GEN)./generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
2795+
git-instaweb: git-instaweb.sh tools/generate-script.sh GIT-BUILD-OPTIONS GIT-SCRIPT-DEFINES
2796+
$(QUIET_GEN)./tools/generate-script.sh "$<" "$@+" ./GIT-BUILD-OPTIONS && \
27952797
chmod +x $@+ && \
27962798
mv $@+ $@
27972799
else # NO_PERL
@@ -2808,9 +2810,9 @@ endif # NO_PERL
28082810
$(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
28092811

28102812
ifndef NO_PYTHON
2811-
$(SCRIPT_PYTHON_GEN): generate-python.sh
2813+
$(SCRIPT_PYTHON_GEN): tools/generate-python.sh
28122814
$(SCRIPT_PYTHON_GEN): % : %.py
2813-
$(QUIET_GEN)$(SHELL_PATH) generate-python.sh ./GIT-BUILD-OPTIONS "$<" "$@"
2815+
$(QUIET_GEN)$(SHELL_PATH) tools/generate-python.sh ./GIT-BUILD-OPTIONS "$<" "$@"
28142816
else # NO_PYTHON
28152817
$(SCRIPT_PYTHON_GEN): % : unimplemented.sh
28162818
$(QUIET_GEN) \
@@ -3230,9 +3232,9 @@ endif
32303232
NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS))
32313233
endif
32323234

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

32373239
perl/build/man/man3/Git.3pm: perl/Git.pm
32383240
$(call mkdir_p_parent_template)
@@ -3461,15 +3463,15 @@ check:
34613463
exit 1; \
34623464
fi
34633465

3464-
COCCI_GEN_ALL = .build/contrib/coccinelle/ALL.cocci
3465-
COCCI_GLOB = $(wildcard contrib/coccinelle/*.cocci)
3466+
COCCI_GEN_ALL = .build/tools/coccinelle/ALL.cocci
3467+
COCCI_GLOB = $(wildcard tools/coccinelle/*.cocci)
34663468
COCCI_RULES_TRACKED = $(COCCI_GLOB:%=.build/%)
34673469
COCCI_RULES_TRACKED_NO_PENDING = $(filter-out %.pending.cocci,$(COCCI_RULES_TRACKED))
34683470
COCCI_RULES =
34693471
COCCI_RULES += $(COCCI_GEN_ALL)
34703472
COCCI_RULES += $(COCCI_RULES_TRACKED)
34713473
COCCI_NAMES =
3472-
COCCI_NAMES += $(COCCI_RULES:.build/contrib/coccinelle/%.cocci=%)
3474+
COCCI_NAMES += $(COCCI_RULES:.build/tools/coccinelle/%.cocci=%)
34733475

34743476
COCCICHECK_PENDING = $(filter %.pending.cocci,$(COCCI_RULES))
34753477
COCCICHECK = $(filter-out $(COCCICHECK_PENDING),$(COCCI_RULES))
@@ -3484,20 +3486,20 @@ COCCICHECK_PATCHES_PENDING_INTREE = $(COCCICHECK_PATCHES_PENDING:.build/%=%)
34843486
# on $(MAKECMDGOALS) that match these $(COCCI_RULES)
34853487
COCCI_RULES_GLOB =
34863488
COCCI_RULES_GLOB += cocci%
3487-
COCCI_RULES_GLOB += .build/contrib/coccinelle/%
3489+
COCCI_RULES_GLOB += .build/tools/coccinelle/%
34883490
COCCI_RULES_GLOB += $(COCCICHECK_PATCHES)
34893491
COCCI_RULES_GLOB += $(COCCICHEC_PATCHES_PENDING)
34903492
COCCI_RULES_GLOB += $(COCCICHECK_PATCHES_INTREE)
34913493
COCCI_RULES_GLOB += $(COCCICHECK_PATCHES_PENDING_INTREE)
34923494
COCCI_GOALS = $(filter $(COCCI_RULES_GLOB),$(MAKECMDGOALS))
34933495

3494-
COCCI_TEST_RES = $(wildcard contrib/coccinelle/tests/*.res)
3496+
COCCI_TEST_RES = $(wildcard tools/coccinelle/tests/*.res)
34953497

34963498
$(COCCI_RULES_TRACKED): .build/% : %
34973499
$(call mkdir_p_parent_template)
34983500
$(QUIET_CP)cp $< $@
34993501

3500-
.build/contrib/coccinelle/FOUND_H_SOURCES: $(FOUND_H_SOURCES)
3502+
.build/tools/coccinelle/FOUND_H_SOURCES: $(FOUND_H_SOURCES)
35013503
$(call mkdir_p_parent_template)
35023504
$(QUIET_GEN) >$@
35033505

@@ -3511,12 +3513,12 @@ endif
35113513
define cocci-rule
35123514

35133515
## Rule for .build/$(1).patch/$(2); Params:
3514-
# $(1) = e.g. ".build/contrib/coccinelle/free.cocci"
3516+
# $(1) = e.g. ".build/tools/coccinelle/free.cocci"
35153517
# $(2) = e.g. "grep.c"
35163518
# $(3) = e.g. "grep.o"
3517-
COCCI_$(1:.build/contrib/coccinelle/%.cocci=%) += $(1).d/$(2).patch
3519+
COCCI_$(1:.build/tools/coccinelle/%.cocci=%) += $(1).d/$(2).patch
35183520
$(1).d/$(2).patch: GIT-SPATCH-DEFINES
3519-
$(1).d/$(2).patch: $(if $(and $(SPATCH_USE_O_DEPENDENCIES),$(wildcard $(3))),$(3),.build/contrib/coccinelle/FOUND_H_SOURCES)
3521+
$(1).d/$(2).patch: $(if $(and $(SPATCH_USE_O_DEPENDENCIES),$(wildcard $(3))),$(3),.build/tools/coccinelle/FOUND_H_SOURCES)
35203522
$(1).d/$(2).patch: $(1)
35213523
$(1).d/$(2).patch: $(1).d/%.patch : %
35223524
$$(call mkdir_p_parent_template)
@@ -3542,13 +3544,13 @@ endif
35423544

35433545
define spatch-rule
35443546

3545-
.build/contrib/coccinelle/$(1).cocci.patch: $$(COCCI_$(1))
3547+
.build/tools/coccinelle/$(1).cocci.patch: $$(COCCI_$(1))
35463548
$$(QUIET_SPATCH_CAT)cat $$^ >$$@ && \
35473549
if test -s $$@; \
35483550
then \
35493551
echo ' ' SPATCH result: $$@; \
35503552
fi
3551-
contrib/coccinelle/$(1).cocci.patch: .build/contrib/coccinelle/$(1).cocci.patch
3553+
tools/coccinelle/$(1).cocci.patch: .build/tools/coccinelle/$(1).cocci.patch
35523554
$$(QUIET_CP)cp $$< $$@
35533555

35543556
endef
@@ -3562,9 +3564,9 @@ $(COCCI_TEST_RES_GEN): GIT-SPATCH-DEFINES
35623564
$(COCCI_TEST_RES_GEN): .build/%.res : %.c
35633565
$(COCCI_TEST_RES_GEN): .build/%.res : %.res
35643566
ifdef SPATCH_CONCAT_COCCI
3565-
$(COCCI_TEST_RES_GEN): .build/contrib/coccinelle/tests/%.res : $(COCCI_GEN_ALL)
3567+
$(COCCI_TEST_RES_GEN): .build/tools/coccinelle/tests/%.res : $(COCCI_GEN_ALL)
35663568
else
3567-
$(COCCI_TEST_RES_GEN): .build/contrib/coccinelle/tests/%.res : contrib/coccinelle/%.cocci
3569+
$(COCCI_TEST_RES_GEN): .build/tools/coccinelle/tests/%.res : tools/coccinelle/%.cocci
35683570
endif
35693571
$(call mkdir_p_parent_template)
35703572
$(QUIET_SPATCH_TEST)$(SPATCH) $(SPATCH_TEST_FLAGS) \
@@ -3580,14 +3582,14 @@ coccicheck-test: $(COCCI_TEST_RES_GEN)
35803582
coccicheck: coccicheck-test
35813583

35823584
ifdef SPATCH_CONCAT_COCCI
3583-
COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = contrib/coccinelle/ALL.cocci.patch
3585+
COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = tools/coccinelle/ALL.cocci.patch
35843586
else
35853587
COCCICHECK_PATCH_MUST_BE_EMPTY_FILES = $(COCCICHECK_PATCHES_INTREE)
35863588
endif
35873589
coccicheck: $(COCCICHECK_PATCH_MUST_BE_EMPTY_FILES)
35883590
! grep ^ $(COCCICHECK_PATCH_MUST_BE_EMPTY_FILES) /dev/null
35893591

3590-
# See contrib/coccinelle/README
3592+
# See tools/coccinelle/README
35913593
coccicheck-pending: coccicheck-test
35923594
coccicheck-pending: $(COCCICHECK_PATCHES_PENDING_INTREE)
35933595

@@ -3861,8 +3863,8 @@ profile-clean:
38613863

38623864
cocciclean:
38633865
$(RM) GIT-SPATCH-DEFINES
3864-
$(RM) -r .build/contrib/coccinelle
3865-
$(RM) contrib/coccinelle/*.cocci.patch
3866+
$(RM) -r .build/tools/coccinelle
3867+
$(RM) tools/coccinelle/*.cocci.patch
38663868

38673869
clean: profile-clean coverage-clean cocciclean
38683870
$(RM) -r .build $(UNIT_TEST_BIN)
@@ -3940,7 +3942,7 @@ check-docs::
39403942
### Make sure built-ins do not have dups and listed in git.c
39413943
#
39423944
check-builtins::
3943-
./check-builtins.sh
3945+
./tools/check-builtins.sh
39443946

39453947
### Test suite coverage testing
39463948
#

‎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)