diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2015-09-04 01:12:44 -0500 |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2015-09-04 01:12:44 -0500 |
| commit | 99cfed77c40590da461ff3fca8b8e9f76d053916 (patch) | |
| tree | d034f76099d22f5cae477b5f2eabf1755791cf04 | |
| parent | f69104f15a49439170f91bdd86d6a19cdb26348a (diff) | |
| parent | a6deff2588a27b9e7a68c1ae10171e191e8a8621 (diff) | |
| download | cpython-git-99cfed77c40590da461ff3fca8b8e9f76d053916.tar.gz | |
Issue #24986: Merge with 3.5
| -rw-r--r-- | PCbuild/build.bat | 4 | ||||
| -rw-r--r-- | PCbuild/get_externals.bat | 21 |
2 files changed, 14 insertions, 11 deletions
diff --git a/PCbuild/build.bat b/PCbuild/build.bat index 30f209f2ae..2c41fb21eb 100644 --- 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
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 "%IncludeExternals%"=="" set IncludeExternals=false 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 --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index f9b740fa6a..0b3c08b66e 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -51,16 +51,17 @@ if ERRORLEVEL 9009 ( 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 (
|