Updates to VS packaging script for VS 2015

Updates to VS packaging script for VS 2015

This change updates the packaging script for VS 2015 Update 1. Changes
include:

- Filtering out Windows Performance Toolkit to save space
- Filtering out .msi files to save space
- Adding a 'dryrun' option to quickly print statistics
- Allowing specifying what OS sub-version is desired
- Filtering out unused versions from the include/lib/source directories
- Avoiding the double-include of the ucrt directory
- Adding ucrt directory to include and lib path
- Handling running from 64-bit or 32-bit python

R=scottmg@chromium.org
BUG=chromium:440500
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=297894

[brucedawson, 2015-12-07 20:02:43]

Whadya think? It's working nicely, and the error-checking/diagnostic features
were quite handy.

[scottmg, 2015-12-07 20:58:04]

Cool! Looks mostly fine, if it works :)

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
File win_toolchain/package_from_installed.py (right):

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:118: if tail.startswith('References\\')
or \
Put () around this if instead of using \.

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:127: tail.startswith('Source\\'):
Same here.

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:135: system_crt_files = [
Have you tried the package on a non-redist installed machine? Perhaps changes
needed here..

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:162: x64_path = r'C:\Windows\Sysnative'
Maybe rather that exists(), something like:

x64_path = 'System32' if platform.machine.endswith('64') else 'Sysnative'

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:194:
'%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;' # VS 2015
I guess we're going to get a different package for 2013 now. That's fine since
we should be done with it soon, but it just means that until we switch to 2015
the package we're using isn't regenerate-able with this script. So in theory we
should update the 2013 package first too. But if we're going to try to flip the
switch to 2015 soon, then we can probably get away without doing it.

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:260: if len(sys.argv) < 3 or sys.argv[1]
not in ('2013', '2015'):
This is a bit much once it's more than 1. Can you switch it to using optparse?

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:262: print 'winversion should be
10.0.10240.0 or similar'
Can we not default to 10586? (w/ optparse we can have an actual default rather
than just in the help text).

(Or are you trying to maintain previous behaviour for 2013?)

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:311: sys.stdout.flush()
No need to .flush() here, that's just because of the \r in the prints above.

[brucedawson, 2015-12-08 01:13:49]

I addressed the suggestions, including switching to optparse. I also found many
places where I was using double quotes - fixed.

Testing on machine without the redist is needed. I assume that it fails, but it
would be good to know in what manner.

These builds will test whether it fixes the current compile breakage (6504 and
47299 just missed it):

https://build.chromium.org/p/chromium.fyi/builders/Chromium%20Builder%20%28db...

https://build.chromium.org/p/chromium.fyi/builders/Chromium%20Builder/builds/...

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
File win_toolchain/package_from_installed.py (right):

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:118: if tail.startswith('References\\')
or \
On 2015/12/07 20:58:04, scottmg wrote:
> Put () around this if instead of using \.

Done.

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:127: tail.startswith('Source\\'):
On 2015/12/07 20:58:04, scottmg wrote:
> Same here.

Done.

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:135: system_crt_files = [
On 2015/12/07 20:58:04, scottmg wrote:
> Have you tried the package on a non-redist installed machine? Perhaps changes
> needed here..

I have not yet tried using the package on a machine that doesn't have the redist
installed.

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:194:
'%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;' # VS 2015
It's true that the exact package we're using can't be regenerated, but the only
difference will be one extra entry in the include and lib paths.

Even that could be avoided if desired, but it does make the script messier so I
was inclined to not bother.

https://codereview.chromium.org/1504983002/diff/1/win_toolchain/package_from_...
win_toolchain/package_from_installed.py:311: sys.stdout.flush()
On 2015/12/07 20:58:04, scottmg wrote:
> No need to .flush() here, that's just because of the \r in the prints above.

Done.

[brucedawson, 2015-12-08 19:50:34]

PTAL.

The VS 2015 bots are running successfully with Update 1 now, although the image
will need updating due to it being from a slightly pre-release version of Update
1.

[scottmg, 2015-12-08 21:48:17]

lgtm

[brucedawson, 2015-12-08 22:47:21]

The CQ bit was checked by brucedawson@chromium.org

[commit-bot: I haz the power, 2015-12-08 22:47:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1504983002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1504983002/40001

[commit-bot: I haz the power, 2015-12-08 22:49:23]

Description was changed from

==========
Updates to VS packaging script for VS 2015

This change updates the packaging script for VS 2015 Update 1. Changes
include:

- Filtering out Windows Performance Toolkit to save space
- Filtering out .msi files to save space
- Adding a 'dryrun' option to quickly print statistics
- Allowing specifying what OS sub-version is desired
- Filtering out unused versions from the include/lib/source directories
- Avoiding the double-include of the ucrt directory
- Adding ucrt directory to include and lib path
- Handling running from 64-bit or 32-bit python

R=scottmg@chromium.org
BUG=chromium:440500
==========

to

==========
Updates to VS packaging script for VS 2015

This change updates the packaging script for VS 2015 Update 1. Changes
include:

- Filtering out Windows Performance Toolkit to save space
- Filtering out .msi files to save space
- Adding a 'dryrun' option to quickly print statistics
- Allowing specifying what OS sub-version is desired
- Filtering out unused versions from the include/lib/source directories
- Avoiding the double-include of the ucrt directory
- Adding ucrt directory to include and lib path
- Handling running from 64-bit or 32-bit python

R=scottmg@chromium.org
BUG=chromium:440500

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=297894
==========

[commit-bot: I haz the power, 2015-12-08 22:49:24]

Committed patchset #3 (id:40001) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=297894