Made a new improved dmg background for OS X. Modified the dmg layout script to work...

git-svn-id: https://s.snth.net/svn/neverball/trunk@2612 78b8d119-cf0a-0410-b17c-f493084dd1d7

diff --git a/macosx/icons/dmg-background.jpg b/macosx/icons/dmg-background.jpg
deleted file mode 100644 (file)
index 6168462..0000000
Binary files a/macosx/icons/dmg-background.jpg and /dev/null differ

diff --git a/macosx/icons/dmg-background.png b/macosx/icons/dmg-background.png
new file mode 100644 (file)
index 0000000..32e0210
Binary files /dev/null and b/macosx/icons/dmg-background.png differ

diff --git a/macosx/icons/test-dmg_back.scpt b/macosx/icons/test-dmg_back.scpt
deleted file mode 100644 (file)
index 0e255e0..0000000
Binary files a/macosx/icons/test-dmg_back.scpt and /dev/null differ

diff --git a/macosx/xcode/neverball.xcodeproj/project.pbxproj b/macosx/xcode/neverball.xcodeproj/project.pbxproj
index df21bf1..53c69de 100755 (executable)
--- a/macosx/xcode/neverball.xcodeproj/project.pbxproj
+++ b/macosx/xcode/neverball.xcodeproj/project.pbxproj
@@ -248,6 +248,9 @@
                B57D63D40CAE8138005DE710 /* st_time_out.c in Sources */ = {isa = PBXBuildFile; fileRef = B57D63CE0CAE8138005DE710 /* st_time_out.c */; };
                B57D63D50CAE8138005DE710 /* st_goal.h in Headers */ = {isa = PBXBuildFile; fileRef = B57D63CF0CAE8138005DE710 /* st_goal.h */; };
                B57D63D60CAE8138005DE710 /* st_fall_out.c in Sources */ = {isa = PBXBuildFile; fileRef = B57D63D00CAE8138005DE710 /* st_fall_out.c */; };
+               B593CBDA0EC4A9DF0088DCCA /* solid_phys.c in Sources */ = {isa = PBXBuildFile; fileRef = B593CBD80EC4A9DF0088DCCA /* solid_phys.c */; };
+               B593CBDB0EC4A9DF0088DCCA /* solid_phys.h in Headers */ = {isa = PBXBuildFile; fileRef = B593CBD90EC4A9DF0088DCCA /* solid_phys.h */; };
+               B593CBDC0EC4A9DF0088DCCA /* solid_phys.c in Sources */ = {isa = PBXBuildFile; fileRef = B593CBD80EC4A9DF0088DCCA /* solid_phys.c */; };
                B59445470C9641CB00EC3F09 /* neverball.icns in Resources */ = {isa = PBXBuildFile; fileRef = B47DDD3F0BCA1BF200915326 /* neverball.icns */; };
                B59445480C9641D000EC3F09 /* neverputt.icns in Resources */ = {isa = PBXBuildFile; fileRef = B47DDD410BCA1BF200915326 /* neverputt.icns */; };
                B5C4250A0DAAC39E00F6C398 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = B5C425020DAAC35800F6C398 /* InfoPlist.strings */; };
