Skip to content

Commit 214fd07

Browse files
committed
msvc: add a Makefile target to pre-generate the VS solution
The entire idea of generating the VS solution makes only sense if we generate it via Continuous Integration; otherwise potential users would still have to download the entire Git for Windows SDK. So let's just add a target in the Makefile that can be used to generate said solution; The generated files will then be committed so that they can be pushed to a branch ready to check out by Visual Studio users. To make things even more useful, we also generate and commit other files that are required to run the test suite, such as templates and bin-wrappers: with this, developers can run the test suite in a regular Git Bash (that is part of a regular Git for Windows installation) after building the solution in Visual Studio. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 0abb9b8 commit 214fd07

File tree

1 file changed

+59
-0
lines changed

1 file changed

+59
-0
lines changed

config.mak.uname

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,65 @@ endif
440440
X = .exe
441441

442442
compat/msvc.o: compat/msvc.c compat/mingw.c GIT-CFLAGS
443+
444+
vcxproj:
445+
# Require clean work tree
446+
git update-index -q --refresh && \
447+
git diff-files --quiet && \
448+
git diff-index --cached --quiet HEAD --
449+
450+
# Make .vcxproj files and add them
451+
unset QUIET_GEN QUIET_BUILT_IN; \
452+
perl contrib/buildsystems/generate -g Vcxproj
453+
git add -f git.sln {*,*/lib,t/helper/*}/{packages.config,*.vcxproj}
454+
455+
# Add common-cmds.h
456+
$(MAKE) MSVC=1 prefix=/mingw64 common-cmds.h
457+
git add -f common-cmds.h
458+
459+
# Add scripts
460+
rm -f perl/perl.mak
461+
$(MAKE) MSVC=1 prefix=/mingw64 \
462+
$(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
463+
# Strip out the sane tool path, needed only for building
464+
sed -i '/^git_broken_path_fix ".*/d' git-sh-setup
465+
git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
466+
467+
# Add Perl module
468+
$(MAKE) -C perl
469+
git add -f perl/blib/lib
470+
471+
# Add bin-wrappers, for testing
472+
rm -rf bin-wrappers/
473+
$(MAKE) MSVC=1 prefix=/mingw64 $(test_bindir_programs)
474+
# Ensure that the GIT_EXEC_PATH is a Unix-y one, and that the absolute
475+
# path of the repository is not hard-coded (GIT_EXEC_PATH will be set
476+
# by test-lib.sh according to the current setup)
477+
sed -i -e 's/^\(GIT_EXEC_PATH\)=.*/test -n "$${\1##*:*}" ||\
478+
\1="$$(cygpath -u "$$\1")"/' \
479+
-e "s|'$$(pwd)|\"\$$GIT_EXEC_PATH\"'|g" bin-wrappers/*
480+
# Ensure that test-* helpers find the .dll files copied to top-level
481+
sed -i 's|^PATH=.*|&:"$$GIT_EXEC_PATH"|' bin-wrappers/test-*
482+
# We do not want to force hard-linking builtins
483+
sed -i 's|\(git\)-\([-a-z]*\)\.exe"|\1.exe" \2|g' \
484+
bin-wrappers/git-{receive-pack,upload-archive}
485+
git add -f $(test_bindir_programs)
486+
# remote-ext is a builtin, but invoked as if it were external
487+
sed 's|receive-pack|remote-ext|g' \
488+
<bin-wrappers/git-receive-pack >bin-wrappers/git-remote-ext
489+
git add -f bin-wrappers/git-remote-ext
490+
491+
# Add templates
492+
$(MAKE) -C templates
493+
git add -f templates/boilerplates.made templates/blt/
494+
495+
# Add build options
496+
$(MAKE) MSVC=1 prefix=/mingw64 GIT-BUILD-OPTIONS
497+
git add -f GIT-BUILD-OPTIONS
498+
499+
# Commit the whole shebang
500+
git commit -m "Generate Visual Studio solution" \
501+
-m "Auto-generated by \`$(MAKE)$(MAKEFLAGS) $@\`"
443502
endif
444503
ifeq ($(uname_S),Interix)
445504
NO_INITGROUPS = YesPlease

0 commit comments

Comments
 (0)