diff options
| author | Anton Fedchin <anightik@gmail.com> | 2017-10-18 17:18:06 +0300 |
|---|---|---|
| committer | Anton Fedchin <anightik@gmail.com> | 2017-10-20 16:31:41 +0300 |
| commit | 33fae8ac053c0a17a4f14b9a49c795e96e39bb04 (patch) | |
| tree | 304d7f299cae96c0363ebc672cb0a0c255266460 /tools/buildsteps/windows | |
| parent | 922a6bb1959befa982f8c37ea3336b018ffe12db (diff) | |
BuildDependencies: re-arrange packages on the fly for new format.
The structure of a package will be changed with the following rules:
system/*.* -> /bin
project/BuildDependencies/bin/*.* -> /bin
project/BuildDependencies/include/*.* -> /include
project/BuildDependencies/lib/*.* -> /lib
project/BuildDependencies/win32/*.* -> /<root>
project/BuildDependencies/x64/*.* -> /<root>
Diffstat (limited to 'tools/buildsteps/windows')
| -rw-r--r-- | tools/buildsteps/windows/download-dependencies.bat | 6 | ||||
| -rw-r--r-- | tools/buildsteps/windows/prepare-env.bat | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/tools/buildsteps/windows/download-dependencies.bat b/tools/buildsteps/windows/download-dependencies.bat index ad03644759..d8e8ff3178 100644 --- a/tools/buildsteps/windows/download-dependencies.bat +++ b/tools/buildsteps/windows/download-dependencies.bat @@ -21,15 +21,13 @@ echo Downloading from mirror %KODI_MIRROR% REM Locate the BuildDependencies directory, based on the path of this script SET BUILD_DEPS_PATH=%WORKSPACE%\project\BuildDependencies -SET APP_PATH=%WORKSPACE% +SET APP_PATH=%WORKSPACE%\project\BuildDependencies\%TARGETPLATFORM% SET TMP_PATH=%BUILD_DEPS_PATH%\scripts\tmp REM Change to the BuildDependencies directory, if we're not there already PUSHD %BUILD_DEPS_PATH% REM Can't run rmdir and md back to back. access denied error otherwise. -IF EXIST lib rmdir lib /S /Q -IF EXIST include rmdir include /S /Q IF EXIST %TMP_PATH% rmdir %TMP_PATH% /S /Q SET DL_PATH="%BUILD_DEPS_PATH%\downloads" @@ -38,8 +36,6 @@ SET ZIP=%BUILD_DEPS_PATH%\..\Win32BuildSetup\tools\7z\7za IF NOT EXIST %DL_PATH% md %DL_PATH% -md lib -md include md %TMP_PATH% cd scripts diff --git a/tools/buildsteps/windows/prepare-env.bat b/tools/buildsteps/windows/prepare-env.bat index 7443f9d256..773872772d 100644 --- a/tools/buildsteps/windows/prepare-env.bat +++ b/tools/buildsteps/windows/prepare-env.bat @@ -20,6 +20,4 @@ rem cleaning additional directories ECHO delete build directories IF EXIST %WORKSPACE%\project\Win32BuildSetup\dependencies rmdir %WORKSPACE%\project\Win32BuildSetup\dependencies /S /Q -IF EXIST %WORKSPACE%\project\BuildDependencies\include rmdir %WORKSPACE%\project\BuildDependencies\include /S /Q -IF EXIST %WORKSPACE%\project\BuildDependencies\lib rmdir %WORKSPACE%\project\BuildDependencies\lib /S /Q IF EXIST %WORKSPACE%\project\BuildDependencies\msys rmdir %WORKSPACE%\project\BuildDependencies\msys /S /Q |