aboutsummaryrefslogtreecommitdiff
path: root/tools/darwin
diff options
context:
space:
mode:
Diffstat (limited to 'tools/darwin')
-rw-r--r--tools/darwin/packaging/atv2/mkdeb-atv2.sh.in (renamed from tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in)57
-rw-r--r--tools/darwin/packaging/ios/mkdeb-ios.sh.in (renamed from tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in)39
-rw-r--r--tools/darwin/packaging/migrate_to_kodi_ios.sh.in29
-rw-r--r--tools/darwin/packaging/osx/VolumeDSStore (renamed from tools/darwin/packaging/xbmc-osx/VolumeDSStore)bin12292 -> 12292 bytes
-rw-r--r--tools/darwin/packaging/osx/VolumeDSStoreApp (renamed from tools/darwin/packaging/xbmc-osx/VolumeDSStoreApp)bin12292 -> 12292 bytes
-rw-r--r--tools/darwin/packaging/osx/VolumeIcon.icns (renamed from tools/darwin/packaging/xbmc-osx/VolumeIcon.icns)bin219878 -> 219878 bytes
-rw-r--r--tools/darwin/packaging/osx/background/DiskImageBackground.png (renamed from tools/darwin/packaging/xbmc-osx/background/DiskImageBackground.png)bin22292 -> 22292 bytes
-rw-r--r--tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png (renamed from tools/darwin/packaging/xbmc-osx/background/DiskImageBackgroundDebug.png)bin22292 -> 22292 bytes
-rwxr-xr-xtools/darwin/packaging/osx/dmgmaker.pl (renamed from tools/darwin/packaging/xbmc-osx/dmgmaker.pl)6
-rwxr-xr-xtools/darwin/packaging/osx/mkdmg-osx.sh.in (renamed from tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh.in)18
10 files changed, 90 insertions, 59 deletions
diff --git a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in b/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in
index 10a15b4c36..db33d12d40 100644
--- a/tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh.in
+++ b/tools/darwin/packaging/atv2/mkdeb-atv2.sh.in
@@ -1,21 +1,21 @@
#!/bin/sh
-# usage: ./mkdeb-xbmc-atv2.sh release/debug (case insensitive)
-# Allows us to run mkdeb-xbmc-atv2.sh from anywhere in the three, rather than the tools/darwin/packaging/xbmc-atv2 folder only
+# usage: ./mkdeb-atv2.sh release/debug (case insensitive)
+# Allows us to run mkdeb-atv2.sh from anywhere in the three, rather than the tools/darwin/packaging/atv2 folder only
XBMC_DEPENDS_ROOT=@DEPENDS_ROOT_FOR_XCODE@
SWITCH=`echo $1 | tr [A-Z] [a-z]`
DIRNAME=`dirname $0`
DSYM_TARGET_DIR=${XBMC_DEPENDS_ROOT}/dSyms
-DSYM_FILENAME=XBMC.frappliance.dSYM
+DSYM_FILENAME=@APP_NAME@.frappliance.dSYM
if [ ${SWITCH:-""} = "debug" ]; then
echo "Packaging Debug target for ATV2"
- XBMC="$DIRNAME/../../../../build/Debug-iphoneos/XBMC.frappliance"
+ APP="$DIRNAME/../../../../build/Debug-iphoneos/@APP_NAME@.frappliance"
DSYM="$DIRNAME/../../../../build/Debug-iphoneos/$DSYM_FILENAME"
elif [ ${SWITCH:-""} = "release" ]; then
echo "Packaging Release target for ATV2"
- XBMC="$DIRNAME/../../../../build/Release-iphoneos/XBMC.frappliance"
+ APP="$DIRNAME/../../../../build/Release-iphoneos/@APP_NAME@.frappliance"
DSYM="$DIRNAME/../../../../build/Release-iphoneos/$DSYM_FILENAME"
- echo $XBMC
+ echo $APP
else
echo "You need to specify the build target"
exit 1
@@ -28,8 +28,8 @@ if [ -d $DSYM ]; then
fi
fi
-if [ ! -d $XBMC ]; then
- echo "XBMC.frappliance not found! are you sure you built $1 target?"
+if [ ! -d $APP ]; then
+ echo "@APP_NAME@.frappliance not found! are you sure you built $1 target?"
exit 1
fi
if [ -f "$XBMC_DEPENDS_ROOT/buildtools-native/bin/fakeroot" ]; then
@@ -45,12 +45,12 @@ if [ -f "$XBMC_DEPENDS_ROOT/buildtools-native/bin/dpkg-deb" ]; then
export PATH=${bin_path}:${PATH}
fi
-PACKAGE=org.xbmc.xbmc-atv2
+PACKAGE=org.xbmc.kodi-atv2
VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@
REVISION=0~@APP_VERSION_TAG_LC@
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
-XBMCSIZE="$(du -s -k ${XBMC} | awk '{print $1}')"
+SIZE="$(du -s -k ${APP} | awk '{print $1}')"
echo Creating $PACKAGE package version $VERSION revision $REVISION
${SUDO} rm -rf $DIRNAME/$PACKAGE
@@ -60,40 +60,40 @@ ${SUDO} rm -rf $DIRNAME/$ARCHIVE
mkdir -p $DIRNAME/$PACKAGE/DEBIAN
echo "Package: $PACKAGE" > $DIRNAME/$PACKAGE/DEBIAN/control
echo "Priority: Extra" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Name: XBMC-ATV2" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Depends: curl, org.awkwardtv.whitelist, com.nito.updatebegone, org.xbmc.xbmc-seatbeltunlock" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Name: @APP_NAME@-ATV2" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Depends: curl, org.awkwardtv.whitelist, com.nito.updatebegone, org.xbmc.kodi-seatbeltunlock" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Version: $VERSION-$REVISION" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Architecture: iphoneos-arm" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Installed-Size: $XBMCSIZE" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Description: XBMC Multimedia Center for AppleTV 2" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Installed-Size: $SIZE" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Description: @APP_NAME@ Entertainment Center for AppleTV 2" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Homepage: http://xbmc.org/" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Maintainer: Scott Davilla, Edgar Hucek" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Author: TeamXBMC" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Maintainer: Memphiz" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Author: Team-@APP_NAME@" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Section: Multimedia" >> $DIRNAME/$PACKAGE/DEBIAN/control
# prerm: called on remove and upgrade - get rid of existing bits.
echo "#!/bin/sh" > $DIRNAME/$PACKAGE/DEBIAN/prerm
-echo "find /Applications/XBMC.frappliance -delete" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
+echo "find /Applications/@APP_NAME@.frappliance -delete" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
echo "if [ \"\`uname -r\`\" = \"10.3.1\" ]; then" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
-echo " find /Applications/Lowtide.app/Appliances/XBMC.frappliance -delete" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
+echo " find /Applications/Lowtide.app/Appliances/@APP_NAME@.frappliance -delete" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
echo "else" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
-echo " find /Applications/AppleTV.app/Appliances/XBMC.frappliance -delete" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
+echo " find /Applications/AppleTV.app/Appliances/@APP_NAME@.frappliance -delete" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
echo "fi" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
chmod +x $DIRNAME/$PACKAGE/DEBIAN/prerm
-# postinst: symlink XBMC.frappliance into correct location and reload Lowtide/AppleTV.
+# postinst: symlink @APP_NAME@.frappliance into correct location and reload Lowtide/AppleTV.
echo "#!/bin/sh" > $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo "chown -R mobile:mobile /Applications/XBMC.frappliance" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo "cp /Applications/XBMC.frappliance/AppIcon.png /Applications/AppleTV.app/com.apple.frontrow.appliance.xbmc\@720p.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo "chown -R mobile:mobile /Applications/@APP_NAME@.frappliance" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo "cp /Applications/@APP_NAME@.frappliance/AppIcon.png /Applications/AppleTV.app/com.apple.frontrow.appliance.kodi\@720p.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo "mkdir -p /private/var/mobile/Library/Caches/AppleTV/MainMenu/" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo "cp /Applications/XBMC.frappliance/AppIcon.png /private/var/mobile/Library/Caches/AppleTV/MainMenu/com.apple.frontrow.appliance.xbmc@720.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo "cp /Applications/XBMC.frappliance/AppIcon.png /Applications/XBMC.frappliance/TopRowIcon.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo "cp /Applications/@APP_NAME@.frappliance/AppIcon.png /private/var/mobile/Library/Caches/AppleTV/MainMenu/com.apple.frontrow.appliance.kodi@720.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo "cp /Applications/@APP_NAME@.frappliance/AppIcon.png /Applications/@APP_NAME@.frappliance/TopRowIcon.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo "if [ \"\`uname -r\`\" = \"10.3.1\" ]; then" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo " ln -sf /Applications/XBMC.frappliance /Applications/Lowtide.app/Appliances/XBMC.frappliance" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo " ln -sf /Applications/@APP_NAME@.frappliance /Applications/Lowtide.app/Appliances/@APP_NAME@.frappliance" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo " killall Lowtide" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo "else" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo " mkdir -p /Applications/AppleTV.app/Appliances" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo " ln -sf /Applications/XBMC.frappliance /Applications/AppleTV.app/Appliances/XBMC.frappliance" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo " ln -sf /Applications/@APP_NAME@.frappliance /Applications/AppleTV.app/Appliances/@APP_NAME@.frappliance" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo " killall AppleTV" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo "fi" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo "FILE=/var/mobile/Media/Photos/seas0nTV.png" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
@@ -101,11 +101,12 @@ echo "if [ -f \$FILE ]; then" >> $DIRNAME/$PACKAGE/DEBIAN/po
echo " echo \"File \$FILE exists. removing...\"" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo " rm \$FILE" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
echo "fi" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+cat $DIRNAME/../migrate_to_kodi_ios.sh >> $DIRNAME/$PACKAGE/DEBIAN/postinst
chmod +x $DIRNAME/$PACKAGE/DEBIAN/postinst
-# prep XBMC.frappliance
+# prep @APP_NAME@.frappliance
mkdir -p $DIRNAME/$PACKAGE/Applications
-cp -r $XBMC $DIRNAME/$PACKAGE/Applications/
+cp -r $APP $DIRNAME/$PACKAGE/Applications/
find $DIRNAME/$PACKAGE/Applications/ -name '.svn' -exec rm -rf {} \;
find $DIRNAME/$PACKAGE/Applications/ -name '.git*' -exec rm -rf {} \;
find $DIRNAME/$PACKAGE/Applications/ -name '.DS_Store' -exec rm -rf {} \;
diff --git a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in b/tools/darwin/packaging/ios/mkdeb-ios.sh.in
index c1a10eddfc..d7cbdb6c55 100644
--- a/tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh.in
+++ b/tools/darwin/packaging/ios/mkdeb-ios.sh.in
@@ -1,20 +1,20 @@
#!/bin/sh
-# usage: ./mkdeb-xbmc-ios.sh release/debug (case insensitive)
-# Allows us to run mkdeb-xbmc-ios.sh from anywhere in the three, rather than the tools/darwin/packaging/xbmc-ios folder only
+# usage: ./mkdeb-ios.sh release/debug (case insensitive)
+# Allows us to run mkdeb-ios.sh from anywhere in the three, rather than the tools/darwin/packaging/ios folder only
XBMC_DEPENDS_ROOT=@DEPENDS_ROOT_FOR_XCODE@
SWITCH=`echo $1 | tr [A-Z] [a-z]`
DIRNAME=`dirname $0`
DSYM_TARGET_DIR=${XBMC_DEPENDS_ROOT}/dSyms
-DSYM_FILENAME=XBMC.app.dSYM
+DSYM_FILENAME=@APP_NAME@.app.dSYM
if [ ${SWITCH:-""} = "debug" ]; then
echo "Packaging Debug target for iOS"
- XBMC="$DIRNAME/../../../../build/Debug-iphoneos/XBMC.app"
+ APP="$DIRNAME/../../../../build/Debug-iphoneos/@APP_NAME@.app"
DSYM="$DIRNAME/../../../../build/Debug-iphoneos/$DSYM_FILENAME"
elif [ ${SWITCH:-""} = "release" ]; then
echo "Packaging Release target for iOS"
- XBMC="$DIRNAME/../../../../build/Release-iphoneos/XBMC.app"
+ APP="$DIRNAME/../../../../build/Release-iphoneos/@APP_NAME@.app"
DSYM="$DIRNAME/../../../../build/Release-iphoneos/$DSYM_FILENAME"
else
echo "You need to specify the build target"
@@ -29,8 +29,8 @@ if [ -d $DSYM ]; then
fi
-if [ ! -d $XBMC ]; then
- echo "XBMC.app not found! are you sure you built $1 target?"
+if [ ! -d $APP ]; then
+ echo "@APP_NAME@.app not found! are you sure you built $1 target?"
exit 1
fi
if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/fakeroot" ]; then
@@ -46,12 +46,12 @@ if [ -f "${XBMC_DEPENDS_ROOT}/buildtools-native/bin/dpkg-deb" ]; then
export PATH=${bin_path}:${PATH}
fi
-PACKAGE=org.xbmc.xbmc-ios
+PACKAGE=org.xbmc.kodi-ios
VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@
REVISION=0~@APP_VERSION_TAG_LC@
ARCHIVE=${PACKAGE}_${VERSION}-${REVISION}_iphoneos-arm.deb
-XBMCSIZE="$(du -s -k ${XBMC} | awk '{print $1}')"
+SIZE="$(du -s -k ${APP} | awk '{print $1}')"
echo Creating $PACKAGE package version $VERSION revision $REVISION
${SUDO} rm -rf $DIRNAME/$PACKAGE
@@ -61,31 +61,32 @@ ${SUDO} rm -rf $DIRNAME/$ARCHIVE
mkdir -p $DIRNAME/$PACKAGE/DEBIAN
echo "Package: $PACKAGE" > $DIRNAME/$PACKAGE/DEBIAN/control
echo "Priority: Extra" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Name: XBMC-iOS" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Name: @APP_NAME@-iOS" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Depends: firmware (>= 4.1)" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Version: $VERSION-$REVISION" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Architecture: iphoneos-arm" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Installed-Size: $XBMCSIZE" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Description: XBMC Multimedia Center for 4.x iOS" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Installed-Size: $SIZE" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Description: @APP_NAME@ Entertainment Center for 4.x iOS" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Homepage: http://xbmc.org/" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Maintainer: Scott Davilla, Edgar Hucek" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Author: TeamXBMC" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Maintainer: Memphiz" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Author: Team-@APP_NAME@" >> $DIRNAME/$PACKAGE/DEBIAN/control
echo "Section: Multimedia" >> $DIRNAME/$PACKAGE/DEBIAN/control
-echo "Icon: file:///Applications/XBMC.app/AppIcon57x57.png" >> $DIRNAME/$PACKAGE/DEBIAN/control
+echo "Icon: file:///Applications/@APP_NAME@.app/AppIcon57x57.png" >> $DIRNAME/$PACKAGE/DEBIAN/control
# prerm: called on remove and upgrade - get rid of existing bits.
echo "#!/bin/sh" > $DIRNAME/$PACKAGE/DEBIAN/prerm
-echo "find /Applications/XBMC.app -delete" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
+echo "find /Applications/@APP_NAME@.app -delete" >> $DIRNAME/$PACKAGE/DEBIAN/prerm
chmod +x $DIRNAME/$PACKAGE/DEBIAN/prerm
# postinst: nothing for now.
echo "#!/bin/sh" > $DIRNAME/$PACKAGE/DEBIAN/postinst
-echo "chown -R mobile:mobile /Applications/XBMC.app" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+echo "chown -R mobile:mobile /Applications/@APP_NAME@.app" >> $DIRNAME/$PACKAGE/DEBIAN/postinst
+cat $DIRNAME/../migrate_to_kodi_ios.sh >> $DIRNAME/$PACKAGE/DEBIAN/postinst
chmod +x $DIRNAME/$PACKAGE/DEBIAN/postinst
-# prep XBMC.app
+# prep @APP_NAME@.app
mkdir -p $DIRNAME/$PACKAGE/Applications
-cp -r $XBMC $DIRNAME/$PACKAGE/Applications/
+cp -r $APP $DIRNAME/$PACKAGE/Applications/
find $DIRNAME/$PACKAGE/Applications/ -name '.svn' -exec rm -rf {} \;
find $DIRNAME/$PACKAGE/Applications/ -name '.git*' -exec rm -rf {} \;
find $DIRNAME/$PACKAGE/Applications/ -name '.DS_Store' -exec rm -rf {} \;
diff --git a/tools/darwin/packaging/migrate_to_kodi_ios.sh.in b/tools/darwin/packaging/migrate_to_kodi_ios.sh.in
new file mode 100644
index 0000000000..50e4e71b47
--- /dev/null
+++ b/tools/darwin/packaging/migrate_to_kodi_ios.sh.in
@@ -0,0 +1,29 @@
+APP_NAME=@APP_NAME@
+XBMC_HOME="/var/mobile/Library/Preferences/XBMC"
+APP_HOME="/var/mobile/Library/Preferences/Kodi"
+
+
+function needs_kodi_migration () {
+ #check if there is an old XBMC folder to migrate
+ if test -d "$XBMC_HOME" && test ! -d "$APP_HOME"
+ then
+ return "1";
+ else
+ return "0";
+ fi
+}
+
+function migrate_to_kodi () {
+ echo "moving settings from $XBMC_HOME to $APP_HOME"
+ mv $XBMC_HOME $APP_HOME
+ chown -R mobile.mobile $APP_HOME
+ echo "Migration complete"
+}
+
+needs_kodi_migration
+NEEDS_MIGRATION=$?
+if [ "$NEEDS_MIGRATION" == "1" ]
+then
+ echo "This is the first time you install Kodi and we detected that you have an old XBMC configuration. Your XBMC configuration will now be migrated to Kodi by moving the settings folder. If you ever want to go back to XBMC please backup /var/mobile/Library/Preferences/Kodi after this installation has finished and rename it to XBMC in case you downgrade to XBMC."
+ migrate_to_kodi
+fi
diff --git a/tools/darwin/packaging/xbmc-osx/VolumeDSStore b/tools/darwin/packaging/osx/VolumeDSStore
index 387b6e21eb..387b6e21eb 100644
--- a/tools/darwin/packaging/xbmc-osx/VolumeDSStore
+++ b/tools/darwin/packaging/osx/VolumeDSStore
Binary files differ
diff --git a/tools/darwin/packaging/xbmc-osx/VolumeDSStoreApp b/tools/darwin/packaging/osx/VolumeDSStoreApp
index f1a82a4bbb..f1a82a4bbb 100644
--- a/tools/darwin/packaging/xbmc-osx/VolumeDSStoreApp
+++ b/tools/darwin/packaging/osx/VolumeDSStoreApp
Binary files differ
diff --git a/tools/darwin/packaging/xbmc-osx/VolumeIcon.icns b/tools/darwin/packaging/osx/VolumeIcon.icns
index 75215701b6..75215701b6 100644
--- a/tools/darwin/packaging/xbmc-osx/VolumeIcon.icns
+++ b/tools/darwin/packaging/osx/VolumeIcon.icns
Binary files differ
diff --git a/tools/darwin/packaging/xbmc-osx/background/DiskImageBackground.png b/tools/darwin/packaging/osx/background/DiskImageBackground.png
index 2299a1ac75..2299a1ac75 100644
--- a/tools/darwin/packaging/xbmc-osx/background/DiskImageBackground.png
+++ b/tools/darwin/packaging/osx/background/DiskImageBackground.png
Binary files differ
diff --git a/tools/darwin/packaging/xbmc-osx/background/DiskImageBackgroundDebug.png b/tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png
index 2299a1ac75..2299a1ac75 100644
--- a/tools/darwin/packaging/xbmc-osx/background/DiskImageBackgroundDebug.png
+++ b/tools/darwin/packaging/osx/background/DiskImageBackgroundDebug.png
Binary files differ
diff --git a/tools/darwin/packaging/xbmc-osx/dmgmaker.pl b/tools/darwin/packaging/osx/dmgmaker.pl
index 1047d0a848..4720bf047a 100755
--- a/tools/darwin/packaging/xbmc-osx/dmgmaker.pl
+++ b/tools/darwin/packaging/osx/dmgmaker.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# Copyright (C) 2008-2013 Team XBMC
+# Copyright (C) 2008-2013 Team Kodi
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -74,8 +74,8 @@ if (! defined $ARGV[0]) {
if ( $ARGV[0] eq "-c" ) {
die("TODO: -c\n");
- #make_dmg(make_mpkg(), "XBMC Atlantis - 8.10", "XBMC Media Center");
+ #make_dmg(make_mpkg(), "Kodi Atlantis - 8.10", "Kodi Media Center");
exit;
}
-make_dmg($ARGV[0], $ARGV[1], "XBMC");
+make_dmg($ARGV[0], $ARGV[1], "Kodi");
diff --git a/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh.in b/tools/darwin/packaging/osx/mkdmg-osx.sh.in
index 60764d2f28..39b0e12eb5 100755
--- a/tools/darwin/packaging/xbmc-osx/mkdmg-xbmc-osx.sh.in
+++ b/tools/darwin/packaging/osx/mkdmg-osx.sh.in
@@ -1,28 +1,28 @@
#!/bin/sh
-# usage: ./mkdmg-xbmc-osx.sh release/debug (case insensitive)
-# Allows us to run mkdmg-xbmc-osx.sh from anywhere in the three, rather than the tools/darwin/packaging/xbmc-osx folder only
+# usage: ./mkdmg-osx.sh release/debug (case insensitive)
+# Allows us to run mkdmg-osx.sh from anywhere in the three, rather than the tools/darwin/packaging/osx folder only
SWITCH=`echo $1 | tr [A-Z] [a-z]`
DIRNAME=`dirname $0`
if [ ${SWITCH:-""} = "debug" ]; then
echo "Packaging Debug target for OSX"
- XBMC="$DIRNAME/../../../../build/Debug/XBMC.app"
+ APP="$DIRNAME/../../../../build/Debug/@APP_NAME@.app"
elif [ ${SWITCH:-""} = "release" ]; then
echo "Packaging Release target for OSX"
- XBMC="$DIRNAME/../../../../build/Release/XBMC.app"
+ APP="$DIRNAME/../../../../build/Release/@APP_NAME@.app"
else
echo "You need to specify the build target"
exit 1
fi
-if [ ! -d $XBMC ]; then
- echo "XBMC.app not found! are you sure you built $1 target?"
+if [ ! -d $APP ]; then
+ echo "@APP_NAME@.app not found! are you sure you built $1 target?"
exit 1
fi
-ARCHITECTURE=`file $XBMC/Contents/MacOS/XBMC | awk '{print $NF}'`
+ARCHITECTURE=`file $APP/Contents/MacOS/@APP_NAME@ | awk '{print $NF}'`
-PACKAGE=org.xbmc.xbmc-osx
+PACKAGE=org.xbmc.kodi-osx
VERSION=@APP_VERSION_MAJOR@.@APP_VERSION_MINOR@
REVISION=0~@APP_VERSION_TAG_LC@
@@ -36,6 +36,6 @@ then
umount /Volumes/$ARCHIVE
fi
-$DIRNAME/dmgmaker.pl $XBMC $ARCHIVE
+$DIRNAME/dmgmaker.pl $APP $ARCHIVE
echo "done"