diff mbox series

vcbuild: fix batch file name in README

Message ID pull.721.git.1599077900986.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit 3384a1ef78cae095d527d106cc15ca13b075c05f
Headers show
Series vcbuild: fix batch file name in README | expand

Commit Message

Linus Arver via GitGitGadget Sept. 2, 2020, 8:18 p.m. UTC
From: Orgad Shaneh <orgads@gmail.com>

Signed-off-by: Orgad Shaneh <orgads@gmail.com>
---
    vcbuild: Fix batch file name in README
    
    Signed-off-by: Orgad Shaneh orgads@gmail.com [orgads@gmail.com]

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(-)


base-commit: e19713638985533ce461db072b49112da5bd2042

Comments

Jonathan Nieder Sept. 3, 2020, 12:02 a.m. UTC | #1
(cc-ing Jeff Hostetler, vcbuild expert)
Orgad Shaneh wrote:

> Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> ---
> 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.

Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>

> diff --git a/compat/vcbuild/README b/compat/vcbuild/README
> index 42292e7c09..51fb083dbb 100644
> --- 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:
> 
> base-commit: e19713638985533ce461db072b49112da5bd2042
> -- 
> gitgitgadget
Johannes Schindelin Sept. 3, 2020, 1:50 a.m. UTC | #2
Hi Orgad,

On Wed, 2 Sep 2020, Orgad Shaneh via GitGitGadget wrote:

> From: Orgad Shaneh <orgads@gmail.com>
>
> Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> ---
>     vcbuild: Fix batch file name in README
>
>     Signed-off-by: Orgad Shaneh orgads@gmail.com [orgads@gmail.com]
>
> 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(-)
>
> diff --git a/compat/vcbuild/README b/compat/vcbuild/README
> index 42292e7c09..51fb083dbb 100644
> --- 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

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

ACK & Thanks,
Dscho

>
>  3. Build git using MSVC from an SDK bash window using one of the
>     following commands:
>
> base-commit: e19713638985533ce461db072b49112da5bd2042
> --
> gitgitgadget
>
Johannes Schindelin Sept. 3, 2020, 1:55 a.m. UTC | #3
Hi Jonathan,

On Wed, 2 Sep 2020, Jonathan Nieder wrote:

> (cc-ing Jeff Hostetler, vcbuild expert)
> Orgad Shaneh wrote:
>
> > Signed-off-by: Orgad Shaneh <orgads@gmail.com>
> > ---
> > 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.

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

>
> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
>
> > diff --git a/compat/vcbuild/README b/compat/vcbuild/README
> > index 42292e7c09..51fb083dbb 100644
> > --- 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:
> >
> > base-commit: e19713638985533ce461db072b49112da5bd2042
> > --
> > gitgitgadget
>
diff mbox series

Patch

diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 42292e7c09..51fb083dbb 100644
--- 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: