diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Linux/xbmc.desktop | 6 | ||||
| -rw-r--r-- | tools/TexturePacker/XBMCTex.cpp | 43 | ||||
| -rw-r--r-- | tools/android/packaging/Makefile | 4 | ||||
| -rw-r--r-- | tools/darwin/depends/configure.in | 7 | ||||
| -rwxr-xr-x | tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh | 2 | ||||
| -rwxr-xr-x | tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh | 2 |
6 files changed, 34 insertions, 30 deletions
diff --git a/tools/Linux/xbmc.desktop b/tools/Linux/xbmc.desktop index 46e2f8e4f8..fd3ea1b869 100644 --- a/tools/Linux/xbmc.desktop +++ b/tools/Linux/xbmc.desktop @@ -14,9 +14,9 @@ Actions=Fullscreen;Standalone [Desktop Action Fullscreen] Name=Open in fullscreen Exec=xbmc -fs -OnlyShowIn=Unity +OnlyShowIn=Unity; [Desktop Action Standalone] Name=Open in standalone mode -Exect=xbmc --standalone -OnlyShowIn=Unity +Exec=xbmc --standalone +OnlyShowIn=Unity; diff --git a/tools/TexturePacker/XBMCTex.cpp b/tools/TexturePacker/XBMCTex.cpp index 63da7486ab..8db78eb873 100644 --- a/tools/TexturePacker/XBMCTex.cpp +++ b/tools/TexturePacker/XBMCTex.cpp @@ -143,32 +143,33 @@ void CreateSkeletonHeaderImpl(CXBTF& xbtf, std::string fullPath, std::string rel //stat to check for dir type (reiserfs fix) std::string fileN = fullPath + "/" + dp->d_name; - stat(fileN.c_str(), &stat_p); - - if (dp->d_type == DT_DIR || stat_p.st_mode & S_IFDIR) + if (stat(fileN.c_str(), &stat_p) == 0) { - std::string tmpPath = relativePath; - if (tmpPath.size() > 0) + if (dp->d_type == DT_DIR || stat_p.st_mode & S_IFDIR) { - tmpPath += "/"; - } + std::string tmpPath = relativePath; + if (tmpPath.size() > 0) + { + tmpPath += "/"; + } - CreateSkeletonHeaderImpl(xbtf, fullPath + DIR_SEPARATOR + dp->d_name, tmpPath + dp->d_name); - } - else if (IsGraphicsFile(dp->d_name)) - { - std::string fileName = ""; - if (relativePath.size() > 0) + CreateSkeletonHeaderImpl(xbtf, fullPath + DIR_SEPARATOR + dp->d_name, tmpPath + dp->d_name); + } + else if (IsGraphicsFile(dp->d_name)) { - fileName += relativePath; - fileName += "/"; + std::string fileName = ""; + if (relativePath.size() > 0) + { + fileName += relativePath; + fileName += "/"; + } + + fileName += dp->d_name; + + CXBTFFile file; + file.SetPath(fileName); + xbtf.GetFiles().push_back(file); } - - fileName += dp->d_name; - - CXBTFFile file; - file.SetPath(fileName); - xbtf.GetFiles().push_back(file); } } diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile index 0ba5893955..fff2cfd284 100644 --- a/tools/android/packaging/Makefile +++ b/tools/android/packaging/Makefile @@ -55,11 +55,11 @@ extras: libs mkdir -p xbmc/assets xbmc/res xbmc/assets/python2.6/lib/ cp -rfp $(PREFIX)/share/xbmc/* ./xbmc/assets find `pwd`/xbmc/assets/system/ -name "*.so" -exec rm {} \; - find `pwd`/xbmc/assets/addons/skin.*/media/* -not -iname "Textures.xbt" -exec rm {} \; + find `pwd`/xbmc/assets/addons/skin.*/media/* -depth -not -iname "Textures.xbt" -exec rm -rf {} \; cp -rfp $(PREFIX)/lib/python2.6 xbmc/assets/python2.6/lib/ cd xbmc/assets/python2.6/lib/python2.6/; rm -rf test config lib-dynload mkdir -p tmp/res; $(AAPT) c -S xbmc/res -C tmp/res; cp -r -n xbmc/res tmp/ || true - $(AAPT) p -f -I $(SDKROOT)/platforms/android-10/android.jar -S tmp/res/ -M xbmc/AndroidManifest.xml -F images/xbmcapp-debug-skeleton.apk + $(AAPT) p -f -I $(SDKROOT)/platforms/$(SDK_PLATFORM)/android.jar -S tmp/res/ -M xbmc/AndroidManifest.xml -F images/xbmcapp-debug-skeleton.apk @rm -rf tmp/ libs: $(PREFIX)/lib/xbmc/libxbmc.so diff --git a/tools/darwin/depends/configure.in b/tools/darwin/depends/configure.in index 4fdc4bb242..de0c3532eb 100644 --- a/tools/darwin/depends/configure.in +++ b/tools/darwin/depends/configure.in @@ -36,10 +36,13 @@ case $use_darwin in if test "$use_arch" = "armv7"; then AC_MSG_ERROR(error in configure of --with-arch=$use_arch) fi - found_sdk_version=[`$use_xcodebuild -showsdks | grep macosx | sort | tail -n 1 | awk '{ print $4}'`] + found_sdk_version=[`$use_xcodebuild -showsdks | grep macosx | sort | tail -n 1 | grep -oE 'macosx[0-9.0-9]+' | cut -c 7-$NF`] use_sdk="${use_sdk:-$found_sdk_version}" case $use_sdk in - 10.*);; + 10.5);; + 10.6);; + 10.7);; + 10.8);; *) AC_MSG_ERROR(error in configure of --with-sdk=$use_sdk) esac diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh index c5fd74ed0d..2c233b44a2 100755 --- a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh +++ b/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh @@ -45,7 +45,7 @@ fi PACKAGE=org.xbmc.xbmc-atv2 VERSION=12.0 -REVISION=0~alpha5 +REVISION=0~alpha6 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb echo Creating $PACKAGE package version $VERSION revision $REVISION diff --git a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh index 34a0f8b7d7..20b4ca4beb 100755 --- a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh +++ b/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh @@ -46,7 +46,7 @@ fi PACKAGE=org.xbmc.xbmc-ios VERSION=12.0 -REVISION=0~alpha5 +REVISION=0~alpha6 ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb echo Creating $PACKAGE package version $VERSION revision $REVISION |