From eca0d817b7973d678d31608870bea86a141442ab Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 10 Mar 2011 19:03:23 +0000 Subject: Replace the INSTALL file with a template version that is customized to different platforms. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2299 --- pkg/osx/GNUmakefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkg/osx/GNUmakefile') diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index baaec048..f6fa24ff 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -67,6 +67,10 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" + $(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__ \ + < $(TOPLEVEL)/man/INSTALL.template \ + > $(STAGING_DIR)/INSTALL + find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true clean : launcher_clean -- cgit v1.2.3 From d4e56754210c2b449c3d7a8dc3eb9886d89ff593 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Thu, 10 Mar 2011 19:47:14 +0000 Subject: Include Unix manpages in MacOS package, and set MANPATH to point to them when opening a terminal window. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2302 --- pkg/osx/GNUmakefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pkg/osx/GNUmakefile') diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index f6fa24ff..f9bb6417 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -73,6 +73,10 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true + mkdir -p "$(APP_BIN_DIR)/man/man5" "$(APP_BIN_DIR)/man/man6" + cp $(TOPLEVEL)/man/*.5 "$(APP_BIN_DIR)/man/man5" + cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6" + clean : launcher_clean rm -f $(DMG) rm -rf $(STAGING_DIR) -- cgit v1.2.3 From 1fd0ad08ed4840e681e902bc1b9420a1d41619b4 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 7 May 2011 23:52:26 +0000 Subject: Rework OS X launcher package. Include documentation files within the application bundle and add a help menu with links. Rework .dmg generation to generate a file with a "fancy" background image and overall nicer appearance. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2332 --- pkg/osx/GNUmakefile | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) (limited to 'pkg/osx/GNUmakefile') diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index f9bb6417..514a208d 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -20,9 +20,17 @@ ifndef GNUSTEP_MAKEFILES # DMG file containing package: -$(DMG) : $(STAGING_DIR) +$(DMG) : tmp.dmg rm -f $@ - hdiutil create -volname "$(PACKAGE_STRING)" -srcdir $(STAGING_DIR) $@ + ./dmgfix "$(realpath tmp.dmg)" "$(PACKAGE_STRING)" "$(PACKAGE_NAME).app" + hdiutil convert -format UDZO -o $@ tmp.dmg + rm -f tmp.dmg + +tmp.dmg : $(STAGING_DIR) + rm -f $@ + hdiutil makehybrid -hfs -hfs-volume-name "$(PACKAGE_STRING)" \ + -hfs-openfolder $(STAGING_DIR) $(STAGING_DIR) \ + -o tmp.dmg endif @@ -46,12 +54,13 @@ APP_BIN_DIR=$(APP_DIR)/Contents/MacOS SRC_INFO_PLIST=Info.plist endif +APP_DOC_DIR=$(APP_BIN_DIR)/Documentation +APP_DOC_RELDIR=$(patsubst $(STAGING_DIR)/%,%,$(APP_DOC_DIR)) + $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) rm -rf $(STAGING_DIR) mkdir $(STAGING_DIR) - cp $(TOPLEVEL_DOCS) "$(STAGING_DIR)" - mkdir -p "$(APP_TOP_DIR)" cp -R Resources "$(APP_TOP_DIR)" cp PkgInfo "$(APP_TOP_DIR)" @@ -59,6 +68,13 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) mkdir -p "$(APP_BIN_DIR)" + mkdir -p "$(APP_DOC_DIR)" + cp $(TOPLEVEL_DOCS) "$(APP_DOC_DIR)" + + ln -s "$(APP_DOC_RELDIR)/COPYING" "$(STAGING_DIR)/Software License" + ln -s "$(APP_DOC_RELDIR)/README" "$(STAGING_DIR)/README" + ln -s /Applications "$(STAGING_DIR)" + cp launcher "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/launcher" @@ -69,13 +85,16 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) $(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__ \ < $(TOPLEVEL)/man/INSTALL.template \ - > $(STAGING_DIR)/INSTALL + > "$(APP_DOC_DIR)/INSTALL" find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true mkdir -p "$(APP_BIN_DIR)/man/man5" "$(APP_BIN_DIR)/man/man6" cp $(TOPLEVEL)/man/*.5 "$(APP_BIN_DIR)/man/man5" cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6" + cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store + cp disk/background.png $(STAGING_DIR)/background.png +# setfile -a V $(STAGING_DIR)/background.png clean : launcher_clean rm -f $(DMG) -- cgit v1.2.3 From 184ea9ba501adf04b9b352760774fde268c0cc7f Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 14 May 2011 20:11:26 +0000 Subject: Convert build system to using the PROGRAM_PREFIX system used on raven-branch. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 2336 --- pkg/osx/GNUmakefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkg/osx/GNUmakefile') diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index 514a208d..d53a9981 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -78,10 +78,10 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) cp launcher "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/launcher" - ./cp-with-libs $(TOPLEVEL)/src/$(PACKAGE_TARNAME) "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/$(PACKAGE_TARNAME)" - ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom" + ./cp-with-libs $(TOPLEVEL)/setup/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup" $(TOPLEVEL)/man/simplecpp -DPRECOMPILED -D__MACOSX__ \ < $(TOPLEVEL)/man/INSTALL.template \ @@ -94,7 +94,6 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6" cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store cp disk/background.png $(STAGING_DIR)/background.png -# setfile -a V $(STAGING_DIR)/background.png clean : launcher_clean rm -f $(DMG) -- cgit v1.2.3