X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FMakefile;h=63a5aba5b15c3b5c3b172a95d43aa38062f8d274;hb=c70f94f648d51bb4828193124f325fa52b0e57f3;hp=1a222c711ecfa58772a7a91c055b51fe040aa1a8;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;p=xscreensaver
diff --git a/OSX/Makefile b/OSX/Makefile
index 1a222c71..63a5aba5 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -1,13 +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 = /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 \
@@ -18,17 +22,19 @@ 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:
- codesign -vfs 'Jamie Zawinski' build/Release/*.saver
+ @for f in build/Release/*.{saver,app} ; do \
+ codesign -vfs $(CERT) $$f ; \
+ done
check_versions:
@\
@@ -36,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 \
@@ -65,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 \
@@ -88,6 +94,7 @@ dmg:: distdepend check_versions
V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \
TMPDIR="build" ; \
SRC="build/Release" ; \
+ EXTRAS=../../xdaliclock/OSX/build/Release/*.saver ; \
BASE="xscreensaver-$$V" ; \
OUTDIR="../archive" ; \
DMG="$$OUTDIR/$$BASE.dmg" ; \
@@ -98,14 +105,35 @@ dmg:: distdepend check_versions
rm -rf "$$STAGE" ; \
echo + mkdir "$$STAGE" ; \
mkdir "$$STAGE" ; \
- echo + cp -pr "$$SRC/"\*.saver "$$STAGE" ; \
- cp -pr "$$SRC/"*.saver "$$STAGE" ; \
+ \
+ retired=`perl -0 -ne \
+ 's/\\\\\\n//g; m/^RETIRED_EXES\s*=\s*(.*)$$/m && print "$$1\n"' \
+ ../hacks/Makefile.in ; \
+ perl -0 -ne \
+ 's/\\\\\\n//g; m/^RETIRED_GL_EXES\s*=\s*(.*)$$/m && print "$$1\n"' \
+ ../hacks/glx/Makefile.in ; \
+ echo xscreensaver` ; \
+ \
+ for f in $$SRC/*.{saver,app} $$EXTRAS ; do \
+ ok=yes ; \
+ ff=`echo $$f | perl -e '$$_=<>; s@^.*/(.*)\..*$$@\L$$1@; print'`; \
+ for r in $$retired ; do \
+ if [ "$$ff" = "$$r" ]; then ok=no ; fi ; \
+ done ; \
+ if [ "$$ok" = yes ]; then \
+ echo + cp -pr "$$f" "$$STAGE/" ; \
+ cp -pr "$$f" "$$STAGE/" ; \
+ else \
+ echo skipping "$$f" ; \
+ fi ; \
+ done ; \
set -x ; \
cp -p bindist.rtf "$$STAGE/ READ ME.rtf" ; \
cp -p bindist-DS_Store "$$STAGE/.DS_Store" ; \
cp -p XScreenSaverDMG.icns "$$STAGE/.VolumeIcon.icns" ; \
/Developer/Tools/SetFile -a C "$$STAGE" ; \
/Developer/Tools/SetFile -a E "$$STAGE/ READ ME.rtf" ; \
+ seticon -d ../../xdaliclock/OSX/daliclockSaver.icns $$STAGE/DaliClock.saver;\
hdiutil makehybrid -quiet -ov -hfs -hfs-volume-name "$$VOLNAME" \
-hfs-openfolder "$$STAGE" "$$STAGE" -o "$$TMPDMG" ; \
rm -rf "$$STAGE" ; \