From 6e5b814af60425259160f1ce914a722093b872e1 Mon Sep 17 00:00:00 2001 From: Rechi Date: Fri, 14 Apr 2017 14:45:14 +0200 Subject: [windows] DownloadBuildDeps: add parameters for target & native platform --- project/BuildDependencies/DownloadBuildDeps.bat | 9 ++++ project/BuildDependencies/scripts/0_package.list | 49 ---------------------- .../scripts/0_package.native-win32.list | 11 +++++ .../scripts/0_package.target-win32.list | 46 ++++++++++++++++++++ project/BuildDependencies/scripts/get_formed.cmd | 10 ++--- 5 files changed, 71 insertions(+), 54 deletions(-) delete mode 100644 project/BuildDependencies/scripts/0_package.list create mode 100644 project/BuildDependencies/scripts/0_package.native-win32.list create mode 100644 project/BuildDependencies/scripts/0_package.target-win32.list diff --git a/project/BuildDependencies/DownloadBuildDeps.bat b/project/BuildDependencies/DownloadBuildDeps.bat index 331784ca09..966a61272d 100644 --- a/project/BuildDependencies/DownloadBuildDeps.bat +++ b/project/BuildDependencies/DownloadBuildDeps.bat @@ -2,6 +2,15 @@ SETLOCAL +SET TARGETPLATFORM=%1 +SET NATIVEPLATFORM=%2 + +IF "%TARGETPLATFORM%" == "" SET TARGETPLATFORM=win32 +IF "%NATIVEPLATFORM%" == "" SET NATIVEPLATFORM=win32 + +ECHO TARGETPLATFORM: %TARGETPLATFORM% +ECHO NATIVEPLATFORM: %NATIVEPLATFORM% + REM If KODI_MIRROR is not set externally to this script, set it to the default mirror URL IF "%KODI_MIRROR%" == "" SET KODI_MIRROR=http://mirrors.kodi.tv echo Downloading from mirror %KODI_MIRROR% diff --git a/project/BuildDependencies/scripts/0_package.list b/project/BuildDependencies/scripts/0_package.list deleted file mode 100644 index a71ff77a58..0000000000 --- a/project/BuildDependencies/scripts/0_package.list +++ /dev/null @@ -1,49 +0,0 @@ -; package.list should contain all file names of packages which are already in the "new" package format (the package contains the paths to the libraries -; and headers relative to the XBMC root directory, stored in a zip container) -; example sqlite-3.7.12.1-win32.7z: -; -> (package name)\(relative path to file) -; -> sqlite-3.7.12.1-win32\project\BuildDependencies\lib\sqlite3.lib -; -> sqlite-3.7.12.1-win32\system\sqlite3.dll -; -> ... -;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! -cpluff-ed7874fc-win32-vc140.7z -crossguid-8f399e-win32-vc140-v3.7z -curl-7.48-win32-vc140.7z -dnssd-541-win32.zip -doxygen-1.8.2-win32.7z -easyhook-2.7.5870.0-win32-vc140-v2.7z -expat-2.2.0-win32-vc140.7z -fmt-3.0.1-win32-vc140.7z -freetype-db5a22-win32-vc140.7z -giflib-5.1.4-win32-vc140.7z -jsonschemabuilder-1.0.0-win32-3.7z -libass-ddb383-win32-vc140.7z -libbluray-0.9.3-win32-vc140.7z -libcdio-0.9.3-win32-vc140.7z -libcec-4.0.1-win32-vc140-2.7z -libfribidi-0.19.2-win32.7z -libiconv-1.14-win32-vc140-v2.7z -libjpeg-turbo-1.4.90-win32-vc140.7z -libmicrohttpd-0.9.50-win32-vc140.7z -libnfs-1.10.0-win32.7z -libplist-1.13.0-win32-vc140.7z -libpng-1.6.21-win32-vc140.7z -libssh-0.7.0-win32-vc140.7z -libxml2-2.9.4-win32-vc140-v2.7z -libxslt-1.1.29-win32-vc140.7z -lzo-2.09-win32-vc140-v3.7z -mini_wdk-10.0.14393.0-win32.7z -mysql-connector-c-6.1.6-win32-vc140-v2.7z -openssl-1.0.2g-win32-vc140-v2.7z -pcre-8.37-win32-vc140-v3.7z -pillow-3.1.0-win32-vc140.7z -pycryptodome-3.4.3-win32.7z -python-2.7.11-win32-vc140-v2.7z -rapidjson-1.1.0-win32.7z -shairplay-0.9.0-win32-vc140-v2.7z -sqlite-3.10.2-win32-vc140.7z -swig-3.0.10-win32.7z -taglib-1.11.1_80df30-win32-vc140.7z -texturepacker-1.1.1-win32.7z -tinyxmlstl-2.6.2-win32-vc140-v2.7z -zlib-1.2.8-win32-vc140-v3.7z diff --git a/project/BuildDependencies/scripts/0_package.native-win32.list b/project/BuildDependencies/scripts/0_package.native-win32.list new file mode 100644 index 0000000000..e37fa5b74f --- /dev/null +++ b/project/BuildDependencies/scripts/0_package.native-win32.list @@ -0,0 +1,11 @@ +; package.list should contain all file names of packages which are already in the "new" package format (the package contains the paths to the libraries +; and headers relative to the XBMC root directory, stored in a zip container) +; example sqlite-3.7.12.1-win32.7z: +; -> (package name)\(relative path to file) +; -> sqlite-3.7.12.1-win32\project\BuildDependencies\lib\sqlite3.lib +; -> sqlite-3.7.12.1-win32\system\sqlite3.dll +; -> ... +;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! +doxygen-1.8.2-win32.7z +jsonschemabuilder-1.0.0-win32-3.7z +texturepacker-1.1.1-win32.7z diff --git a/project/BuildDependencies/scripts/0_package.target-win32.list b/project/BuildDependencies/scripts/0_package.target-win32.list new file mode 100644 index 0000000000..69ae3dffc3 --- /dev/null +++ b/project/BuildDependencies/scripts/0_package.target-win32.list @@ -0,0 +1,46 @@ +; package.list should contain all file names of packages which are already in the "new" package format (the package contains the paths to the libraries +; and headers relative to the XBMC root directory, stored in a zip container) +; example sqlite-3.7.12.1-win32.7z: +; -> (package name)\(relative path to file) +; -> sqlite-3.7.12.1-win32\project\BuildDependencies\lib\sqlite3.lib +; -> sqlite-3.7.12.1-win32\system\sqlite3.dll +; -> ... +;PLEASE KEEP THIS LIST IN ALPHABETICAL ORDER! +cpluff-ed7874fc-win32-vc140.7z +crossguid-8f399e-win32-vc140-v3.7z +curl-7.48-win32-vc140.7z +dnssd-541-win32.zip +easyhook-2.7.5870.0-win32-vc140-v2.7z +expat-2.2.0-win32-vc140.7z +fmt-3.0.1-win32-vc140.7z +freetype-db5a22-win32-vc140.7z +giflib-5.1.4-win32-vc140.7z +libass-ddb383-win32-vc140.7z +libbluray-0.9.3-win32-vc140.7z +libcdio-0.9.3-win32-vc140.7z +libcec-4.0.1-win32-vc140-2.7z +libfribidi-0.19.2-win32.7z +libiconv-1.14-win32-vc140-v2.7z +libjpeg-turbo-1.4.90-win32-vc140.7z +libmicrohttpd-0.9.50-win32-vc140.7z +libnfs-1.10.0-win32.7z +libplist-1.13.0-win32-vc140.7z +libpng-1.6.21-win32-vc140.7z +libssh-0.7.0-win32-vc140.7z +libxml2-2.9.4-win32-vc140-v2.7z +libxslt-1.1.29-win32-vc140.7z +lzo-2.09-win32-vc140-v3.7z +mini_wdk-10.0.14393.0-win32.7z +mysql-connector-c-6.1.6-win32-vc140-v2.7z +openssl-1.0.2g-win32-vc140-v2.7z +pcre-8.37-win32-vc140-v3.7z +pillow-3.1.0-win32-vc140.7z +pycryptodome-3.4.3-win32.7z +python-2.7.11-win32-vc140-v2.7z +rapidjson-1.1.0-win32.7z +shairplay-0.9.0-win32-vc140-v2.7z +sqlite-3.10.2-win32-vc140.7z +swig-3.0.10-win32.7z +taglib-1.11.1_80df30-win32-vc140.7z +tinyxmlstl-2.6.2-win32-vc140-v2.7z +zlib-1.2.8-win32-vc140-v3.7z diff --git a/project/BuildDependencies/scripts/get_formed.cmd b/project/BuildDependencies/scripts/get_formed.cmd index d6c559351e..9aa21af6d1 100644 --- a/project/BuildDependencies/scripts/get_formed.cmd +++ b/project/BuildDependencies/scripts/get_formed.cmd @@ -6,10 +6,10 @@ REM So that we can expand variables inside of IF and FOR SETLOCAL enableDelayedExpansion REM Check presence of required file -dir 0_package.list >NUL 2>NUL || ( -ECHO 0_package.list not found! -ECHO Aborting... -EXIT /B 20 +dir 0_package.native-%NATIVEPLATFORM%.list >NUL 2>NUL && dir 0_package.target-%TARGETPLATFORM%.list >NUL 2>NUL || ( + ECHO 0_package.native-%NATIVEPLATFORM%.list or 0_package.target-%TARGETPLATFORM%.list not found! + ECHO Aborting... + EXIT /B 20 ) REM Clear succeed flag @@ -31,7 +31,7 @@ echo Downloading from mirror %KODI_MIRROR% CALL :setStageName Starting downloads of formed packages... SET SCRIPT_PATH=%CD% CD %DL_PATH% || EXIT /B 10 -FOR /F "eol=; tokens=1" %%f IN (%SCRIPT_PATH%\0_package.list) DO ( +FOR /F "eol=; tokens=1" %%f IN (%SCRIPT_PATH%\0_package.native-%NATIVEPLATFORM%.list %SCRIPT_PATH%\0_package.target-%TARGETPLATFORM%.list) DO ( CALL :processFile %%f ) -- cgit v1.2.3