@@ -1520,6 +1523,8 @@
                B57D63CE0CAE8138005DE710 /* st_time_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = st_time_out.c; sourceTree = "<group>"; };
                B57D63CF0CAE8138005DE710 /* st_goal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = st_goal.h; sourceTree = "<group>"; };
                B57D63D00CAE8138005DE710 /* st_fall_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = st_fall_out.c; sourceTree = "<group>"; };
+               B593CBD80EC4A9DF0088DCCA /* solid_phys.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = solid_phys.c; sourceTree = "<group>"; };
+               B593CBD90EC4A9DF0088DCCA /* solid_phys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = solid_phys.h; sourceTree = "<group>"; };
                B5C425030DAAC35800F6C398 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
                B5C425040DAAC35800F6C398 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                B5C425070DAAC35800F6C398 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -1714,6 +1719,8 @@
                815FFB710AEA2E0300AFD07F /* share */ = {
                        isa = PBXGroup;
                        children = (
+                               B593CBD80EC4A9DF0088DCCA /* solid_phys.c */,
+                               B593CBD90EC4A9DF0088DCCA /* solid_phys.h */,
                                B507E3930E36565600178C13 /* syswm.c */,
                                B507E3940E36565600178C13 /* syswm.h */,
                                B5E6E8940DFF38D8005ADC5B /* item.c */,
@@ -3366,6 +3373,7 @@
                                B54EA8A10DAD0B6A0041B11D /* keynames.h in Headers */,
                                B5E6E8970DFF38D8005ADC5B /* item.h in Headers */,
                                B507E3960E36565600178C13 /* syswm.h in Headers */,
+                               B593CBDB0EC4A9DF0088DCCA /* solid_phys.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -3567,7 +3575,7 @@
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "# Build Neverball Installer and package to a dmg.\n# set -x # uncomment for debugging\nset -e # exit on error\n\nSVN_REVISION=`cd ${SRCROOT}/../.. && /usr/local/bin/svn info | grep Revision: | cut -d\\  -f2`\nSVN_REVISION=`echo ${SVN_REVISION} | sed -e 's/\\ //g'`\necho \"*** SVN REV : ${SVN_REVISION}\"\n\nVERSION=\"v1.5.0 r${SVN_REVISION}\"\n# VERSION=\"1.5.0\"\nNAME=\"Neverball $VERSION\"\n\nfor app in \"Neverball\" \"Neverputt\"\ndo\n  echo \"+ Cleaning $app\"\n  strip \"${BUILT_PRODUCTS_DIR}/${app}.app/Contents/MacOS/${app}\"\n  rm -fr \"${BUILT_PRODUCTS_DIR}/${app}.app/\"Contents/Frameworks/*.framework/Versions/*/Headers\n  rm -fr \"${BUILT_PRODUCTS_DIR}/${app}.app/\"Contents/Frameworks/*.framework/Headers\ndone\n\necho \"+ Cleaning data\"\nrm -f \"${BUILT_PRODUCTS_DIR}/data/.ok\"\nrm -f \"${BUILT_PRODUCTS_DIR}/data/.ok\"\n\necho \"Building installer and uninstaller...\"\n/Developer/usr/bin/packagemaker -d \"../uninstall.pmdoc\" -o \"${BUILT_PRODUCTS_DIR}/Uninstall Neverball.mpkg\" -i org.neverball.Uninstall.pkg\nsh ../modify_neverball_pkg_uninstaller.sh \"${BUILT_PRODUCTS_DIR}/Uninstall Neverball.mpkg\"\n/Developer/usr/bin/packagemaker -d \"../neverball.pmdoc\" -o \"${BUILT_PRODUCTS_DIR}/${NAME}.mpkg\"\nsh ../modify_neverball_pkg_installer.sh \"${BUILT_PRODUCTS_DIR}/${NAME}.mpkg\"\n\necho \"*** Building disk image...\"\n\nimage_rw=\"${BUILT_PRODUCTS_DIR}/${NAME}.sparseimage\"\nimage_ro=\"${BUILT_PRODUCTS_DIR}/${NAME}.dmg\"\n\nMOUNTPOINT=\"/Volumes/$NAME\"\ntest -e \"$MOUNTPOINT\" && {\n  echo \"$MOUNTPOINT already mounted. Please, detach it.\" 1>&2\n  exit 1\n}\n\nrm \"$image_rw\" 2>/dev/null || true\nhdiutil create -type SPARSE -fs HFS+ -volname \"$NAME\" \"$image_rw\"\nhdiutil attach \"$image_rw\"\n\ncp -R \"${BUILT_PRODUCTS_DIR}/${NAME}.mpkg\" \"${MOUNTPOINT}/${NAME}.mpkg\"\ncp -R \"${BUILT_PRODUCTS_DIR}/Uninstall Neverball.mpkg\" \"${MOUNTPOINT}/Uninstall Neverball.mpkg\"\n\n#echo \"+ Install disk icon\"\n#iconfile=\"icon.icns\"\n#cp \"$iconfile\" \"$mountpoint/.VolumeIcon.icns\"\n#/Developer/Tools/SetFile -a aVbstclinmedz \"$MOUNTPOINT/.VolumeIcon.icns\"\n\necho \"+ Install background dmg\"\ncp \"${SRCROOT}/../icons/dmg-background.jpg\" \"${MOUNTPOINT}/dmg-background.jpg\"\n\necho \"+ set the presentation\"\n# better to copy this in script editor for change...\nosascript - \"$MOUNTPOINT\" <<!\non run argv\n\tset dir to item 1 of argv\n\ttell application \"Finder\"\n\t\tset f to POSIX file dir as alias\n\t\topen f\n\n\t\tset w to container window of f\n\n\t\tset current view of w to icon view\n\t\tset toolbar visible of w to false\n\t\tset statusbar visible of w to false\n\t\tset opts to icon view options of w\n\t\tset bgfile to file \"dmg-background.jpg\" of folder f\n\t\t\n\t\t--\tset background color of opts to {50000, 50000, 50000}\n\t\tset background picture of opts to bgfile\n\t\tset icon size of opts to 70\n\t\tset text size of opts to 12\n\t\tset label position of opts to bottom\n\t\tset arrangement of opts to not arranged\n\t\tset position of item \"${NAME}.mpkg\" of f to {94, 245}\n#\t\tset position of item \"data\" of f to {220, 245}\n#\t\tset position of item \"docs\" of f to {220, 145}\n\t\tset position of item \"Uninstall Neverball.mpkg\" of f to {352, 245}\n\t\tset the bounds of w to {100, 100, 560, 430}\n\t\tdelay 5\n\tend tell\nend run\n!\n\nsetfile -a V \"${MOUNTPOINT}/dmg-background.jpg\"\n\necho \"+ Detaching '$NAME' image\"\nhdiutil detach \"$MOUNTPOINT\"\n\n#open \"$image_rw\"\n\necho \"+ Compressing disk image\"\nrm \"$image_ro\" 2>/dev/null || true\nhdiutil convert \"$image_rw\" -imagekey zlib-level=9 -format UDZO -o \"$image_ro\"\n\nrm \"$image_rw\"\n\n# open the result in Finder\nopen \"$image_ro\"\n";
+                       shellScript = "# Build Neverball Installer and package to a dmg.\n# set -x # uncomment for debugging\nset -e # exit on error\n\nSVN_REVISION=`cd ${SRCROOT}/../.. && /usr/local/bin/svn info | grep Revision: | cut -d\\  -f2`\nSVN_REVISION=`echo ${SVN_REVISION} | sed -e 's/\\ //g'`\necho \"*** SVN REV : ${SVN_REVISION}\"\n\nVERSION=\"v1.5.0 r${SVN_REVISION}\"\n# VERSION=\"1.5.0\"\nNAME=\"Neverball $VERSION\"\n\nfor app in \"Neverball\" \"Neverputt\"\ndo\n  echo \"+ Cleaning $app\"\n  strip \"${BUILT_PRODUCTS_DIR}/${app}.app/Contents/MacOS/${app}\"\n  rm -fr \"${BUILT_PRODUCTS_DIR}/${app}.app/\"Contents/Frameworks/*.framework/Versions/*/Headers\n  rm -fr \"${BUILT_PRODUCTS_DIR}/${app}.app/\"Contents/Frameworks/*.framework/Headers\ndone\n\necho \"+ Cleaning data\"\nrm -f \"${BUILT_PRODUCTS_DIR}/data/.ok\"\nrm -f \"${BUILT_PRODUCTS_DIR}/data/.ok\"\n\necho \"Building installer and uninstaller...\"\n/Developer/usr/bin/packagemaker -d \"../uninstall.pmdoc\" -o \"${BUILT_PRODUCTS_DIR}/Uninstall Neverball.mpkg\" -i org.neverball.Uninstall.pkg\nsh ../modify_neverball_pkg_uninstaller.sh \"${BUILT_PRODUCTS_DIR}/Uninstall Neverball.mpkg\"\n/Developer/usr/bin/packagemaker -d \"../neverball.pmdoc\" -o \"${BUILT_PRODUCTS_DIR}/${NAME}.mpkg\"\nsh ../modify_neverball_pkg_installer.sh \"${BUILT_PRODUCTS_DIR}/${NAME}.mpkg\"\n\necho \"*** Building disk image...\"\n\nimage_rw=\"${BUILT_PRODUCTS_DIR}/${NAME}.sparseimage\"\nimage_ro=\"${BUILT_PRODUCTS_DIR}/${NAME}.dmg\"\n\nMOUNTPOINT=\"/Volumes/$NAME\"\ntest -e \"$MOUNTPOINT\" && {\n  echo \"$MOUNTPOINT already mounted. Please, detach it.\" 1>&2\n  exit 1\n}\n\nrm \"$image_rw\" 2>/dev/null || true\nhdiutil create -type SPARSE -fs HFS+ -volname \"$NAME\" \"$image_rw\"\nhdiutil attach \"$image_rw\"\n\ncp -R \"${BUILT_PRODUCTS_DIR}/${NAME}.mpkg\" \"${MOUNTPOINT}/${NAME}.mpkg\"\ncp -R \"${BUILT_PRODUCTS_DIR}/Uninstall Neverball.mpkg\" \"${MOUNTPOINT}/Uninstall Neverball.mpkg\"\n\n#echo \"+ Install disk icon\"\n#iconfile=\"icon.icns\"\n#cp \"$iconfile\" \"$mountpoint/.VolumeIcon.icns\"\n#/Developer/Tools/SetFile -a aVbstclinmedz \"$MOUNTPOINT/.VolumeIcon.icns\"\n\necho \"+ Install background dmg\"\ncp \"${SRCROOT}/../icons/dmg-background.png\" \"${MOUNTPOINT}/dmg-background.png\"\n\necho \"+ set the presentation\"\n# better to copy this in script editor for change...\nosascript - \"$MOUNTPOINT\" <<!\non run argv\n\tset dir to item 1 of argv\n\ttell application \"Finder\"\n\t\tset f to POSIX file dir as alias\n\t\topen f\n\n\t\tset w to container window of f\n\n\t\tset current view of w to icon view\n\t\tset toolbar visible of w to false\n\t\tset statusbar visible of w to false\n\t\tset opts to icon view options of w\n\t\tset bgfile to file \"dmg-background.png\" of folder f\n\t\t\n\t\t--\tset background color of opts to {50000, 50000, 50000}\n\t\tset background picture of opts to bgfile\n\t\tset icon size of opts to 96\n\t\tset text size of opts to 12\n\t\tset label position of opts to bottom\n\t\tset arrangement of opts to not arranged\n\t\tset position of item \"${NAME}.mpkg\" of f to {64 + 48, 214 + 40}\n\t\tset position of item \"Uninstall Neverball.mpkg\" of f to {224 + 48, 214 + 40}\n\t\tset label index of file \"${NAME}.mpkg\" of folder f to 7\n\t\tset label index of file \"Uninstall Neverball.mpkg\" of folder f to 7\n\t\tset the bounds of w to {100, 100, 484, 604}\n\t\tdelay 5\n\tend tell\nend run\n!\n\nsetfile -a V \"${MOUNTPOINT}/dmg-background.png\"\n\necho \"+ Detaching '$NAME' image\"\nhdiutil detach \"$MOUNTPOINT\"\n\n#open \"$image_rw\"\n\necho \"+ Compressing disk image\"\nrm \"$image_ro\" 2>/dev/null || true\nhdiutil convert \"$image_rw\" -imagekey zlib-level=9 -format UDZO -o \"$image_ro\"\n\nrm \"$image_rw\"\n\n# open the result in Finder\nopen \"$image_ro\"\n";
                };
 /* End PBXShellScriptBuildPhase section */
 
@@ -3608,6 +3616,7 @@
                                B54EA8A20DAD0B6A0041B11D /* keynames.c in Sources */,
                                B5E6E8980DFF38D8005ADC5B /* item.c in Sources */,
                                B507E3970E36565600178C13 /* syswm.c in Sources */,
+                               B593CBDC0EC4A9DF0088DCCA /* solid_phys.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -3679,6 +3688,7 @@
                                B54EA8A00DAD0B6A0041B11D /* keynames.c in Sources */,
                                B5E6E8960DFF38D8005ADC5B /* item.c in Sources */,
                                B507E3950E36565600178C13 /* syswm.c in Sources */,
+                               B593CBDA0EC4A9DF0088DCCA /* solid_phys.c in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };