diff options
| author | Simon Howard | 2010-01-15 18:13:05 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-01-15 18:13:05 +0000 |
| commit | f176ac404ad709e6c1254f8685f8d9fe7b995115 (patch) | |
| tree | f5f06371e67c1b141ee9ffb2c2f6e13bbcfc6a72 /pkg/osx/GNUmakefile | |
| parent | df6a794052bc5c5f28ca15eca7d924ae29002d85 (diff) | |
| download | chocolate-doom-f176ac404ad709e6c1254f8685f8d9fe7b995115.tar.gz chocolate-doom-f176ac404ad709e6c1254f8685f8d9fe7b995115.tar.bz2 chocolate-doom-f176ac404ad709e6c1254f8685f8d9fe7b995115.zip | |
Extend osx makefile to allow building of a working GNUstep application,
for testing purposes. Add GNUstep version of Info.plist, remove
app-skeleton directory and move contents up.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1813
Diffstat (limited to 'pkg/osx/GNUmakefile')
| -rw-r--r-- | pkg/osx/GNUmakefile | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index de2c535a..d1894bef 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -1,4 +1,9 @@ +# Makefile for building the OS X launcher program and DMG package. +# It is also possible to build and run the launcher under Unix +# systems using GNUstep, although this is only here for development +# and debugging purposes. + include ../config.make STAGING_DIR=staging @@ -20,17 +25,37 @@ endif # Staging dir build for package: APP_DIR=$(STAGING_DIR)/$(PACKAGE_NAME).app -APP_BIN_DIR=$(APP_DIR)/Contents/MacOS/ + +# OS X and GNUstep apps have a slightly different internal structure: +# OS X apps have their files within a containing "Contents" directory +# that does not exist in GNUstep apps. Similarly, the binaries are +# installed at the top level, rather than in a "MacOS" directory. +# Finally, we must install a different Info.plist file. + +ifdef GNUSTEP_MAKEFILES +APP_TOP_DIR=$(APP_DIR) +APP_BIN_DIR=$(APP_DIR) +SRC_INFO_PLIST=Info-GNUstep.plist +else +APP_TOP_DIR=$(APP_DIR)/Contents +APP_BIN_DIR=$(APP_DIR)/Contents/MacOS +SRC_INFO_PLIST=Info.plist +endif $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) rm -rf $(STAGING_DIR) mkdir $(STAGING_DIR) - cp -R app-skeleton "$(APP_DIR)" - mkdir "$(APP_BIN_DIR)" - cp Info.plist "$(APP_DIR)/Contents/" + cp $(TOPLEVEL_DOCS) "$(STAGING_DIR)" + + mkdir -p "$(APP_TOP_DIR)" + cp -R Resources "$(APP_TOP_DIR)" + cp PkgInfo "$(APP_TOP_DIR)" + cp $(SRC_INFO_PLIST) "$(APP_TOP_DIR)/Info.plist" + + mkdir -p "$(APP_BIN_DIR)" - cp launcher "$(APP_BIN_DIR)/" + cp launcher "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/launcher" ./cp-with-libs $(TOPLEVEL)/src/$(PACKAGE_TARNAME) "$(APP_BIN_DIR)" @@ -38,8 +63,6 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" - cp $(TOPLEVEL_DOCS) "$(STAGING_DIR)" - find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true clean : launcher_clean |