diff options
author | Rainer Hochecker <fernetmenta@online.de> | 2014-12-16 12:21:41 +0100 |
---|---|---|
committer | Rainer Hochecker <fernetmenta@online.de> | 2014-12-16 12:21:41 +0100 |
commit | 1eb76885b36989a62737cdfb35a20954feb5b6b9 (patch) | |
tree | 8ed135fbac9d3e4e45d48244445848fd576990ae /tools/darwin/Support | |
parent | 7c97b3358ec978d510b53eed8d5cca64d5c39c36 (diff) |
Revert "change xbmc/ path to src/ in all files"
This reverts commit 4949be256667f3e500e52b7084476ae1f2b00d92.
Diffstat (limited to 'tools/darwin/Support')
-rwxr-xr-x | tools/darwin/Support/CopyRootFiles-atv2.command | 2 | ||||
-rwxr-xr-x | tools/darwin/Support/CopyRootFiles-ios.command | 2 | ||||
-rwxr-xr-x | tools/darwin/Support/CopyRootFiles-osx.command | 2 | ||||
-rwxr-xr-x | tools/darwin/Support/copyframeworks-atv2.command | 4 | ||||
-rwxr-xr-x | tools/darwin/Support/copyframeworks-ios.command | 4 | ||||
-rwxr-xr-x | tools/darwin/Support/copyframeworks-osx.command | 6 | ||||
-rwxr-xr-x | tools/darwin/Support/makepythoninterface.command | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/tools/darwin/Support/CopyRootFiles-atv2.command b/tools/darwin/Support/CopyRootFiles-atv2.command index bc347a6b36..3ebb6ab668 100755 --- a/tools/darwin/Support/CopyRootFiles-atv2.command +++ b/tools/darwin/Support/CopyRootFiles-atv2.command @@ -33,7 +33,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media" mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/tools/darwin/runtime" ${SYNC} "$SRCROOT/LICENSE.GPL" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" -${SYNC} "$SRCROOT/src/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" +${SYNC} "$SRCROOT/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" ${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" ${SYNC} "$SRCROOT/addons/visualization.glspectrum" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" ${SYNC} "$SRCROOT/addons/visualization.waveform" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command index e24379a318..81bccd6ceb 100755 --- a/tools/darwin/Support/CopyRootFiles-ios.command +++ b/tools/darwin/Support/CopyRootFiles-ios.command @@ -33,7 +33,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media" mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/tools/darwin/runtime" ${SYNC} "$SRCROOT/LICENSE.GPL" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" -${SYNC} "$SRCROOT/src/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" +${SYNC} "$SRCROOT/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/" ${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" ${SYNC} "$SRCROOT/addons/visualization.glspectrum" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" ${SYNC} "$SRCROOT/addons/visualization.waveform" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command index d004d368f6..8c10364cbe 100755 --- a/tools/darwin/Support/CopyRootFiles-osx.command +++ b/tools/darwin/Support/CopyRootFiles-osx.command @@ -31,7 +31,7 @@ mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darw mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user" ${SYNC} "$SRCROOT/LICENSE.GPL" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/" -${SYNC} "$SRCROOT/src/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/" +${SYNC} "$SRCROOT/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/" ${SYNC} "$SRCROOT/tools/darwin/runtime" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin" ${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" ${SYNC} "$SRCROOT/language" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" diff --git a/tools/darwin/Support/copyframeworks-atv2.command b/tools/darwin/Support/copyframeworks-atv2.command index d0d35a05eb..21cdd55ff7 100755 --- a/tools/darwin/Support/copyframeworks-atv2.command +++ b/tools/darwin/Support/copyframeworks-atv2.command @@ -103,8 +103,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr" echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies" check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs" -echo "Checking src/DllPaths_generated.h for dylib dependencies" -for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do +echo "Checking xbmc/DllPaths_generated.h for dylib dependencies" +for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do check_dyloaded_depends $a done diff --git a/tools/darwin/Support/copyframeworks-ios.command b/tools/darwin/Support/copyframeworks-ios.command index 1dcc09f1e9..328258bd08 100755 --- a/tools/darwin/Support/copyframeworks-ios.command +++ b/tools/darwin/Support/copyframeworks-ios.command @@ -103,8 +103,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr" echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies" check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs" -echo "Checking src/DllPaths_generated.h for dylib dependencies" -for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do +echo "Checking xbmc/DllPaths_generated.h for dylib dependencies" +for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do check_dyloaded_depends $a done diff --git a/tools/darwin/Support/copyframeworks-osx.command b/tools/darwin/Support/copyframeworks-osx.command index 105c74f016..df041c1ab1 100755 --- a/tools/darwin/Support/copyframeworks-osx.command +++ b/tools/darwin/Support/copyframeworks-osx.command @@ -70,7 +70,7 @@ cp -f "$TARGET_BUILD_DIR/$APP_NAME" "$TARGET_BINARY" echo "Creating icon" iconutil -c icns --output "$TARGET_CONTENTS/Resources/kodi.icns" "$SRCROOT/tools/darwin/packaging/media/osx/icon.iconset" -cp -f "$SRCROOT/src/osx/Info.plist" "$TARGET_CONTENTS/" +cp -f "$SRCROOT/xbmc/osx/Info.plist" "$TARGET_CONTENTS/" # Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework echo "Checking $TARGET_BINARY dylib dependencies" @@ -102,8 +102,8 @@ check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.pvr" echo "Checking $XBMC_HOME/addons *.xbs for dylib dependencies" check_xbmc_dylib_depends "$XBMC_HOME"/addons "*.xbs" -echo "Checking src/DllPaths_generated.h for dylib dependencies" -for a in $(grep .dylib "$SRCROOT"/src/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do +echo "Checking xbmc/DllPaths_generated.h for dylib dependencies" +for a in $(grep .dylib "$SRCROOT"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\"//g) ; do check_dyloaded_depends $a done diff --git a/tools/darwin/Support/makepythoninterface.command b/tools/darwin/Support/makepythoninterface.command index d670659e60..ec2d2b42ef 100755 --- a/tools/darwin/Support/makepythoninterface.command +++ b/tools/darwin/Support/makepythoninterface.command @@ -8,5 +8,5 @@ fi if [ "$ACTION" = build ] ; then make -f ${SRCROOT}/codegenerator.mk - make -f ${SRCROOT}/src/gen-compileinfo.mk + make -f ${SRCROOT}/xbmc/gen-compileinfo.mk fi |