Merge branch 'os/vcbuild'

gitster · gitster · commit ff75e6c99c29 · 2020-09-09T13:53:09.000-07:00
Fix build procedure for MSVC.

* os/vcbuild:
  contrib/buildsystems: fix expat library name for generated vcxproj
  vcbuild: fix batch file name in README
  vcbuild: fix library name for expat with make MSVC=1
diff --git a/compat/vcbuild/README b/compat/vcbuild/README
@@ -26,8 +26,8 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
    Use ONE of the following forms which should match how you want to
    compile git.exe.
 
-   $ ./compat/vcbuild/vcpkg_copy_packages.bat debug
-   $ ./compat/vcbuild/vcpkg_copy_packages.bat release
+   $ ./compat/vcbuild/vcpkg_copy_dlls.bat debug
+   $ ./compat/vcbuild/vcpkg_copy_dlls.bat release
 
 3. Build git using MSVC from an SDK bash window using one of the
    following commands:
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
@@ -66,7 +66,7 @@
 		}
 		push(@args, $lib);
 	} elsif ("$arg" eq "-lexpat") {
-		push(@args, "expat.lib");
+		push(@args, "libexpat.lib");
 	} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
 		$arg =~ s/^-L/-LIBPATH:/;
 		push(@lflags, $arg);
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -80,6 +80,7 @@ sub createProject {
       $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
       $libs_debug = $libs_release;
       $libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
+      $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
       $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
     }
 
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
@@ -349,7 +349,7 @@ sub handleLinkLine
         } elsif ("$part" eq "-lcurl") {
             push(@libs, "libcurl.lib");
         } elsif ("$part" eq "-lexpat") {
-            push(@libs, "expat.lib");
+            push(@libs, "libexpat.lib");
         } elsif ("$part" eq "-liconv") {
             push(@libs, "libiconv.lib");
         } elsif ($part =~ /^[-\/]/) {

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@`
`66`	`66`	`}`
`67`	`67`	`push(@args, $lib);`
`68`	`68`	`} elsif ("$arg" eq "-lexpat") {`
`69`		`- push(@args, "expat.lib");`
	`69`	`+ push(@args, "libexpat.lib");`
`70`	`70`	`} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {`
`71`	`71`	`$arg =~ s/^-L/-LIBPATH:/;`
`72`	`72`	`push(@lflags, $arg);`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ sub createProject {`
`80`	`80`	`$libs_release = join(";", sort(grep /^(?!libgit\.lib\|xdiff\/lib\.lib\|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));`
`81`	`81`	`$libs_debug = $libs_release;`
`82`	`82`	`$libs_debug =~ s/zlib\.lib/zlibd\.lib/g;`
	`83`	`+ $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;`
`83`	`84`	`$libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;`
`84`	`85`	`}`
`85`	`86`