summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2019-07-29 20:08:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-07-29 21:51:43 (GMT)
commitb18ae14a8f6da9a04d0a6e4698d8ccea4afb546d (patch)
tree59afeebac1a24d9af9f1f582dc77dc9d703f05de /contrib
parent976aaedca0c6f64b37f4241bf06fa7ab06095986 (diff)
downloadgit-b18ae14a8f6da9a04d0a6e4698d8ccea4afb546d.zip
git-b18ae14a8f6da9a04d0a6e4698d8ccea4afb546d.tar.gz
git-b18ae14a8f6da9a04d0a6e4698d8ccea4afb546d.tar.bz2
vcxproj: also link-or-copy builtins
The default location for `.exe` files linked by Visual Studio depends on the mode (debug vs release) and the architecture. Meaning: after a full build, there is a `git.exe` in the top-level directory, but none of the built-ins are linked.. When running a test script in Git Bash, it therefore would pick up the wrong, say, `git-receive-pack.exe`: the one installed at the same time as the Git Bash. Absolutely not what we want. We want to have confidence that our test covers the MSVC-built Git executables, and not some random stuff. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/buildsystems/Generators/Vcxproj.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index e65d78e..576ccab 100644
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -274,6 +274,9 @@ EOM
</Target>
EOM
}
+ if ($target eq 'git') {
+ print F " <Import Project=\"LinkOrCopyBuiltins.targets\" />\n";
+ }
print F << "EOM";
</Project>
EOM