Skip to content

Commit 1624c08

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 be4f40d commit 1624c08

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
@@ -406,6 +406,65 @@ else
406406
BASIC_CFLAGS += -Zi -MDd
407407
endif
408408
X = .exe
409+
410+
vcxproj:
411+
# Require clean work tree
412+
git update-index -q --refresh && \
413+
git diff-files --quiet && \
414+
git diff-index --cached --quiet HEAD --
415+
416+
# Make .vcxproj files and add them
417+
unset QUIET_GEN QUIET_BUILT_IN; \
418+
perl contrib/buildsystems/generate -g Vcxproj
419+
git add -f git.sln {*,*/lib,t/helper/*}/{packages.config,*.vcxproj}
420+
421+
# Add common-cmds.h
422+
$(MAKE) MSVC=1 prefix=/mingw64 common-cmds.h
423+
git add -f common-cmds.h
424+
425+
# Add scripts
426+
rm -f perl/perl.mak
427+
$(MAKE) MSVC=1 prefix=/mingw64 \
428+
$(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
429+
# Strip out the sane tool path, needed only for building
430+
sed -i '/^git_broken_path_fix ".*/d' git-sh-setup
431+
git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN)
432+
433+
# Add Perl module
434+
$(MAKE) -C perl
435+
git add -f perl/blib/lib
436+
437+
# Add bin-wrappers, for testing
438+
rm -rf bin-wrappers/
439+
$(MAKE) MSVC=1 prefix=/mingw64 $(test_bindir_programs)
440+
# Ensure that the GIT_EXEC_PATH is a Unix-y one, and that the absolute
441+
# path of the repository is not hard-coded (GIT_EXEC_PATH will be set
442+
# by test-lib.sh according to the current setup)
443+
sed -i -e 's/^\(GIT_EXEC_PATH\)=.*/test -n "$${\1##*:*}" ||\
444+
\1="$$(cygpath -u "$$\1")"/' \
445+
-e "s|'$$(pwd)|\"\$$GIT_EXEC_PATH\"'|g" bin-wrappers/*
446+
# Ensure that test-* helpers find the .dll files copied to top-level
447+
sed -i 's|^PATH=.*|&:"$$GIT_EXEC_PATH"|' bin-wrappers/test-*
448+
# We do not want to force hard-linking builtins
449+
sed -i 's|\(git\)-\([-a-z]*\)\.exe"|\1.exe" \2|g' \
450+
bin-wrappers/git-{receive-pack,upload-archive}
451+
git add -f $(test_bindir_programs)
452+
# remote-ext is a builtin, but invoked as if it were external
453+
sed 's|receive-pack|remote-ext|g' \
454+
<bin-wrappers/git-receive-pack >bin-wrappers/git-remote-ext
455+
git add -f bin-wrappers/git-remote-ext
456+
457+
# Add templates
458+
$(MAKE) -C templates
459+
git add -f templates/boilerplates.made templates/blt/
460+
461+
# Add build options
462+
$(MAKE) MSVC=1 prefix=/mingw64 GIT-BUILD-OPTIONS
463+
git add -f GIT-BUILD-OPTIONS
464+
465+
# Commit the whole shebang
466+
git commit -m "Generate Visual Studio solution" \
467+
-m "Auto-generated by \`$(MAKE)$(MAKEFLAGS) $@\`"
409468
endif
410469
ifeq ($(uname_S),Interix)
411470
NO_INITGROUPS = YesPlease

0 commit comments

Comments
 (0)