X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FMakefile;h=63a5aba5b15c3b5c3b172a95d43aa38062f8d274;hb=c70f94f648d51bb4828193124f325fa52b0e57f3;hp=0d8160498ca3e23292a3717f88db6bf3ad25a327;hpb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;p=xscreensaver
diff --git a/OSX/Makefile b/OSX/Makefile
index 0d816049..63a5aba5 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -1,14 +1,17 @@
-# XScreenSaver for MacOS X, Copyright (c) 2006 by Jamie Zawinski.
+# XScreenSaver for MacOS X, Copyright (c) 2006-2011 by Jamie Zawinski.
-XCODE_TARGET = "All Savers"
-XCODEBUILD=xcodebuild
+XCODEBUILD = /Developer/usr/bin/xcodebuild
+TARGETS = -target "All Savers"
+ARCH = -arch i386 -arch x86_64
+CERT = 'Jamie Zawinski'
+CERT = 'iPhone Developer: Jamie Zawinski (Y5M82TL69N)'
default: release
all: debug release
clean:
-rm -rf build
-# cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) clean
+# cd ..; $(XCODEBUILD) -target $(TARGETS) clean
distclean:
-rm -f config.status config.cache config.log \
@@ -19,18 +22,18 @@ distclean:
distdepend:: update_plist_version
debug: distdepend
- cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Debug build
+ cd ..; $(XCODEBUILD) $(ARCH) $(TARGETS) -configuration Debug build
release:: distdepend
- cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Release build
+ cd ..; $(XCODEBUILD) $(ARCH) $(TARGETS) -configuration Release build
release:: check_versions
release:: sign
sign:
- @for f in build/Release/*.saver ; do \
- codesign -vfs 'Jamie Zawinski' $$f ; \
+ @for f in build/Release/*.{saver,app} ; do \
+ codesign -vfs $(CERT) $$f ; \
done
check_versions:
@@ -39,7 +42,7 @@ check_versions:
V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \
DIR=build/Release ; \
RESULT=0 ; \
- for S in $$DIR/*.saver ; do \
+ for S in $$DIR/*.{saver,app} ; do \
for P in $$S/Contents/Info.plist ; do \
V2=`perl -0000 -n -e \
'm@CFBundleVersion\s*(.*?)@si \
@@ -68,7 +71,7 @@ update_plist_version:
SRC=../utils/version.h ; \
V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \
T=/tmp/xs.$$$$ ; \
- for S in XScreenSaver.plist SaverTester.plist ; do \
+ for S in XScreenSaver.plist SaverRunner.plist iSaverRunner.plist ; do \
/bin/echo -n "Updating version number in $$S to \"$$V\"... " ; \
KEYS="CFBundleVersion|CFBundleShortVersionString" ; \
perl -0777 -pne \
@@ -108,9 +111,10 @@ dmg:: distdepend check_versions
../hacks/Makefile.in ; \
perl -0 -ne \
's/\\\\\\n//g; m/^RETIRED_GL_EXES\s*=\s*(.*)$$/m && print "$$1\n"' \
- ../hacks/glx/Makefile.in` ; \
+ ../hacks/glx/Makefile.in ; \
+ echo xscreensaver` ; \
\
- for f in $$SRC/*.saver $$EXTRAS ; do \
+ for f in $$SRC/*.{saver,app} $$EXTRAS ; do \
ok=yes ; \
ff=`echo $$f | perl -e '$$_=<>; s@^.*/(.*)\..*$$@\L$$1@; print'`; \
for r in $$retired ; do \