git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / Atom feed
* [PATCH] compat/vcbuild/README: clean/update 'vcpkg' env for Visual Studio updates
@ 2019-05-28 12:08 Philip Oakley
  2019-05-28 13:56 ` Jeff Hostetler
  0 siblings, 1 reply; 5+ messages in thread
From: Philip Oakley @ 2019-05-28 12:08 UTC (permalink / raw)
  To: GitList; +Cc: Jeff Hostetler, Johannes Schindelin

When the user installs an updated version of Visual Studio, the previously
generated MSVC-DEFS-GEN will need to be deleted to allow updating.

Alternatively the whole vcpkg download may be cleaned allowing it to be
reloaded, though this may take much longer on slower connections.

Signed-off-by: Philip Oakley <philipoakley@iee.org>
---

In response to discussions at:
https://github.com/git-for-windows/git/issues/2186

cc: Jeff Hostetler <git@jeffhostetler.com>
cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>

 compat/vcbuild/README | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 81da36a93b..40695fc1cc 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -18,6 +18,13 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
    Makefile:
       <repo_root>/compat/vcbuild/MSVC-DEFS-GEN
 
+   - If you update your Visual Studio version, then delete the MSVC-DEFS-GEN
+   file so that fresh environment variables can be discovered.
+
+   Or clean the "vcpkg" environment with:
+
+   $ make MSVC=1 clean
+
 2. OPTIONALLY copy the third-party *.dll and *.pdb files into the repo
    root to make it easier to run and debug git.exe without having to
    manipulate your PATH.  This is especially true for debug sessions in
-- 
2.22.0.rc1.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] compat/vcbuild/README: clean/update 'vcpkg' env for Visual Studio updates
  2019-05-28 12:08 [PATCH] compat/vcbuild/README: clean/update 'vcpkg' env for Visual Studio updates Philip Oakley
@ 2019-05-28 13:56 ` Jeff Hostetler
  2019-05-28 14:09   ` Philip Oakley
  0 siblings, 1 reply; 5+ messages in thread
From: Jeff Hostetler @ 2019-05-28 13:56 UTC (permalink / raw)
  To: Philip Oakley, GitList; +Cc: Johannes Schindelin



On 5/28/2019 8:08 AM, Philip Oakley wrote:
> When the user installs an updated version of Visual Studio, the previously
> generated MSVC-DEFS-GEN will need to be deleted to allow updating.
> 
> Alternatively the whole vcpkg download may be cleaned allowing it to be
> reloaded, though this may take much longer on slower connections.
> 
> Signed-off-by: Philip Oakley <philipoakley@iee.org>
> ---
> 
> In response to discussions at:
> https://github.com/git-for-windows/git/issues/2186
> 
> cc: Jeff Hostetler <git@jeffhostetler.com>
> cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> 
>   compat/vcbuild/README | 7 +++++++
>   1 file changed, 7 insertions(+)
> 
> diff --git a/compat/vcbuild/README b/compat/vcbuild/README
> index 81da36a93b..40695fc1cc 100644
> --- a/compat/vcbuild/README
> +++ b/compat/vcbuild/README
> @@ -18,6 +18,13 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
>      Makefile:
>         <repo_root>/compat/vcbuild/MSVC-DEFS-GEN
>   
> +   - If you update your Visual Studio version, then delete the MSVC-DEFS-GEN
> +   file so that fresh environment variables can be discovered.
> +
> +   Or clean the "vcpkg" environment with:
> +
> +   $ make MSVC=1 clean
> +
>   2. OPTIONALLY copy the third-party *.dll and *.pdb files into the repo
>      root to make it easier to run and debug git.exe without having to
>      manipulate your PATH.  This is especially true for debug sessions in
> 

Did you mean to send this upstream or to Git for Windows?

I didn't think that the VS2015/VS2017 vcpkg-aware version of
compat/vcbuild/* had made it upstream yet, so this patch might not
apply upstream.


BTW, the Makefile (when MSVC=1 is defined) will take care of deleting
the MSVC-DEFS-GEN, so all we really need to say here is to do:

     $ make MSVC=1 clean
or  $ make MSVC=1 DEBUG=1 clean

after upgrading to a new version of VS.

Jeff

PS. I have a TODO item to fix the Makefile to automatically detect
and take care of this.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] compat/vcbuild/README: clean/update 'vcpkg' env for Visual Studio updates
  2019-05-28 13:56 ` Jeff Hostetler
@ 2019-05-28 14:09   ` Philip Oakley
  2019-05-28 14:32     ` Jeff Hostetler
  2019-05-28 18:06     ` Johannes Schindelin
  0 siblings, 2 replies; 5+ messages in thread
From: Philip Oakley @ 2019-05-28 14:09 UTC (permalink / raw)
  To: Jeff Hostetler, GitList; +Cc: Johannes Schindelin

Hi Jeff,

On 28/05/2019 14:56, Jeff Hostetler wrote:
> On 5/28/2019 8:08 AM, Philip Oakley wrote:
>> When the user installs an updated version of Visual Studio, the 
>> previously
>> generated MSVC-DEFS-GEN will need to be deleted to allow updating.
>>
>> Alternatively the whole vcpkg download may be cleaned allowing it to be
>> reloaded, though this may take much longer on slower connections.
>>
>> Signed-off-by: Philip Oakley <philipoakley@iee.org>
>> ---
>>
>> In response to discussions at:
>> https://github.com/git-for-windows/git/issues/2186
>>
>> cc: Jeff Hostetler <git@jeffhostetler.com>
>> cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>>
>>   compat/vcbuild/README | 7 +++++++
>>   1 file changed, 7 insertions(+)
>>
>> diff --git a/compat/vcbuild/README b/compat/vcbuild/README
>> index 81da36a93b..40695fc1cc 100644
>> --- a/compat/vcbuild/README
>> +++ b/compat/vcbuild/README
>> @@ -18,6 +18,13 @@ The Steps to Build Git with VS2015 or VS2017 from 
>> the command line.
>>      Makefile:
>>         <repo_root>/compat/vcbuild/MSVC-DEFS-GEN
>>   +   - If you update your Visual Studio version, then delete the 
>> MSVC-DEFS-GEN
>> +   file so that fresh environment variables can be discovered.
>> +
>> +   Or clean the "vcpkg" environment with:
>> +
>> +   $ make MSVC=1 clean
>> +
>>   2. OPTIONALLY copy the third-party *.dll and *.pdb files into the repo
>>      root to make it easier to run and debug git.exe without having to
>>      manipulate your PATH.  This is especially true for debug 
>> sessions in
>>
>
> Did you mean to send this upstream or to Git for Windows?
>
> I didn't think that the VS2015/VS2017 vcpkg-aware version of
> compat/vcbuild/* had made it upstream yet, so this patch might not
> apply upstream.
Ah, that would be my mistake.
>
>
> BTW, the Makefile (when MSVC=1 is defined) will take care of deleting
> the MSVC-DEFS-GEN, so all we really need to say here is to do:
>
>     $ make MSVC=1 clean
> or  $ make MSVC=1 DEBUG=1 clean
>
> after upgrading to a new version of VS.
It (my suggestion) was the difference between a deep clean of all the 
1.05GB of vcpkg files, vs  the 847 bytes of just the MSVC-DEFS-GEN file 
that was a concern.

The need to repeat the download of 1GB just because of a VS version 
change felt a bit excessive, hence the initial suggestion.
>
> Jeff
>
> PS. I have a TODO item to fix the Makefile to automatically detect
> and take care of this.
Thanks.
IIUC download of the vcpkg files are separate from the generation of the 
MSVC-DEFS-GEN file - or are their inter-linkages?
--
Philip

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] compat/vcbuild/README: clean/update 'vcpkg' env for Visual Studio updates
  2019-05-28 14:09   ` Philip Oakley
@ 2019-05-28 14:32     ` Jeff Hostetler
  2019-05-28 18:06     ` Johannes Schindelin
  1 sibling, 0 replies; 5+ messages in thread
From: Jeff Hostetler @ 2019-05-28 14:32 UTC (permalink / raw)
  To: Philip Oakley, GitList; +Cc: Johannes Schindelin



