Skip to content

Commit 5d65ad1

Browse files
dschogitster
authored andcommitted
vcxproj: include more generated files
In the CI builds, we bundle all generated files into a so-called artifacts `.tar` file, so that the test phase can fan out into multiple parallel builds. This patch makes sure that all files are included in the `vcxproj` target which are needed for that artifacts `.tar` file. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 030a628 commit 5d65ad1

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

config.mak.uname

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -728,11 +728,10 @@ vcxproj:
728728

729729
# Add scripts
730730
rm -f perl/perl.mak
731-
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 \
732-
$(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
731+
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(SCRIPT_LIB) $(SCRIPTS)
733732
# Strip out the sane tool path, needed only for building
734733
sed -i '/^git_broken_path_fix ".*/d' git-sh-setup
735-
git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
734+
git add -f $(SCRIPT_LIB) $(SCRIPTS)
736735

737736
# Add Perl module
738737
$(MAKE) $(LIB_PERL_GEN)
@@ -762,6 +761,10 @@ vcxproj:
762761
$(MAKE) -C templates
763762
git add -f templates/boilerplates.made templates/blt/
764763

764+
# Add the translated messages
765+
make MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(MOFILES)
766+
git add -f $(MOFILES)
767+
765768
# Add build options
766769
$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 GIT-BUILD-OPTIONS
767770
git add -f GIT-BUILD-OPTIONS

0 commit comments

Comments
 (0)