diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-09-18 06:43:22 +0200 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-09-18 06:43:22 +0200 |
| commit | dad81222b62b8411e7810ffe5edf5d165461803c (patch) | |
| tree | dfea973915d3e19d024a5fd4daf7a41b643f2062 /tools/buildsteps | |
| parent | b6fe3b89cd82b7a067ff14e1d7c2939537a0b51f (diff) | |
| parent | 50f5f71e0101d844b81a2f5b2a79d20aead956ee (diff) | |
Merge pull request #5314 from ronie/re-focus
replace skin.touched with skin.re-touched
Diffstat (limited to 'tools/buildsteps')
| -rw-r--r-- | tools/buildsteps/android/prepare-xbmc | 7 | ||||
| -rw-r--r-- | tools/buildsteps/androidx86/prepare-xbmc | 7 | ||||
| -rwxr-xr-x | tools/buildsteps/ios/prepare-xbmc | 7 | ||||
| -rw-r--r-- | tools/buildsteps/win32/prepare-env.bat | 4 |
4 files changed, 17 insertions, 8 deletions
diff --git a/tools/buildsteps/android/prepare-xbmc b/tools/buildsteps/android/prepare-xbmc index e83b22aad4..3a82e5c600 100644 --- a/tools/buildsteps/android/prepare-xbmc +++ b/tools/buildsteps/android/prepare-xbmc @@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=android #fetch submodules cd $WORKSPACE -rm -r $WORKSPACE/addons/skin.touched -git submodule update --init $WORKSPACE/addons/skin.touched +if test -d $WORKSPACE/addons/skin.re-touched +then +rm -r $WORKSPACE/addons/skin.re-touched +fi +git submodule update --init $WORKSPACE/addons/skin.re-touched diff --git a/tools/buildsteps/androidx86/prepare-xbmc b/tools/buildsteps/androidx86/prepare-xbmc index e83b22aad4..3a82e5c600 100644 --- a/tools/buildsteps/androidx86/prepare-xbmc +++ b/tools/buildsteps/androidx86/prepare-xbmc @@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=android #fetch submodules cd $WORKSPACE -rm -r $WORKSPACE/addons/skin.touched -git submodule update --init $WORKSPACE/addons/skin.touched +if test -d $WORKSPACE/addons/skin.re-touched +then +rm -r $WORKSPACE/addons/skin.re-touched +fi +git submodule update --init $WORKSPACE/addons/skin.re-touched diff --git a/tools/buildsteps/ios/prepare-xbmc b/tools/buildsteps/ios/prepare-xbmc index 2f2503b437..1b93c2bdb7 100755 --- a/tools/buildsteps/ios/prepare-xbmc +++ b/tools/buildsteps/ios/prepare-xbmc @@ -4,5 +4,8 @@ XBMC_PLATFORM_DIR=ios #fetch submodules cd $WORKSPACE -rm -r $WORKSPACE/addons/skin.touched -git submodule update --init $WORKSPACE/addons/skin.touched +if test -d $WORKSPACE/addons/skin.re-touched +then +rm -r $WORKSPACE/addons/skin.re-touched +fi +git submodule update --init $WORKSPACE/addons/skin.re-touched diff --git a/tools/buildsteps/win32/prepare-env.bat b/tools/buildsteps/win32/prepare-env.bat index d95fda56d7..7e1d30cbd9 100644 --- a/tools/buildsteps/win32/prepare-env.bat +++ b/tools/buildsteps/win32/prepare-env.bat @@ -25,5 +25,5 @@ IF EXIST %WORKSPACE%\project\VS2010Express\objs rmdir %WORKSPACE%\project\VS2010 IF EXIST %WORKSPACE%\project\VS2010Express\libs rmdir %WORKSPACE%\project\VS2010Express\libs /S /Q rem fetch submodules -IF EXIST "%WORKSPACE%\addons\skin.touched" rmdir "%WORKSPACE%\addons\skin.touched" /S /Q || exit /b 10 -git submodule update --init "%WORKSPACE%\addons\skin.touched" || exit /b 30 +IF EXIST "%WORKSPACE%\addons\skin.re-touched" rmdir "%WORKSPACE%\addons\skin.re-touched" /S /Q || exit /b 10 +git submodule update --init "%WORKSPACE%\addons\skin.re-touched" || exit /b 30 |