On 5/28/2019 10:09 AM, Philip Oakley wrote:
> Hi Jeff,
> 
> On 28/05/2019 14:56, Jeff Hostetler wrote:
>> On 5/28/2019 8:08 AM, Philip Oakley wrote:
>>> When the user installs an updated version of Visual Studio, the 
>>> previously
>>> generated MSVC-DEFS-GEN will need to be deleted to allow updating.
>>>
>>> Alternatively the whole vcpkg download may be cleaned allowing it to be
>>> reloaded, though this may take much longer on slower connections.
>>>
>>> Signed-off-by: Philip Oakley <philipoakley@iee.org>
>>> ---
>>>
>>> In response to discussions at:
>>> https://github.com/git-for-windows/git/issues/2186
>>>
>>> cc: Jeff Hostetler <git@jeffhostetler.com>
>>> cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>
>>>
>>>   compat/vcbuild/README | 7 +++++++
>>>   1 file changed, 7 insertions(+)
>>>
>>> diff --git a/compat/vcbuild/README b/compat/vcbuild/README
>>> index 81da36a93b..40695fc1cc 100644
>>> --- a/compat/vcbuild/README
>>> +++ b/compat/vcbuild/README
>>> @@ -18,6 +18,13 @@ The Steps to Build Git with VS2015 or VS2017 from 
>>> the command line.
>>>      Makefile:
>>>         <repo_root>/compat/vcbuild/MSVC-DEFS-GEN
>>>   +   - If you update your Visual Studio version, then delete the 
>>> MSVC-DEFS-GEN
>>> +   file so that fresh environment variables can be discovered.
>>> +
>>> +   Or clean the "vcpkg" environment with:
>>> +
>>> +   $ make MSVC=1 clean
>>> +
>>>   2. OPTIONALLY copy the third-party *.dll and *.pdb files into the repo
>>>      root to make it easier to run and debug git.exe without having to
>>>      manipulate your PATH.  This is especially true for debug 
>>> sessions in
>>>
>>
>> Did you mean to send this upstream or to Git for Windows?
>>
>> I didn't think that the VS2015/VS2017 vcpkg-aware version of
>> compat/vcbuild/* had made it upstream yet, so this patch might not
>> apply upstream.
> Ah, that would be my mistake.
>>
>>
>> BTW, the Makefile (when MSVC=1 is defined) will take care of deleting
>> the MSVC-DEFS-GEN, so all we really need to say here is to do:
>>
>>     $ make MSVC=1 clean
>> or  $ make MSVC=1 DEBUG=1 clean
>>
>> after upgrading to a new version of VS.
> It (my suggestion) was the difference between a deep clean of all the 
> 1.05GB of vcpkg files, vs  the 847 bytes of just the MSVC-DEFS-GEN file 
> that was a concern.
> 
> The need to repeat the download of 1GB just because of a VS version 
> change felt a bit excessive, hence the initial suggestion.

Right, there is a separate compat/vcbuild/VCPKG-DEFS file that
controls if the third-party libraries need to be downloaded and/or
compiled.  Make clean doesn't touch that.

And yes, this area still needs a little polish.


>>
>> Jeff
>>
>> PS. I have a TODO item to fix the Makefile to automatically detect
>> and take care of this.
> Thanks.
> IIUC download of the vcpkg files are separate from the generation of the 
> MSVC-DEFS-GEN file - or are their inter-linkages?
> -- 
> Philip

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] compat/vcbuild/README: clean/update 'vcpkg' env for Visual Studio updates
  2019-05-28 14:09   ` Philip Oakley
  2019-05-28 14:32     ` Jeff Hostetler
@ 2019-05-28 18:06     ` Johannes Schindelin
  1 sibling, 0 replies; 5+ messages in thread
From: Johannes Schindelin @ 2019-05-28 18:06 UTC (permalink / raw)
  To: Philip Oakley; +Cc: Jeff Hostetler, GitList

Hi Philip,

On Tue, 28 May 2019, Philip Oakley wrote:

> On 28/05/2019 14:56, Jeff Hostetler wrote:
>
> > Did you mean to send this upstream or to Git for Windows?
> >
> > I didn't think that the VS2015/VS2017 vcpkg-aware version of
> > compat/vcbuild/* had made it upstream yet, so this patch might not
> > apply upstream.
>
> Ah, that would be my mistake.

An understandable one, as I had originally planned on trying to get the
MSVC/Visual Studio patches into git.git after the v2.21.0 release.

However, I deemed the built-in `add -p` a bit more pressing, as it
directly affects my workflow, and the MSVC patches already made it into
Git for Windows (and are continuously tested by our Azure Pipeline).

My current plan is to "upstream" the MSVC patches directly after v2.22.0
is out.

Ciao,
Dscho

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-05-28 18:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-28 12:08 [PATCH] compat/vcbuild/README: clean/update 'vcpkg' env for Visual Studio updates Philip Oakley
2019-05-28 13:56 ` Jeff Hostetler
2019-05-28 14:09   ` Philip Oakley
2019-05-28 14:32     ` Jeff Hostetler
2019-05-28 18:06     ` Johannes Schindelin

git@vger.kernel.org list mirror (unofficial, one of many)

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 git git/ https://public-inbox.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.io/gmane.comp.version-control.git
 note: .onion URLs require Tor: https://www.torproject.org/

code repositories for the project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git