changeset:   97657:eca6ecc62b95
parent:      97654:b201e3e044b6
parent:      97656:4e7ce0b10eea
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Fri Sep 04 01:12:44 2015 -0500
description:
Issue #24986: Merge with 3.5


diff -r b201e3e044b6 -r eca6ecc62b95 PCbuild/build.bat
--- a/PCbuild/build.bat	Fri Sep 04 08:39:33 2015 +0300
+++ b/PCbuild/build.bat	Fri Sep 04 01:12:44 2015 -0500
@@ -66,7 +66,7 @@
 rem These use the actual property names used by MSBuild.  We could just let
 rem them in through the environment, but we specify them on the command line
 rem anyway for visibility so set defaults after this
-if "%~1"=="-e" (set IncludeExternals=true) & call "%dir%get_externals.bat" & shift & goto CheckOpts
+if "%~1"=="-e" (set IncludeExternals=true) & shift & goto CheckOpts
 if "%~1"=="--no-ssl" (set IncludeSSL=false) & shift & goto CheckOpts
 if "%~1"=="--no-tkinter" (set IncludeTkinter=false) & shift & goto CheckOpts
 
@@ -74,6 +74,8 @@
 if "%IncludeSSL%"=="" set IncludeSSL=true
 if "%IncludeTkinter%"=="" set IncludeTkinter=true
 
+if "%IncludeExternals%"=="true" call "%dir%get_externals.bat"
+
 if "%platf%"=="x64" (set vs_platf=x86_amd64)
 
 rem Setup the environment
diff -r b201e3e044b6 -r eca6ecc62b95 PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Fri Sep 04 08:39:33 2015 +0300
+++ b/PCbuild/get_externals.bat	Fri Sep 04 01:12:44 2015 -0500
@@ -51,16 +51,17 @@
 
 echo.Fetching external libraries...
 
-for %%e in (
-            bzip2-1.0.6
-            nasm-2.11.06
-            openssl-1.0.2d
-            tcl-core-8.6.4.2
-            tk-8.6.4.2
-            tix-8.4.3.6
-            sqlite-3.8.11.0
-            xz-5.0.5
-            ) do (
+set libraries=
+set libraries=%libraries%                                    bzip2-1.0.6
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2d
+set libraries=%libraries%                                    sqlite-3.8.11.0
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6
+set libraries=%libraries%                                    xz-5.0.5
+
+for %%e in (%libraries%) do (
     if exist %%e (
         echo.%%e already exists, skipping.
     ) else (