diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2018-02-28 06:09:27 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 06:09:27 (GMT) |
| commit | 881323db717f9b6ffe30d14104a2925c77f28db7 (patch) | |
| tree | bfb0268d32397533c36f57437d313ebf4d34b5c5 /Tools | |
| parent | 0954c9e9c8fbea452f56120df592f2061d3209c7 (diff) | |
| download | cpython-881323db717f9b6ffe30d14104a2925c77f28db7.zip cpython-881323db717f9b6ffe30d14104a2925c77f28db7.tar.gz cpython-881323db717f9b6ffe30d14104a2925c77f28db7.tar.bz2 | |
Minor improvements to the Windows build/release process (GH-5935)
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/purge.py | 1 | ||||
| -rw-r--r-- | Tools/msi/uploadrelease.bat | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Tools/msi/purge.py b/Tools/msi/purge.py index 24fdae2..a8b8f4d 100644 --- a/Tools/msi/purge.py +++ b/Tools/msi/purge.py @@ -50,6 +50,7 @@ FILES = [ "test_d.msi", "test_pdb.msi", "tools.msi", + "ucrt.msi", "Windows6.0-KB2999226-x64.msu", "Windows6.0-KB2999226-x86.msu", "Windows6.1-KB2999226-x64.msu", diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat index 3ae5dbc..f262489 100644 --- a/Tools/msi/uploadrelease.bat +++ b/Tools/msi/uploadrelease.bat @@ -31,13 +31,17 @@ if "%1" NEQ "" echo Unexpected argument "%1" & exit /B 1 if not defined PLINK where plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" if not defined PLINK where /R "%ProgramFiles(x86)%\PuTTY" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" +if not defined PLINK where /R "%ProgramFiles%\PuTTY" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" if not defined PLINK where /R "%ProgramFiles(x86)%" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" +if not defined PLINK where /R "%ProgramFiles%" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc" if not defined PLINK echo Cannot locate plink.exe & exit /B 1 echo Found plink.exe at %PLINK% if not defined PSCP where pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc" if not defined PSCP where /R "%ProgramFiles(x86)%\PuTTY" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc" +if not defined PSCP where /R "%ProgramFiles%\PuTTY" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc" if not defined PSCP where /R "%ProgramFiles(x86)%" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc" +if not defined PSCP where /R "%ProgramFiles%" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc" if not defined PSCP echo Cannot locate pscp.exe & exit /B 1 echo Found pscp.exe at %PSCP% |