From: Steve Dower <steve.dower@microsoft.com>
Date: Thu, 27 Oct 2016 19:12:24 +0000 (-0700)
Subject: Merge from 3.5
X-Git-Tag: v3.6.0b3~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43d2b264b99a79903ad1ce6fc38b46963e2db27d;p=thirdparty%2FPython%2Fcpython.git

Merge from 3.5
---

43d2b264b99a79903ad1ce6fc38b46963e2db27d
diff --cc Tools/msi/buildrelease.bat
index e34aeac7931e,1fa2dcb53407..e7d225d54975
--- a/Tools/msi/buildrelease.bat
+++ b/Tools/msi/buildrelease.bat
@@@ -35,7 -35,9 +35,9 @@@ set BUILDX86
  set BUILDX64=
  set TARGET=Rebuild
  set TESTTARGETDIR=
 -set PGO=
 +set PGO=default
+ set BUILDNUGET=1
+ set BUILDZIP=1
  
  
  :CheckOpts
@@@ -55,7 -57,8 +57,9 @@@ if "%1" EQU "--build" (set TARGET=Build
  if "%1" EQU "-x86" (set BUILDX86=1) && shift && goto CheckOpts
  if "%1" EQU "-x64" (set BUILDX64=1) && shift && goto CheckOpts
  if "%1" EQU "--pgo" (set PGO=%~2) && shift && shift && goto CheckOpts
 +if "%1" EQU "--skip-pgo" (set PGO=) && shift && goto CheckOpts
+ if "%1" EQU "--skip-nuget" (set BUILDNUGET=) && shift && goto CheckOpts
+ if "%1" EQU "--skip-zip" (set BUILDZIP=) && shift && goto CheckOpts
  
  if "%1" NEQ "" echo Invalid option: "%1" && exit /B 1
  
@@@ -170,21 -178,23 +174,29 @@@ if not "%SKIPBUILD%" EQU "1" 
      @echo off
  )
  
 -set BUILDOPTS=/p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%
 -if "%PGO%" NEQ "" set BUILDOPTS=%BUILDOPTS% /p:PGOBuildPath=%BUILD%
 -msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%
 -msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild /p:Platform=%1 %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true
 +if "%OUTDIR_PLAT%" EQU "win32" (
 +    msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%
 +    if errorlevel 1 exit /B
 +) else if not exist "%PCBUILD%win32\en-us\launcher.msi" (
 +    msbuild "%D%launcher\launcher.wixproj" /p:Platform=x86 %CERTOPTS% /p:ReleaseUri=%RELEASE_URI%
 +    if errorlevel 1 exit /B
 +)
 +
 +set BUILDOPTS=/p:Platform=%1 /p:BuildForRelease=true /p:DownloadUrl=%DOWNLOAD_URL% /p:DownloadUrlBase=%DOWNLOAD_URL_BASE% /p:ReleaseUri=%RELEASE_URI%
 +msbuild "%D%bundle\releaselocal.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=true
  if errorlevel 1 exit /B
 -msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild /p:Platform=%1 %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false
 +msbuild "%D%bundle\releaseweb.wixproj" /t:Rebuild %BUILDOPTS% %CERTOPTS% /p:RebuildAll=false
  if errorlevel 1 exit /B
  
- msbuild "%D%make_zip.proj" /t:Build %BUILDOPTS% %CERTOPTS%
+ if defined BUILDZIP (
+     msbuild "%D%make_zip.proj" /t:Build %BUILDOPTS% %CERTOPTS%
+     if errorlevel 1 exit /B
+ )
+ 
+ if defined BUILDNUGET (
+     msbuild "%D%..\nuget\make_pkg.proj" /t:Build /p:Configuration=Release /p:Platform=%1 /p:OutputPath="%BUILD%en-us"
+     if errorlevel 1 exit /B
+ )
  
  if not "%OUTDIR%" EQU "" (
      mkdir "%OUTDIR%\%OUTDIR_PLAT%"
@@@ -197,8 -208,9 +210,9 @@@
  exit /B 0
  
  :Help
- echo buildrelease.bat [--out DIR] [-x86] [-x64] [--certificate CERTNAME] [--build] [--skip-build]
- echo                  [--pgo COMMAND] [--skip-pgo] [--skip-doc] [--download DOWNLOAD URL] [--test TARGETDIR]
+ echo buildrelease.bat [--out DIR] [-x86] [-x64] [--certificate CERTNAME] [--build] [--pgo COMMAND]
 -echo                  [--skip-build] [--skip-doc] [--skip-nuget] [--skip-zip]
++echo                  [--skip-build] [--skip-doc] [--skip-nuget] [--skip-zip] [--skip-pgo]
+ echo                  [--download DOWNLOAD URL] [--test TARGETDIR]
  echo                  [-h]
  echo.
  echo    --out (-o)          Specify an additional output directory for installers
@@@ -207,8 -219,9 +221,11 @@@ echo    -x64                Build x64 i
  echo    --build (-b)        Incrementally build Python rather than rebuilding
  echo    --skip-build (-B)   Do not build Python (just do the installers)
  echo    --skip-doc (-D)     Do not build documentation
 +echo    --pgo               Specify PGO command for x64 installers
 +echo    --skip-pgo          Build x64 installers using PGO
+ echo    --skip-nuget        Do not build Nuget packages
+ echo    --skip-zip          Do not build embeddable package
+ echo    --pgo               Build x64 installers using PGO
  echo    --download          Specify the full download URL for MSIs
  echo    --test              Specify the test directory to run the installer tests
  echo    -h                  Display this help information