Skip to contentSkip to conversation

vcbuild: fix batch file name in README

PATCH In review Orgad Shaneh via GitGitGadget 3 participants 4 messages Sep 2, 2020 – Sep 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vcbuild: fix batch file name in README

From: Orgad Shaneh <[email protected]>

---
vcbuild: Fix batch file name in README

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-721%2Forgads%2Fvcbuild-readme-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-721/orgads/vcbuild-readme-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/721

 compat/vcbuild/README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
compat/vcbuild/README +2 -2
index 42292e7c09..51fb083dbb 100644
@@ -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:

base-commit: e19713638985533ce461db072b49112da5bd2042

Signature · 1 line
gitgitgadget
Reviewed-by on v1 1/1
#1 lore raw

(cc-ing Jeff Hostetler, vcbuild expert)

Quoted 8 lines · Orgad Shaneh

---
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-721%2Forgads%2Fvcbuild-readme-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-721/orgads/vcbuild-readme-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/721

 compat/vcbuild/README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Makes sense. This discrepancy is already present in the initial contribution dce7d295514 (msvc: support building Git using MS Visual C++, 2019-06-25), so it's probably from documentation going out of date between review rounds.

Quoted 19 lines
compat/vcbuild/README +2 -2
index 42292e7c09..51fb083dbb 100644
@@ -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:

base-commit: e19713638985533ce461db072b49112da5bd2042

Signature · 1 line
gitgitgadget
#3 lore raw
In reply to Orgad Shaneh via GitGitGadget

Hi Orgad,

Quoted 20 lines · Orgad Shaneh via GitGitGadget

From: Orgad Shaneh <[email protected]>

---
vcbuild: Fix batch file name in README

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-721%2Forgads%2Fvcbuild-readme-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-721/orgads/vcbuild-readme-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/721

 compat/vcbuild/README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
compat/vcbuild/README +0 -0
index 42292e7c09..51fb083dbb 100644

compat/vcbuild/README The Steps to Build Git with VS2015 or VS2017 from the command line. · line 30

Quoted 7 lines
compat/vcbuild/README +2 -2
@@ -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

Good catch! Somewhere in my refactoring spree, I must have overlooked this reference.

ACK & Thanks,
Dscho

Quoted 8 lines
compat/vcbuild/README +0 -0
 3. Build git using MSVC from an SDK bash window using one of the
    following commands:
 

base-commit: e19713638985533ce461db072b49112da5bd2042 --
gitgitgadget

#2 lore raw
In reply to Jonathan Nieder

Hi Jonathan,

Quoted 9 lines · Jonathan Nieder

(cc-ing Jeff Hostetler, vcbuild expert)

Quoted 6 lines · Orgad Shaneh

---
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-721%2Forgads%2Fvcbuild-readme-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-721/orgads/vcbuild-readme-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/721

Quoted 7 lines
Quoted 2 lines
 compat/vcbuild/README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Makes sense. This discrepancy is already present in the initial contribution dce7d295514 (msvc: support building Git using MS Visual C++, 2019-06-25), so it's probably from documentation going out of date between review rounds.

Not in _public_ review rounds, as even the first version I sent did not have that .bat file anymore:
https://github.com/gitgitgadget/git/tree/pr-149/dscho/msvc-v1/compat/vcbuild

FWIW the old name was a hold-over from the time when we tried to use NuGet packages (and I think this is the first time I mentioned this on this here mailing list), which we were able to abandon in favor of using vcpkg.

Ciao,
Dscho

Quoted 23 lines
Quoted 19 lines
compat/vcbuild/README +2 -2
index 42292e7c09..51fb083dbb 100644
@@ -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:

base-commit: e19713638985533ce461db072b49112da5bd2042 --
gitgitgadget