浏览代码

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)

Bill Meltsner 16 年之前
父节点
当前提交
1e2c97167c
共有 4 个文件被更改,包括 5 次插入4 次删除
  1. 1 1
      .hgignore
  2. 3 2
      changes.txt
  3. 二进制
      platform/macosx/dmg/DS_Store
  4. 1 1
      platform/macosx/love.xcodeproj/project.pbxproj

+ 1 - 1
.hgignore

@@ -21,4 +21,4 @@ glob:platform/macosx/love.xcodeproj/bill*
 glob:*.DS_Store
 glob:*.DS_Store
 glob:*.dylib
 glob:*.dylib
 glob:*.dmg*
 glob:*.dmg*
-
+glob:demos

+ 3 - 2
changes.txt

@@ -3,8 +3,9 @@ LOVE 0.6.1
 
 
   * Added Shape:setGroupIndex and getGroupIndex.
   * Added Shape:setGroupIndex and getGroupIndex.
   * Added Body:setFixedRotation and Body:getFixedRotation.
   * 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 with multiple Sources on the same Music.
   * Fixed a bug so the mouse doesn't get crippled when the keyboard is disabled.
   * Fixed a bug so the mouse doesn't get crippled when the keyboard is disabled.
   * The error screen redraws when an event occurs.
   * The error screen redraws when an event occurs.

二进制
platform/macosx/dmg/DS_Store


+ 1 - 1
platform/macosx/love.xcodeproj/project.pbxproj

@@ -1477,7 +1477,7 @@
 			);
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			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 */
 /* End PBXShellScriptBuildPhase section */