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 70d88ea08e5b0e48c662dffd094b09e3c43b2716..f3dcc91eab991a7238291dea8692d7d2a6af7d71 100644 (file)
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -65,7 +65,7 @@ if "%~1"=="-k" (set kill=true) & shift & goto CheckOpts
 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
 if "%~1"=="--no-bsddb" (set IncludeBsddb=false) & shift & goto CheckOpts\r
@@ -75,6 +75,8 @@ if "%IncludeSSL%"=="" set IncludeSSL=true
 if "%IncludeTkinter%"=="" set IncludeTkinter=true\r
 if "%IncludeBsddb%"=="" set IncludeBsddb=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 a2aea9d0dfedea3f828709f6a1f6146430ee975d..ffd1a16216e85fcd524e7d52c5906a9a2d459bc2 100644 (file)
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -54,16 +54,17 @@ echo.Fetching external libraries...
 rem When updating these versions, remember to update the relevant property\r
 rem files in both this dir and PC\VS9.0\r
 \r
-for %%e in (\r
-            bzip2-1.0.6\r
-            db-4.7.25.0\r
-            nasm-2.11.06\r
-            openssl-1.0.2d\r
-            tcl-8.5.15.0\r
-            tk-8.5.15.0\r
-            tix-8.4.3.5\r
-            sqlite-3.6.21\r
-            ) do (\r
+set libraries=\r
+set libraries=%libraries%                                    bzip2-1.0.6\r
+if NOT "%IncludeBsddb%"=="false" set libraries=%libraries%   db-4.7.25.0\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.6.21\r
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-8.5.15.0\r
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.5.15.0\r
+if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.5\r
+\r
+for %%e in (%libraries%) do (\r
     if exist %%e (\r
         echo.%%e already exists, skipping.\r
     ) else (\r