Issue #24986: Save some bandwidth from svn.python.org

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

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index 30f209f2ae386040198ebe54e8ec06ae23b066f5..2c41fb21eb2de24a49ee8a02df9a630afd617562 100644 (file)
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -66,7 +66,7 @@ if "%~1"=="-V" shift & goto Version
 rem These use the actual property names used by MSBuild.  We could just let\r
 rem them in through the environment, but we specify them on the command line\r
 rem anyway for visibility so set defaults after this\r
-if "%~1"=="-e" (set IncludeExternals=true) & call "%dir%get_externals.bat" & shift & goto CheckOpts\r
+if "%~1"=="-e" (set IncludeExternals=true) & shift & goto CheckOpts\r
 if "%~1"=="--no-ssl" (set IncludeSSL=false) & shift & goto CheckOpts\r
 if "%~1"=="--no-tkinter" (set IncludeTkinter=false) & shift & goto CheckOpts\r
 \r
@@ -74,6 +74,8 @@ if "%IncludeExternals%"=="" set IncludeExternals=false
 if "%IncludeSSL%"=="" set IncludeSSL=true\r
 if "%IncludeTkinter%"=="" set IncludeTkinter=true\r
 \r
+if "%IncludeExternals%"=="true" call "%dir%get_externals.bat"\r
+\r
 if "%platf%"=="x64" (set vs_platf=x86_amd64)\r
 \r
 rem Setup the environment\r

diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index f9b740fa6aaa50387193b780e4f4200ef9150485..0b3c08b66e360f5400ef16a103457e02f31cc242 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -51,16 +51,17 @@ if ERRORLEVEL 9009 (
 \r
 echo.Fetching external libraries...\r
 \r
-for %%e in (\r
-            bzip2-1.0.6\r
-            nasm-2.11.06\r
-            openssl-1.0.2d\r
-            tcl-core-8.6.4.2\r
-            tk-8.6.4.2\r
-            tix-8.4.3.6\r
-            sqlite-3.8.11.0\r
-            xz-5.0.5\r
-            ) do (\r
+set libraries=\r
+set libraries=%libraries%                                    bzip2-1.0.6\r
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     nasm-2.11.06\r
+if NOT "%IncludeSSL%"=="false" set libraries=%libraries%     openssl-1.0.2d\r
+set libraries=%libraries%                                    sqlite-3.8.11.0\r
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.4.2\r
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.4.2\r
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6\r
+set libraries=%libraries%                                    xz-5.0.5\r
+\r
+for %%e in (%libraries%) do (\r
     if exist %%e (\r
         echo.%%e already exists, skipping.\r
     ) else (\r