changeset:   97655:252d4760f28b
branch:      2.7
parent:      97642:2bc91f1f2b34
user:        Zachary Ware <zachary.ware@gmail.com>
date:        Fri Sep 04 01:08:07 2015 -0500
files:       PCbuild/build.bat PCbuild/get_externals.bat
description:
Issue #24986: Save some bandwidth from svn.python.org

Don't download sources that won't be used.


diff -r 2bc91f1f2b34 -r 252d4760f28b PCbuild/build.bat
--- a/PCbuild/build.bat	Thu Sep 03 23:27:05 2015 -0500
+++ b/PCbuild/build.bat	Fri Sep 04 01:08:07 2015 -0500
@@ -65,7 +65,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
 if "%~1"=="--no-bsddb" (set IncludeBsddb=false) & shift & goto CheckOpts
@@ -75,6 +75,8 @@
 if "%IncludeTkinter%"=="" set IncludeTkinter=true
 if "%IncludeBsddb%"=="" set IncludeBsddb=true
 
+if "%IncludeExternals%"=="true" call "%dir%get_externals.bat"
+
 if "%platf%"=="x64" (set vs_platf=x86_amd64)
 
 rem Setup the environment
diff -r 2bc91f1f2b34 -r 252d4760f28b PCbuild/get_externals.bat
--- a/PCbuild/get_externals.bat	Thu Sep 03 23:27:05 2015 -0500
+++ b/PCbuild/get_externals.bat	Fri Sep 04 01:08:07 2015 -0500
@@ -54,16 +54,17 @@
 rem When updating these versions, remember to update the relevant property
 rem files in both this dir and PC\VS9.0
 
-for %%e in (
-            bzip2-1.0.6
-            db-4.7.25.0
-            nasm-2.11.06
-            openssl-1.0.2d
-            tcl-8.5.15.0
-            tk-8.5.15.0
-            tix-8.4.3.5
-            sqlite-3.6.21
-            ) do (
+set libraries=
+set libraries=%libraries%                                    bzip2-1.0.6
+if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   db-4.7.25.0
+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.6.21
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.5
+
+for %%e in (%libraries%) do (
     if exist %%e (
         echo.%%e already exists, skipping.
     ) else (