diff options
| author | wsoltys <wiso@xbmc.org> | 2014-01-10 14:40:24 -0800 |
|---|---|---|
| committer | wsoltys <wiso@xbmc.org> | 2014-01-10 14:40:24 -0800 |
| commit | deb47e94bf57036b844fd2e317746bae33794215 (patch) | |
| tree | 823af5e1010593c3006ebbbe1c5084116cd439af | |
| parent | 18eef75317c1ce24bf8cb003ad057ad57c38789a (diff) | |
| parent | acd012d9d41c611f84e31cd1d62dff2cb0baff33 (diff) | |
Merge pull request #4004 from wsoltys/buildsys2
[WIN32] buildsystem fixes
| -rw-r--r-- | project/Win32BuildSetup/BuildSetup.bat | 7 | ||||
| -rw-r--r-- | tools/buildsteps/win32/prepare-env.bat | 11 |
2 files changed, 9 insertions, 9 deletions
diff --git a/project/Win32BuildSetup/BuildSetup.bat b/project/Win32BuildSetup/BuildSetup.bat index 54eab2a013..830ea368a7 100644 --- a/project/Win32BuildSetup/BuildSetup.bat +++ b/project/Win32BuildSetup/BuildSetup.bat @@ -217,10 +217,9 @@ IF %comp%==vs2010 ( Echo addons\visualization.fishbmc\>>exclude.txt Echo addons\visualization.projectm\>>exclude.txt Echo addons\visualization.glspectrum\>>exclude.txt - rem Exclude skins if not present - IF NOT EXIST addons\skin.touched\addon.xml ( - Echo addons\skin.touched\>>exclude.txt - ) + rem Exclude skins as they're copied by their own script + Echo addons\skin.touched\>>exclude.txt + Echo addons\skin.confluence\>>exclude.txt rem other platform stuff Echo lib-osx>>exclude.txt Echo players\mplayer>>exclude.txt diff --git a/tools/buildsteps/win32/prepare-env.bat b/tools/buildsteps/win32/prepare-env.bat index a4cc97bd47..0e3b5ff0ba 100644 --- a/tools/buildsteps/win32/prepare-env.bat +++ b/tools/buildsteps/win32/prepare-env.bat @@ -2,17 +2,18 @@ ECHO Workspace is %WORKSPACE% -rem git clean the untracked files but not the directories -rem to keep the downloaded dependencies -rem we assume git in path as this is a requirement - cd %WORKSPACE% +rem clean the BUILD_WIN32 at first to avoid problems with possible git files in there +IF EXIST %WORKSPACE%\project\Win32BuildSetup\BUILD_WIN32 rmdir %WORKSPACE%\project\Win32BuildSetup\BUILD_WIN32 /S /Q + +rem we assume git in path as this is a requirement +rem git clean the untracked files and directories +rem but keep the downloaded dependencies ECHO running git clean -xfd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" git clean -xfd -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" rem cleaning additional directories ECHO delete build directories -IF EXIST %WORKSPACE%\project\Win32BuildSetup\BUILD_WIN32 rmdir %WORKSPACE%\project\Win32BuildSetup\BUILD_WIN32 /S /Q 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 |