aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorronie <ronie>2014-08-26 23:37:36 +0200
committerronie <ronie>2014-08-26 23:37:36 +0200
commit64003111bc79d187f9d0c0a0674a8ad2ec8b8bfc (patch)
tree808aaa7f9317e93dd7922d1dc737a3a550e3d877 /tools
parent60faade477359e06b4e8be74425c63bf56f927ba (diff)
replace skin.touched with skin.re-touched
Diffstat (limited to 'tools')
-rw-r--r--tools/buildsteps/android/prepare-xbmc4
-rw-r--r--tools/buildsteps/androidx86/prepare-xbmc4
-rwxr-xr-xtools/buildsteps/ios/prepare-xbmc4
-rw-r--r--tools/buildsteps/win32/prepare-env.bat4
-rwxr-xr-xtools/darwin/Support/CopyRootFiles-atv2.command2
-rwxr-xr-xtools/darwin/Support/CopyRootFiles-ios.command14
-rwxr-xr-xtools/darwin/Support/CopyRootFiles-osx.command2
7 files changed, 17 insertions, 17 deletions
diff --git a/tools/buildsteps/android/prepare-xbmc b/tools/buildsteps/android/prepare-xbmc
index e83b22aad4..ef58229fe9 100644
--- a/tools/buildsteps/android/prepare-xbmc
+++ b/tools/buildsteps/android/prepare-xbmc
@@ -4,5 +4,5 @@ XBMC_PLATFORM_DIR=android
#fetch submodules
cd $WORKSPACE
-rm -r $WORKSPACE/addons/skin.touched
-git submodule update --init $WORKSPACE/addons/skin.touched
+rm -r $WORKSPACE/addons/skin.re-touched
+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..ef58229fe9 100644
--- a/tools/buildsteps/androidx86/prepare-xbmc
+++ b/tools/buildsteps/androidx86/prepare-xbmc
@@ -4,5 +4,5 @@ XBMC_PLATFORM_DIR=android
#fetch submodules
cd $WORKSPACE
-rm -r $WORKSPACE/addons/skin.touched
-git submodule update --init $WORKSPACE/addons/skin.touched
+rm -r $WORKSPACE/addons/skin.re-touched
+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..7e359aaea2 100755
--- a/tools/buildsteps/ios/prepare-xbmc
+++ b/tools/buildsteps/ios/prepare-xbmc
@@ -4,5 +4,5 @@ XBMC_PLATFORM_DIR=ios
#fetch submodules
cd $WORKSPACE
-rm -r $WORKSPACE/addons/skin.touched
-git submodule update --init $WORKSPACE/addons/skin.touched
+rm -r $WORKSPACE/addons/skin.re-touched
+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
diff --git a/tools/darwin/Support/CopyRootFiles-atv2.command b/tools/darwin/Support/CopyRootFiles-atv2.command
index 95dabad8d3..4f45dd76ee 100755
--- a/tools/darwin/Support/CopyRootFiles-atv2.command
+++ b/tools/darwin/Support/CopyRootFiles-atv2.command
@@ -17,7 +17,7 @@ SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude *
SKINSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.bat"
# rsync command for including everything but the skins
-ADDONSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.touched --exclude screensaver.rsxs* --exclude visualization.*"
+ADDONSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched --exclude screensaver.rsxs* --exclude visualization.*"
# binary name is XBMC but we build XBMC.bin so to get a clean binary each time
mv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC
diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command
index bc60a704d3..6b62bae6c0 100755
--- a/tools/darwin/Support/CopyRootFiles-ios.command
+++ b/tools/darwin/Support/CopyRootFiles-ios.command
@@ -17,7 +17,7 @@ SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude *
SKINSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.bat"
# rsync command for including everything but the skins
-ADDONSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.touched --exclude screensaver.rsxs* --exclude visualization.*"
+ADDONSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched --exclude screensaver.rsxs* --exclude visualization.*"
# binary name is XBMC but we build XBMC.bin so to get a clean binary each time
mv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC
@@ -41,14 +41,14 @@ ${SYNC} "$SRCROOT/language" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
# sync skin.touched if it exists
-if [ -f "$SRCROOT/addons/skin.touched/addon.xml" ]; then
+if [ -f "$SRCROOT/addons/skin.re-touched/addon.xml" ]; then
SYNCSKIN_A=${SKINSYNC}
-if [ -f "$SRCROOT/addons/skin.touched/media/Textures.xbt" ]; then
+if [ -f "$SRCROOT/addons/skin.re-touched/media/Textures.xbt" ]; then
SYNCSKIN_A="${SKINSYNC} --exclude *.png --exclude *.jpg"
fi
-${SYNCSKIN_A} "$SRCROOT/addons/skin.touched" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons"
-${SYNC} "$SRCROOT/addons/skin.touched/background" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched"
-${SYNC} "$SRCROOT/addons/skin.touched/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.touched"
+${SYNCSKIN_A} "$SRCROOT/addons/skin.re-touched" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons"
+${SYNC} "$SRCROOT/addons/skin.re-touched/background" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.re-touched"
+${SYNC} "$SRCROOT/addons/skin.re-touched/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.re-touched"
fi
# sync skin.confluence
@@ -64,4 +64,4 @@ ${SYNC} "$SRCROOT/sounds" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
${SYNC} "$SRCROOT/system" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
${SYNC} "$SRCROOT/userdata" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome"
-fi \ No newline at end of file
+fi
diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command
index 783e5e5207..8bc01f2cd1 100755
--- a/tools/darwin/Support/CopyRootFiles-osx.command
+++ b/tools/darwin/Support/CopyRootFiles-osx.command
@@ -17,7 +17,7 @@ SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude *
SYNCSKIN="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat"
# rsync command for including everything but the skins
-ADDONSYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.touched"
+ADDONSYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude addons/skin.confluence --exclude addons/skin.re-touched"
mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC"
mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons"