From 1e2c97167c88409228df6155285551ececf3ffaf Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Wed, 6 Jan 2010 09:34:45 -0600 Subject: [PATCH] Building the Mac OS X build now includes the demos folder in the disk image (but the demos folder is not in the repo, you need to put it in the base folder if it's not already there) --- .hgignore | 2 +- changes.txt | 5 +++-- platform/macosx/dmg/DS_Store | Bin 12292 -> 15364 bytes .../macosx/love.xcodeproj/project.pbxproj | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.hgignore b/.hgignore index e9d6f34ce..5869abae8 100644 --- a/.hgignore +++ b/.hgignore @@ -21,4 +21,4 @@ glob:platform/macosx/love.xcodeproj/bill* glob:*.DS_Store glob:*.dylib glob:*.dmg* - +glob:demos diff --git a/changes.txt b/changes.txt index 750862994..35653436e 100644 --- a/changes.txt +++ b/changes.txt @@ -3,8 +3,9 @@ LOVE 0.6.1 * Added Shape:setGroupIndex and getGroupIndex. * Added Body:setFixedRotation and Body:getFixedRotation. - * Added icons and file associations for the debs. - * It's now possible to run a .love from Resources in Mac OSX, thanks to Steve Johnson. + * Added icons and file associations for the debs. + * Added the demos folder to the Mac OS X DMG. + * It's now possible to run a .love from Resources in Mac OS X, thanks to Steve Johnson. * Fixed a bug with multiple Sources on the same Music. * Fixed a bug so the mouse doesn't get crippled when the keyboard is disabled. * The error screen redraws when an event occurs. diff --git a/platform/macosx/dmg/DS_Store b/platform/macosx/dmg/DS_Store index 2be05cafaefe5a92f931f4427613eaf19d5cc48a..e9df1d6f0e0682788955df597b94c1730eac1b26 100644 GIT binary patch delta 1129 zcmdT@&rcIU7@chgXr;B=ZYhXWij4wFpfrV$Kte4cf+1TFv;{{%OgeQ)Ob-ZyW)%&gyB zUupsXP=PGh1AvQA0~s39reelX>}sW$&Cs@mVpJ1-y%5jI>9~O7B)$<(3%sm&JiC-m z4{K`c3`V2DG&{+Q9L@!BR^;TF@B+?-c@D){X|Bu_R>{f%Rw_qAtg=8NWgfv;Abhr( zJ;`&*LX2)&S@HS$I$d6GU%u0|(mUw!bh>=r-h5u$jDBipIM+2e8ev!ScMEI86Zt5r zg1}tGL%65T(9a81_wd=F`+eGSMuS$E0eyCDJV52&f^$uyUn9qFs<-dl%q(J2~M+;#EMB2Se_Hu zI1++l04oYk4aaCpSxn9pl8`1W7Y?V{1TQAt{!pb|?xF7$613_*XpH=I0KoD4(UD@N z5$-J3eo_alS8J(eLig2&){FGc;!Houv}!kq@FDe$wLn|CqgcqMklZ~UeE%RiqDE~# z{lV9E^|8%wfD_{pBHvX%+WH+t(nsVJuxoKL+VlsX*Hkz2y5RO-&^!QeWQ*1vQMaG2 z1`mmW1`!d9$Y^x?rzb(9J)WLda zh7Q;Q+hGU11U;|^wt6c?bca`~rCPKKaA4~jy{B)h0USUe1u&4u1e~b86XK2%Nai~- z%%u|VS9k2~wPbR#RNBm})>!qGGOl`pBig&$%>2}=7UzVWbXJe8(l`-j delta 116 zcmZpvXi1P@U|?W$DortDU;r^WfEYvza8E20o2aMAD6lbLH$S7mWFCRg$x4D#Hz$c* zVV;~IrONgn3^o=DF$*#SH2{GGH;`}z>D^fPoq009N+1U##6*V8@jPpoH!Em-;0FL9 C!W-%U diff --git a/platform/macosx/love.xcodeproj/project.pbxproj b/platform/macosx/love.xcodeproj/project.pbxproj index 24328bb79..45691007f 100644 --- a/platform/macosx/love.xcodeproj/project.pbxproj +++ b/platform/macosx/love.xcodeproj/project.pbxproj @@ -1477,7 +1477,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# borrowed (with love) from banshee\nVOLUME_NAME=\"LÖVE\"\nDMG_APP=build/Release/love.app\nDMG_FILE=\"love.dmg\"\nMOUNT_POINT=\"love.mounted\"\n\nrm -f $DMG_FILE\nrm -f $DMG_FILE.master\n\n# Compute an approximated image size in MB, and bloat by 1MB\nimage_size=$(du -ck $DMG_APP dmg | tail -n1 | cut -f1)\nimage_size=$((($image_size + 1000) / 1000))\n\necho \"Creating disk image (${image_size}MB)...\"\nhdiutil create -megabytes $image_size -volname \"${VOLUME_NAME}\" -fs HFS+ \"${DMG_FILE}\" || exit $?\n\necho \"Attaching to disk image...\"\nhdiutil attach $DMG_FILE -readwrite -noautoopen -mountpoint $MOUNT_POINT -quiet\n\necho \"Populating image...\"\n\ncp -RP $DMG_APP $MOUNT_POINT\n\ncp dmg/VolumeIcon.icns $MOUNT_POINT/.VolumeIcon.icns\n/Developer/Tools/SetFile -a C $MOUNT_POINT\n\ncp dmg/backgroundImage.tiff $MOUNT_POINT\n/Developer/Tools/SetFile -a V $MOUNT_POINT/backgroundImage.tiff\ncp dmg/DS_Store $MOUNT_POINT/.DS_Store\n\necho \"Detaching from disk image...\"\nhdiutil detach $MOUNT_POINT -quiet\n\nmv $DMG_FILE $DMG_FILE.master\n\necho \"Creating distributable image...\"\nhdiutil convert -quiet -format UDBZ -o $DMG_FILE $DMG_FILE.master\n\n#echo \"Installing end user license agreement...\"\n#hdiutil flatten -quiet $DMG_FILE\n#/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r dmg-data/license.r -a -o $DMG_FILE\n#hdiutil unflatten -quiet $DMG_FILE\n\necho \"Done.\""; + shellScript = "# borrowed (with love) from banshee\nVOLUME_NAME=\"LÖVE\"\nDMG_APP=build/Release/love.app\nDMG_FILE=\"love.dmg\"\nDEMO_FOLDER=../../demos\nMOUNT_POINT=\"love.mounted\"\n\nrm -f $DMG_FILE\nrm -f $DMG_FILE.master\n\n# Compute an approximated image size in MB, and bloat by 1MB\nimage_size=$(du -ck $DMG_APP dmg $DEMO_FOLDER | tail -n1 | cut -f1)\nimage_size=$((($image_size + 1000) / 1000))\n\necho \"Creating disk image (${image_size}MB)...\"\nhdiutil create -megabytes $image_size -volname \"${VOLUME_NAME}\" -fs HFS+ \"${DMG_FILE}\" || exit $?\n\necho \"Attaching to disk image...\"\nhdiutil attach $DMG_FILE -readwrite -noautoopen -mountpoint $MOUNT_POINT -quiet\n\necho \"Populating image...\"\n\ncp -RP $DMG_APP $MOUNT_POINT\ncp -RP $DEMO_FOLDER $MOUNT_POINT\n\ncp dmg/VolumeIcon.icns $MOUNT_POINT/.VolumeIcon.icns\n/Developer/Tools/SetFile -a C $MOUNT_POINT\n\ncp dmg/backgroundImage.tiff $MOUNT_POINT\n/Developer/Tools/SetFile -a V $MOUNT_POINT/backgroundImage.tiff\ncp dmg/DS_Store $MOUNT_POINT/.DS_Store\n\necho \"Detaching from disk image...\"\nhdiutil detach $MOUNT_POINT -quiet\n\nmv $DMG_FILE $DMG_FILE.master\n\necho \"Creating distributable image...\"\nhdiutil convert -quiet -format UDBZ -o $DMG_FILE $DMG_FILE.master\n\n#echo \"Installing end user license agreement...\"\n#hdiutil flatten -quiet $DMG_FILE\n#/Developer/Tools/Rez /Developer/Headers/FlatCarbon/*.r dmg-data/license.r -a -o $DMG_FILE\n#hdiutil unflatten -quiet $DMG_FILE\n\necho \"Done.\""; }; /* End PBXShellScriptBuildPhase section */