summaryrefslogtreecommitdiffstats
path: root/PCbuild/get_externals.bat
diff options
context:
space:
mode:
Diffstat (limited to 'PCbuild/get_externals.bat')
-rw-r--r--PCbuild/get_externals.bat55
1 files changed, 23 insertions, 32 deletions
diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat
index 6e466a3..01eeb84 100644
--- a/PCbuild/get_externals.bat
+++ b/PCbuild/get_externals.bat
@@ -4,20 +4,27 @@ rem Simple script to fetch source for external libraries
if "%PCBUILD%"=="" (set PCBUILD=%~dp0)
if "%EXTERNALS_DIR%"=="" (set EXTERNALS_DIR=%PCBUILD%\..\externals)
-if "%NUGET%"=="" (set NUGET=%EXTERNALS_DIR%\nuget.exe)
-if "%NUGET_URL%"=="" (set NUGET_URL=https://aka.ms/nugetclidl)
set DO_FETCH=true
set DO_CLEAN=false
+set IncludeTkinterSrc=false
+set IncludeSSLSrc=false
:CheckOpts
if "%~1"=="--no-tkinter" (set IncludeTkinter=false) & shift & goto CheckOpts
if "%~1"=="--no-openssl" (set IncludeSSL=false) & shift & goto CheckOpts
-if "%~1"=="--python" (set PYTHON_FOR_BUILD=%2) & shift & shift & goto CheckOpts
+if "%~1"=="--tkinter-src" (set IncludeTkinterSrc=true) & shift & goto CheckOpts
+if "%~1"=="--openssl-src" (set IncludeSSLSrc=true) & shift & goto CheckOpts
+if "%~1"=="--python" (set PYTHON=%2) & shift & shift & goto CheckOpts
if "%~1"=="--organization" (set ORG=%2) & shift & shift & goto CheckOpts
if "%~1"=="-c" (set DO_CLEAN=true) & shift & goto CheckOpts
if "%~1"=="--clean" (set DO_CLEAN=true) & shift & goto CheckOpts
if "%~1"=="--clean-only" (set DO_FETCH=false) & goto clean
+
+rem Include old options for compatibility
+if "%~1"=="--no-tkinter" shift & goto CheckOpts
+if "%~1"=="--no-openssl" shift & goto CheckOpts
+
if "x%~1" NEQ "x" goto usage
if "%DO_CLEAN%"=="false" goto fetch
@@ -32,57 +39,41 @@ if "%DO_FETCH%"=="false" goto end
:fetch
if "%ORG%"=="" (set ORG=python)
-
-if "%PYTHON_FOR_BUILD%"=="" (
- echo Checking for installed python...
- py -3.6 -V >nul 2>&1 && (set PYTHON_FOR_BUILD=py -3.6)
-)
-if "%PYTHON_FOR_BUILD%"=="" (
- if NOT exist "%EXTERNALS_DIR%" mkdir "%EXTERNALS_DIR%"
- if NOT exist "%NUGET%" (
- echo Downloading nuget...
- rem NB: Must use single quotes around NUGET here, NOT double!
- rem Otherwise, a space in the path would break things
- powershell.exe -Command Invoke-WebRequest %NUGET_URL% -OutFile '%NUGET%'
- )
- echo Installing Python via nuget...
- "%NUGET%" install pythonx86 -ExcludeVersion -OutputDirectory "%EXTERNALS_DIR%"
- rem Quote it here; it's not quoted later because "py -3.6" wouldn't work
- set PYTHON_FOR_BUILD="%EXTERNALS_DIR%\pythonx86\tools\python.exe"
-)
+call "%PCBUILD%find_python.bat" "%PYTHON%"
echo.Fetching external libraries...
set libraries=
-set libraries=%libraries% bzip2-1.0.6
-if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2k
-set libraries=%libraries% sqlite-3.14.2.0
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tk-8.6.6.0
-if NOT "%IncludeTkinter%"=="false" set libraries=%libraries% tix-8.4.3.6
-set libraries=%libraries% xz-5.2.2
+set libraries=%libraries% bzip2-1.0.6
+if NOT "%IncludeSSLSrc%"=="false" set libraries=%libraries% openssl-1.0.2k
+set libraries=%libraries% sqlite-3.14.2.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tcl-core-8.6.6.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tk-8.6.6.0
+if NOT "%IncludeTkinterSrc%"=="false" set libraries=%libraries% tix-8.4.3.6
+set libraries=%libraries% xz-5.2.2
for %%e in (%libraries%) do (
if exist "%EXTERNALS_DIR%\%%e" (
echo.%%e already exists, skipping.
) else (
echo.Fetching %%e...
- %PYTHON_FOR_BUILD% "%PCBUILD%get_external.py" -O %ORG% %%e
+ %PYTHON% "%PCBUILD%get_external.py" -O %ORG% %%e
)
)
echo.Fetching external binaries...
set binaries=
-set binaries=%binaries%
-if NOT "%IncludeSSL%"=="false" set binaries=%binaries% nasm-2.11.06
+if NOT "%IncludeSSL%"=="false" set binaries=%binaries% openssl-bin-1.0.2k
+if NOT "%IncludeTkinter%"=="false" set binaries=%binaries% tcltk-8.6.6.0
+if NOT "%IncludeSSLSrc%"=="false" set binaries=%binaries% nasm-2.11.06
for %%b in (%binaries%) do (
if exist "%EXTERNALS_DIR%\%%b" (
echo.%%b already exists, skipping.
) else (
echo.Fetching %%b...
- %PYTHON_FOR_BUILD% "%PCBUILD%get_external.py" -b -O %ORG% %%b
+ %PYTHON% "%PCBUILD%get_external.py" -b -O %ORG% %%b
)
)