diff options
| -rwxr-xr-x | tools/darwin/Support/Codesign.command | 4 | ||||
| -rwxr-xr-x | tools/darwin/Support/CopyRootFiles-atv2.command | 56 | ||||
| -rwxr-xr-x | tools/darwin/Support/CopyRootFiles-ios.command | 58 | ||||
| -rwxr-xr-x | tools/darwin/Support/CopyRootFiles-osx.command | 52 | ||||
| -rwxr-xr-x | tools/darwin/Support/copyframeworks-atv2.command | 10 | ||||
| -rwxr-xr-x | tools/darwin/Support/copyframeworks-ios.command | 8 | ||||
| -rwxr-xr-x | tools/darwin/Support/copyframeworks-osx.command | 10 | ||||
| -rwxr-xr-x | tools/darwin/Support/updateversioninfo-osx.command | 2 |
8 files changed, 100 insertions, 100 deletions
diff --git a/tools/darwin/Support/Codesign.command b/tools/darwin/Support/Codesign.command index 8df9860c67..4ed8f48277 100755 --- a/tools/darwin/Support/Codesign.command +++ b/tools/darwin/Support/Codesign.command @@ -17,7 +17,7 @@ if [ "${PLATFORM_NAME}" == "iphoneos" ]; then if [ -f "/Users/Shared/buildslave/keychain_unlock.sh" ]; then /Users/Shared/buildslave/keychain_unlock.sh fi - ${GEN_ENTITLEMENTS} "org.xbmc.xbmc-ios" "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/${PROJECT_NAME}.xcent"; + ${GEN_ENTITLEMENTS} "org.xbmc.kodi-ios" "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/${PROJECT_NAME}.xcent"; codesign -v -f -s "iPhone Developer" --entitlements "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/${PROJECT_NAME}.xcent" "${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/" #if user has set a code_sign_identity different from iPhone Developer we do a real codesign (for deployment on non-jailbroken devices) @@ -25,7 +25,7 @@ if [ "${PLATFORM_NAME}" == "iphoneos" ]; then echo Doing a full bundle sign using genuine identity "${CODE_SIGN_IDENTITY}" for binext in $LIST_BINARY_EXTENSIONS do - codesign -fvvv -s "${CODE_SIGN_IDENTITY}" -i org.xbmc.xbmc-ios `find ${CODESIGNING_FOLDER_PATH} -name "*.$binext"` ${CODESIGNING_FOLDER_PATH} + codesign -fvvv -s "${CODE_SIGN_IDENTITY}" -i org.xbmc.kodi-ios `find ${CODESIGNING_FOLDER_PATH} -name "*.$binext"` ${CODESIGNING_FOLDER_PATH} done echo In case your app crashes with SIG_SIGN check the variable LIST_BINARY_EXTENSIONS in tools/darwin/Support/Codesign.command fi diff --git a/tools/darwin/Support/CopyRootFiles-atv2.command b/tools/darwin/Support/CopyRootFiles-atv2.command index 4f45dd76ee..3ebb6ab668 100755 --- a/tools/darwin/Support/CopyRootFiles-atv2.command +++ b/tools/darwin/Support/CopyRootFiles-atv2.command @@ -6,8 +6,8 @@ if [ "$ACTION" = build ] ; then # for external testing TARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION -#SRCROOT=/Users/Shared/xbmc_svn/XBMC -#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug +#SRCROOT=/Users/Shared/xbmc_svn/$APP_NAME +#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/$APP_NAME/build/Debug # rsync command with exclusions for items we don't want in the app package SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.* --exclude *.zlib --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so" @@ -19,38 +19,38 @@ SKINSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cv # 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.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 - -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/darwin/runtime" - -${SYNC} "$SRCROOT/LICENSE.GPL" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/" -${SYNC} "$SRCROOT/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/" -${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome" -${SYNC} "$SRCROOT/addons/visualization.glspectrum" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons" -${SYNC} "$SRCROOT/addons/visualization.waveform" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons" -${SYNC} "$SRCROOT/language" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome" -${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome" +# binary name is Kodi but we build Kodi.bin so to get a clean binary each time +mv $TARGET_BUILD_DIR/$TARGET_NAME/$APP_NAME.bin $TARGET_BUILD_DIR/$TARGET_NAME/$APP_NAME + +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/language" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/sounds" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/system" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/userdata" +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/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" +${SYNC} "$SRCROOT/language" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" +${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" SYNCSKIN_A=${SKINSYNC} if [ -f "$SRCROOT/addons/skin.confluence/media/Textures.xbt" ]; then SYNCSKIN_A="${SKINSYNC} --exclude *.png --exclude *.jpg" fi -${SYNCSKIN_A} "$SRCROOT/addons/skin.confluence" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons" -${SYNC} "$SRCROOT/addons/skin.confluence/backgrounds" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence" -${SYNC} "$SRCROOT/addons/skin.confluence/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence" +${SYNCSKIN_A} "$SRCROOT/addons/skin.confluence" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" +${SYNC} "$SRCROOT/addons/skin.confluence/backgrounds" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.confluence" +${SYNC} "$SRCROOT/addons/skin.confluence/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.confluence" -${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" +${SYNC} "$SRCROOT/sounds" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" +${SYNC} "$SRCROOT/system" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" +${SYNC} "$SRCROOT/userdata" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" fi diff --git a/tools/darwin/Support/CopyRootFiles-ios.command b/tools/darwin/Support/CopyRootFiles-ios.command index 9249aa025a..81bccd6ceb 100755 --- a/tools/darwin/Support/CopyRootFiles-ios.command +++ b/tools/darwin/Support/CopyRootFiles-ios.command @@ -6,8 +6,8 @@ if [ "$ACTION" = build ] ; then # for external testing TARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION -#SRCROOT=/Users/Shared/xbmc_svn/XBMC -#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug +#SRCROOT=/Users/Shared/xbmc_svn/$APP_NAME +#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/$APP_NAME/build/Debug # rsync command with exclusions for items we don't want in the app package SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *x86-osx.so --exclude *.zlib --exclude *.a" @@ -19,26 +19,26 @@ SKINSYNC="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cv # 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.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 +# binary name is Kodi but we build Kodi.bin so to get a clean binary each time +mv $TARGET_BUILD_DIR/$TARGET_NAME/$APP_NAME.bin $TARGET_BUILD_DIR/$TARGET_NAME/$APP_NAME -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/darwin/runtime" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/language" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/media" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/sounds" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/system" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/userdata" +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/XBMCData/" -${SYNC} "$SRCROOT/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/" -${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome" -${SYNC} "$SRCROOT/addons/visualization.glspectrum" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons" -${SYNC} "$SRCROOT/addons/visualization.waveform" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons" -${SYNC} "$SRCROOT/language" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome" -${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome" +${SYNC} "$SRCROOT/LICENSE.GPL" "$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" +${SYNC} "$SRCROOT/language" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" +${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" # sync touch skin if it exists if [ -f "$SRCROOT/addons/skin.re-touched/addon.xml" ]; then @@ -46,9 +46,9 @@ SYNCSKIN_A=${SKINSYNC} if [ -f "$SRCROOT/addons/skin.re-touched/media/Textures.xbt" ]; then SYNCSKIN_A="${SKINSYNC} --exclude *.png --exclude *.jpg" fi -${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" +${SYNCSKIN_A} "$SRCROOT/addons/skin.re-touched" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" +${SYNC} "$SRCROOT/addons/skin.re-touched/background" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.re-touched" +${SYNC} "$SRCROOT/addons/skin.re-touched/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.re-touched" fi # sync skin.confluence @@ -56,12 +56,12 @@ SYNCSKIN_B=${SKINSYNC} if [ -f "$SRCROOT/addons/skin.confluence/media/Textures.xbt" ]; then SYNCSKIN_B="${SKINSYNC} --exclude *.png --exclude *.jpg" fi -${SYNCSKIN_B} "$SRCROOT/addons/skin.confluence" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons" -${SYNC} "$SRCROOT/addons/skin.confluence/backgrounds" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence" -${SYNC} "$SRCROOT/addons/skin.confluence/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence" +${SYNCSKIN_B} "$SRCROOT/addons/skin.confluence" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons" +${SYNC} "$SRCROOT/addons/skin.confluence/backgrounds" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.confluence" +${SYNC} "$SRCROOT/addons/skin.confluence/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome/addons/skin.confluence" -${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" +${SYNC} "$SRCROOT/sounds" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" +${SYNC} "$SRCROOT/system" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" +${SYNC} "$SRCROOT/userdata" "$TARGET_BUILD_DIR/$TARGET_NAME/AppData/AppHome" fi diff --git a/tools/darwin/Support/CopyRootFiles-osx.command b/tools/darwin/Support/CopyRootFiles-osx.command index 8bc01f2cd1..8c10364cbe 100755 --- a/tools/darwin/Support/CopyRootFiles-osx.command +++ b/tools/darwin/Support/CopyRootFiles-osx.command @@ -5,9 +5,9 @@ echo "copy root files" if [ "$ACTION" = build ] ; then # for external testing -#TARGET_NAME=XBMC.app -#SRCROOT=/Users/Shared/xbmc_svn/XBMC -#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug +#TARGET_NAME=$APP_NAME.app +#SRCROOT=/Users/Shared/xbmc_svn/$APP_NAME +#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/$APP_NAME/build/Debug # rsync command with exclusions for items we don't want in the app package SYNC="rsync -aq --exclude .git* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a" @@ -19,38 +19,38 @@ SYNCSKIN="rsync -aq --exclude .git* --exclude CVS* --exclude .svn* --exclude .cv # rsync command for including everything but the skins 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" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin/runtime" -mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/language" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/media" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/sounds" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/system" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/userdata" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/media" +mkdir -p "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/tools/darwin/runtime" +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/xbmc/osx/Credits.html" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/" -${SYNC} "$SRCROOT/tools/darwin/runtime" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/darwin" -${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC" -${SYNC} "$SRCROOT/language" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC" -${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC" -${SYNCSKIN} "$SRCROOT/addons/skin.confluence" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons" -${SYNC} "$SRCROOT/addons/skin.confluence/backgrounds" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence" -${SYNC} "$SRCROOT/addons/skin.confluence/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence" -${SYNC} "$SRCROOT/sounds" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC" -${SYNC} "$SRCROOT/system" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC" -${SYNC} "$SRCROOT/userdata" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC" +${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" +${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" +${SYNCSKIN} "$SRCROOT/addons/skin.confluence" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons" +${SYNC} "$SRCROOT/addons/skin.confluence/backgrounds" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.confluence" +${SYNC} "$SRCROOT/addons/skin.confluence/icon.png" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/addons/skin.confluence" +${SYNC} "$SRCROOT/sounds" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" +${SYNC} "$SRCROOT/system" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" +${SYNC} "$SRCROOT/userdata" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" # copy extra packages if applicable if [ -d "$SRCROOT/extras/system" ]; then - ${SYNC} "$SRCROOT/extras/system/" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC" + ${SYNC} "$SRCROOT/extras/system/" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME" fi # copy extra user packages if applicable if [ -d "$SRCROOT/extras/user" ]; then - ${SYNC} "$SRCROOT/extras/user/" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user" + ${SYNC} "$SRCROOT/extras/user/" "$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/$APP_NAME/extras/user" fi @@ -59,6 +59,6 @@ fi touch "$TARGET_BUILD_DIR/$TARGET_NAME" # not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name -#mv "$TARGET_BUILD_DIR/$TARGET_NAME" "$TARGET_BUILD_DIR/XBMC Media Center.app" +#mv "$TARGET_BUILD_DIR/$TARGET_NAME" "$TARGET_BUILD_DIR/$APP_NAME Media Center.app" fi diff --git a/tools/darwin/Support/copyframeworks-atv2.command b/tools/darwin/Support/copyframeworks-atv2.command index c604682907..21cdd55ff7 100755 --- a/tools/darwin/Support/copyframeworks-atv2.command +++ b/tools/darwin/Support/copyframeworks-atv2.command @@ -53,18 +53,18 @@ EXTERNAL_LIBS=$XBMC_DEPENDS TARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION TARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME -TARGET_BINARY=$TARGET_CONTENTS/XBMC +TARGET_BINARY=$TARGET_CONTENTS/$APP_NAME TARGET_FRAMEWORKS=$TARGET_CONTENTS/Frameworks -DYLIB_NAMEPATH=@executable_path/Appliances/XBMC.frappliance/Frameworks -XBMC_HOME=$TARGET_CONTENTS/XBMCData/XBMCHome +DYLIB_NAMEPATH=@executable_path/Appliances/$APP_NAME.frappliance/Frameworks +XBMC_HOME=$TARGET_CONTENTS/AppData/AppHome mkdir -p "$TARGET_CONTENTS" -mkdir -p "$TARGET_CONTENTS/XBMCData/XBMCHome" +mkdir -p "$TARGET_CONTENTS/AppData/AppHome" # start clean so we don't keep old dylibs rm -rf "$TARGET_CONTENTS/Frameworks" mkdir -p "$TARGET_CONTENTS/Frameworks" -echo "Package $TARGET_BUILD_DIR/XBMC" +echo "Package $TARGET_BUILD_DIR/$APP_NAME" # Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework echo "Checking $TARGET_BINARY dylib dependencies" diff --git a/tools/darwin/Support/copyframeworks-ios.command b/tools/darwin/Support/copyframeworks-ios.command index 025f15dad4..328258bd08 100755 --- a/tools/darwin/Support/copyframeworks-ios.command +++ b/tools/darwin/Support/copyframeworks-ios.command @@ -53,18 +53,18 @@ EXTERNAL_LIBS=$XBMC_DEPENDS TARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION TARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME -TARGET_BINARY=$TARGET_CONTENTS/XBMC +TARGET_BINARY=$TARGET_CONTENTS/$APP_NAME TARGET_FRAMEWORKS=$TARGET_CONTENTS/Frameworks DYLIB_NAMEPATH=@executable_path/Frameworks -XBMC_HOME=$TARGET_CONTENTS/XBMCData/XBMCHome +XBMC_HOME=$TARGET_CONTENTS/AppData/AppHome mkdir -p "$TARGET_CONTENTS" -mkdir -p "$TARGET_CONTENTS/XBMCData/XBMCHome" +mkdir -p "$TARGET_CONTENTS/AppData/AppHome" # start clean so we don't keep old dylibs rm -rf "$TARGET_CONTENTS/Frameworks" mkdir -p "$TARGET_CONTENTS/Frameworks" -echo "Package $TARGET_BUILD_DIR/XBMC" +echo "Package $TARGET_BUILD_DIR/$APP_NAME" # Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework echo "Checking $TARGET_BINARY dylib dependencies" diff --git a/tools/darwin/Support/copyframeworks-osx.command b/tools/darwin/Support/copyframeworks-osx.command index 234b116422..df041c1ab1 100755 --- a/tools/darwin/Support/copyframeworks-osx.command +++ b/tools/darwin/Support/copyframeworks-osx.command @@ -53,10 +53,10 @@ EXTERNAL_LIBS=$XBMC_DEPENDS TARGET_NAME=$PRODUCT_NAME TARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME/Contents -TARGET_BINARY=$TARGET_CONTENTS/MacOS/XBMC +TARGET_BINARY=$TARGET_CONTENTS/MacOS/$APP_NAME TARGET_FRAMEWORKS=$TARGET_CONTENTS/Libraries DYLIB_NAMEPATH=@executable_path/../Libraries -XBMC_HOME=$TARGET_CONTENTS/Resources/XBMC +XBMC_HOME=$TARGET_CONTENTS/Resources/$APP_NAME mkdir -p "$TARGET_CONTENTS/MacOS" mkdir -p "$TARGET_CONTENTS/Resources" @@ -64,11 +64,11 @@ mkdir -p "$TARGET_CONTENTS/Resources" rm -rf "$TARGET_CONTENTS/Libraries" mkdir -p "$TARGET_CONTENTS/Libraries" -echo "Package $TARGET_BUILD_DIR/XBMC" -cp -f "$TARGET_BUILD_DIR/XBMC" "$TARGET_BINARY" +echo "Package $TARGET_BUILD_DIR/$APP_NAME" +cp -f "$TARGET_BUILD_DIR/$APP_NAME" "$TARGET_BINARY" echo "Creating icon" -iconutil -c icns --output "$TARGET_CONTENTS/Resources/xbmc.icns" "$SRCROOT/tools/darwin/packaging/media/osx/icon.iconset" +iconutil -c icns --output "$TARGET_CONTENTS/Resources/kodi.icns" "$SRCROOT/tools/darwin/packaging/media/osx/icon.iconset" cp -f "$SRCROOT/xbmc/osx/Info.plist" "$TARGET_CONTENTS/" diff --git a/tools/darwin/Support/updateversioninfo-osx.command b/tools/darwin/Support/updateversioninfo-osx.command index 2cd18cefc0..0d5cdf98e1 100755 --- a/tools/darwin/Support/updateversioninfo-osx.command +++ b/tools/darwin/Support/updateversioninfo-osx.command @@ -2,7 +2,7 @@ # Update version in Info.plist with Git revision GIT_REVISION="Unknown" -BUNDLE_NAME="XBMC" +BUNDLE_NAME="$APP_NAME" GIT_REVISION="Git-"$(cat git_revision.h | sed -n 's/\(.*\)\"\(.*\)\"\(.*\)/\2/p') perl -p -i -e "s/r####/$GIT_REVISION/" "$TARGET_BUILD_DIR/$BUNDLE_NAME.app/Contents/Info.plist" |