X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=OSX%2FMakefile;h=3f7886b6cb241336a335e2bbbc2dbcc879e6e264;hb=ec8d2b32b63649e6d32bdfb306eda062769af823;hp=3f847f0575569c768540f2571f68b6ad11064adc;hpb=488f2fa8fbdbc77e91a70da2962d73af49e6cace;p=xscreensaver
diff --git a/OSX/Makefile b/OSX/Makefile
index 3f847f05..3f7886b6 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -1,13 +1,14 @@
-# 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
default: release
all: debug release
clean:
-rm -rf build
-# cd ..; xcodebuild -target $(XCODE_TARGET) clean
+# cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) clean
distclean:
-rm -f config.status config.cache config.log \
@@ -17,16 +18,41 @@ distclean:
distdepend:: update_plist_version
-debug:
- cd ..; xcodebuild -target $(XCODE_TARGET) -configuration Debug build
+debug: distdepend
+ cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -configuration Debug build
-release::
- cd ..; xcodebuild -target $(XCODE_TARGET) -configuration Release build
+release:: distdepend
+ cd ..; $(XCODEBUILD) -target $(XCODE_TARGET) -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 'Jamie Zawinski' $$f ; \
+ done
+
+check_versions:
+ @\
+ SRC=../utils/version.h ; \
+ V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \
+ DIR=build/Release ; \
+ RESULT=0 ; \
+ for S in $$DIR/*.{saver,app} ; do \
+ for P in $$S/Contents/Info.plist ; do \
+ V2=`perl -0000 -n -e \
+ 'm@CFBundleVersion\s*(.*?)@si \
+ && print $$1' < $$P` ; \
+ if [ "$$V2" != "$$V" ] ; then \
+ echo "Wrong version: $$S ($$V2)" ; \
+ RESULT=1 ; \
+ fi ; \
+ done ; \
+ done ; \
+ if [ "$$RESULT" = 0 ]; then echo "Versions match ($$V2)" ; fi ; \
+ exit $$RESULT
+
echo_tarfiles:
@echo `find . \
@@ -42,7 +68,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 ; do \
/bin/echo -n "Updating version number in $$S to \"$$V\"... " ; \
KEYS="CFBundleVersion|CFBundleShortVersionString" ; \
perl -0777 -pne \
@@ -58,13 +84,14 @@ update_plist_version:
rm $$T
# -format UDBZ saves 4% (~1.2 MB) over UDZO.
-dmg::
+dmg:: distdepend check_versions
@ \
set -e ; \
SRC=../utils/version.h ; \
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" ; \
@@ -75,14 +102,35 @@ dmg::
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 savertester` ; \
+ \
+ 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" ; \