From 7b67a380d37e840b2b7c85bd7c2b198c5e2f5bc5 Mon Sep 17 00:00:00 2001 From: Rechi Date: Sat, 29 Apr 2017 16:54:44 +0200 Subject: [buildsteps][windows] prepare-env --- tools/buildsteps/win32/prepare-env.bat | 25 ------------------------- tools/buildsteps/windows/prepare-env.bat | 25 +++++++++++++++++++++++++ tools/buildsteps/windows/win32/prepare-env.bat | 5 +++++ 3 files changed, 30 insertions(+), 25 deletions(-) delete mode 100644 tools/buildsteps/win32/prepare-env.bat create mode 100644 tools/buildsteps/windows/prepare-env.bat create mode 100644 tools/buildsteps/windows/win32/prepare-env.bat diff --git a/tools/buildsteps/win32/prepare-env.bat b/tools/buildsteps/win32/prepare-env.bat deleted file mode 100644 index 46a544f320..0000000000 --- a/tools/buildsteps/win32/prepare-env.bat +++ /dev/null @@ -1,25 +0,0 @@ -@ECHO OFF - -ECHO Workspace is %WORKSPACE% - -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 "lib/libdvd" -e "lib/win32/ffmpeg" -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" -git clean -xfd -e "lib/libdvd" -e "lib/win32/ffmpeg" -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" - -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 - -IF EXIST %WORKSPACE%\project\VS2010Express\XBMC rmdir %WORKSPACE%\project\VS2010Express\XBMC /S /Q -IF EXIST %WORKSPACE%\project\VS2010Express\objs rmdir %WORKSPACE%\project\VS2010Express\objs /S /Q -IF EXIST %WORKSPACE%\project\VS2010Express\libs rmdir %WORKSPACE%\project\VS2010Express\libs /S /Q diff --git a/tools/buildsteps/windows/prepare-env.bat b/tools/buildsteps/windows/prepare-env.bat new file mode 100644 index 0000000000..f929ef4760 --- /dev/null +++ b/tools/buildsteps/windows/prepare-env.bat @@ -0,0 +1,25 @@ +@ECHO OFF + +PUSHD %~dp0\..\..\.. +SET WORKSPACE=%CD% +POPD + +ECHO Workspace is %WORKSPACE% + +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 "lib/libdvd" -e "lib/win32/ffmpeg" -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" +git clean -xfd -e "lib/libdvd" -e "lib/win32/ffmpeg" -e "project/BuildDependencies/downloads" -e "project/BuildDependencies/downloads2" + +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 diff --git a/tools/buildsteps/windows/win32/prepare-env.bat b/tools/buildsteps/windows/win32/prepare-env.bat new file mode 100644 index 0000000000..354a5cfcda --- /dev/null +++ b/tools/buildsteps/windows/win32/prepare-env.bat @@ -0,0 +1,5 @@ +@ECHO OFF + +PUSHD %~dp0\.. +CALL prepare-env.bat +POPD -- cgit v1.2.3