summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorjeremiah sypult <jeremiah@sypult.com>2013-07-18 00:11:10 -0500
committerTim Angus <tim@ngus.net>2014-06-17 17:43:33 +0100
commit0a53ae4da1c4dc05d5ed74867a0a80ed0a76076f (patch)
tree450fca5d6aa21a6ea5eb80b4fdd8a5557ea54b4a /Makefile
parent4f4d474f1241df152663e6330b999ac03e67f675 (diff)
bug 5986 - Configure jenkins to spit out mac .app https://bugzilla.icculus.org/show_bug.cgi?id=5986 Created make-macosx-app.sh to handle manually creating an app bundle from other scripts. Updated make-macosx.sh to create bundle with make-macosx-app.sh (TODO: make-macosx-ub.sh support). Updated Makefile to create bundle with make-macosx-app.sh and zip up the resulting ioquake3.app if ARCHIVE is defined.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 15 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dfe9c4b3..fe444b37 100644
--- a/Makefile
+++ b/Makefile
@@ -1154,6 +1154,9 @@ endif
NAKED_TARGETS=$(shell echo $(TARGETS) | sed -e "s!$(B)/!!g")
+MACOSX_TARGET_STRING=$(shell if [ "$(B)" == "$(BR)" ]; then echo "release"; elif [ "$(B)" == "$(BD)" ]; then echo "debug"; fi)
+MACOSX_MAKE_APP=@if [ -x "./make-macosx-app.sh" ]; then "./make-macosx-app.sh" $(MACOSX_TARGET_STRING) $(ARCH); fi
+
print_list=@for i in $(1); \
do \
echo " $$i"; \
@@ -1208,9 +1211,18 @@ ifneq ($(TARGETS),)
endif
$(B).zip: $(TARGETS)
-ifdef ARCHIVE
- rm -f $@
- (cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS))
+ifeq ($(PLATFORM),darwin)
+ ifdef ARCHIVE
+ $(call MACOSX_MAKE_APP)
+ @rm -f $@
+ @(if [ -d "$(B)/tremulous.app" ]; then cd $(B) && zip --symlinks -r9 ../../$@ `find "tremulous.app" -print | sed -e "s!$(B)/!!g"`; fi)
+ endif
+endif
+ifneq ($(PLATFORM),darwin)
+ ifdef ARCHIVE
+ @rm -f $@
+ @(cd $(B) && zip -r9 ../../$@ $(NAKED_TARGETS))
+ endif
endif
makedirs: