summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-06-13 22:42:37 +0200
committerRobin Gareus <robin@gareus.org>2013-06-13 22:42:37 +0200
commit1e78407e81323e740ea9359b06434d66decfc980 (patch)
treec8bf085c1c6b14d999f53c7312db58cc182b4a56 /tools
parent489121ca2066352bd890b3e779527e803dadfcb6 (diff)
update OSX disk image
* unpack xjadeo dmg - add Jadeo.app * new background image with arrow for xjadeo
Diffstat (limited to 'tools')
-rw-r--r--tools/osx_packaging/dmgbgxj.pngbin0 -> 45395 bytes
-rw-r--r--tools/osx_packaging/dmgbgxj.xcfbin0 -> 342158 bytes
-rwxr-xr-xtools/osx_packaging/osx_build21
3 files changed, 16 insertions, 5 deletions
diff --git a/tools/osx_packaging/dmgbgxj.png b/tools/osx_packaging/dmgbgxj.png
new file mode 100644
index 0000000000..56fbc197cc
--- /dev/null
+++ b/tools/osx_packaging/dmgbgxj.png
Binary files differ
diff --git a/tools/osx_packaging/dmgbgxj.xcf b/tools/osx_packaging/dmgbgxj.xcf
new file mode 100644
index 0000000000..8f978d647b
--- /dev/null
+++ b/tools/osx_packaging/dmgbgxj.xcf
Binary files differ
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index f383b00bb9..18d3b311ed 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -475,6 +475,7 @@ rm -rf $PRODUCT_PKG_DIR
mkdir $PRODUCT_PKG_DIR
DMGWINBOTTOM=440
+DMGBACKGROUND=dmgbg.png
if [ x$SAE != x ] ; then
@@ -493,8 +494,9 @@ elif [ x$MIXBUS != x ] ; then
echo "Creating Mixbus packaging directory"
mv $APPDIR $PRODUCT_PKG_DIR/
cp MixBus_Install_QuickStart.pdf "$PRODUCT_PKG_DIR/Mixbus Install & Quick Start Guide.pdf"
- DMGWINBOTTOM=$[ $DMGWINBOTTOM + 100 ]
- MIXBUSPOS="set position of item \"MixBus_Install_QuickStart.pdf\" of container window to {90, 180}"
+ DMGWINBOTTOM=580
+ YPOS=$[ $DMGWINBOTTOM - 300 ]
+ MIXBUSPOS="set position of item \"MixBus_Install_QuickStart.pdf\" of container window to {90, ${YPOS}}"
else
echo "Creating $APPNAME packaging directory"
@@ -511,9 +513,18 @@ if test x$WITH_HARVID != x ; then
curl -L -o "$PRODUCT_PKG_DIR/xjadeo-${XJADEO_VERSION:1}.dmg" "http://sourceforge.net/projects/xjadeo/files/xjadeo/${XJADEO_VERSION}/jadeo-${XJADEO_VERSION:1}.dmg/download"
curl -L "http://ardour.org/files/video-tools/harvid-osx-${HARVID_VERSION}.tgz"\
| tar -x -z -C $PRODUCT_PKG_DIR/$APPROOT
- DMGWINBOTTOM=$[ $DMGWINBOTTOM + 140 ]
+
+ ls -l "$PRODUCT_PKG_DIR/xjadeo-${XJADEO_VERSION:1}.dmg"
+ JADEO=$(hdiutil attach "$PRODUCT_PKG_DIR/xjadeo-${XJADEO_VERSION:1}.dmg" | grep Apple_HFS | grep dev/ | cut -f 3)
+ cp -r "${JADEO}/Jadeo.app" "$PRODUCT_PKG_DIR/"
+ hdiutil detach "${JADEO}"
+ rm "$PRODUCT_PKG_DIR/xjadeo-${XJADEO_VERSION:1}.dmg"
+
+ DMGWINBOTTOM=580
YPOS=$[ $DMGWINBOTTOM - 300 ]
- XJADEOPOS="set position of item \"xjadeo-${XJADEO_VERSION:1}.dmg\" of container window to {90, ${YPOS}}"
+ XJADEOPOS="set position of item \"Jadeo.app\" of container window to {310, ${YPOS}}"
+
+ DMGBACKGROUND=dmgbgxj.png
fi
echo "Building DMG ..."
@@ -546,7 +557,7 @@ mount -t hfs "${DiskDevice}" "${MNTPATH}"
cp -r ${PRODUCT_PKG_DIR}/* "${MNTPATH}" || exit
mkdir "${MNTPATH}/.background"
-cp -vi dmgbg.png "${MNTPATH}/.background/dmgbg.png"
+cp -vi ${DMGBACKGROUND} "${MNTPATH}/.background/dmgbg.png"
echo "setting DMG background ..."