vcxproj: only copy `git-remote-http.exe` once it was built

In b18ae14a8f6 (vcxproj: also link-or-copy builtins, 2019-07-29), we
started to copy or hard-link the built-ins as a post-build step of the
`git` project.

At the same time, we tried to copy or hard-link `git-remote-http.exe`,
but it is quite possible that it was not built at that time.

Let's move that latter task into a post-install step of the
`git-remote-http` project instead.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/config.mak.uname b/config.mak.uname
index db7f06b95fda4ea8de9f409e11f594c163220463..701aad62b1f34abeee84d30853b311380d934464 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -703,20 +703,24 @@ vcxproj:
        perl contrib/buildsystems/generate -g Vcxproj
        git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj
 
-       # Generate the LinkOrCopyBuiltins.targets file
+       # Generate the LinkOrCopyBuiltins.targets and LinkOrCopyRemoteHttp.targets file
        (echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
         echo '  <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
         for name in $(BUILT_INS);\
         do \
           echo '    <Copy SourceFiles="$$(OutDir)\git.exe" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
         done && \
+        echo '  </Target>' && \
+        echo '</Project>') >git/LinkOrCopyBuiltins.targets
+       (echo '<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">' && \
+        echo '  <Target Name="CopyBuiltins_AfterBuild" AfterTargets="AfterBuild">' && \
         for name in $(REMOTE_CURL_ALIASES); \
         do \
           echo '    <Copy SourceFiles="$$(OutDir)\'"$(REMOTE_CURL_PRIMARY)"'" DestinationFiles="$$(OutDir)\'"$$name"'" SkipUnchangedFiles="true" UseHardlinksIfPossible="true" />'; \
         done && \
         echo '  </Target>' && \
-        echo '</Project>') >git/LinkOrCopyBuiltins.targets
-       git add -f git/LinkOrCopyBuiltins.targets
+        echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
+       git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
 
        # Add command-list.h
        $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h

diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index 576ccabe1dbda06b90ee70a1882ef726315a2182..868b787855a73c960e697c3691fcc56406061e92 100644 (file)
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -277,6 +277,9 @@ EOM
     if ($target eq 'git') {
       print F "  <Import Project=\"LinkOrCopyBuiltins.targets\" />\n";
     }
+    if ($target eq 'git-remote-http') {
+      print F "  <Import Project=\"LinkOrCopyRemoteHttp.targets\" />\n";
+    }
     print F << "EOM";
 </Project>
 EOM