X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FMakefile;h=1a222c711ecfa58772a7a91c055b51fe040aa1a8;hp=f57fcb1cb4092f68eae32d41f146a84a438188be;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/OSX/Makefile b/OSX/Makefile
index f57fcb1c..1a222c71 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -17,12 +17,40 @@ distclean:
 
 distdepend:: update_plist_version
 
-debug:
+debug: distdepend
 	cd ..; xcodebuild -target $(XCODE_TARGET) -configuration Debug   build
 
-release:
+release:: distdepend
 	cd ..; xcodebuild -target $(XCODE_TARGET) -configuration Release build
 
+release:: check_versions
+
+release:: sign
+
+sign:
+	codesign -vfs 'Jamie Zawinski' build/Release/*.saver
+
+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 ; do						\
+   for P in $$S/Contents/Info.plist ; do				\
+     V2=`perl -0000 -n -e						\
+	'm@<key>CFBundleVersion</key>\s*<string>(.*?)</string>@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 . \
 	  \( \( -name '.??*' -o -name build -o -name CVS -o -name '*~*' \
@@ -38,7 +66,7 @@ update_plist_version:
   V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ;		      \
   T=/tmp/xs.$$$$ ;							      \
   for S in XScreenSaver.plist SaverTester.plist ; do			      \
-    echo -n "Updating version number in $$S to \"$$V\"... " ;		      \
+    /bin/echo -n "Updating version number in $$S to \"$$V\"... " ;	      \
     KEYS="CFBundleVersion|CFBundleShortVersionString" ;			      \
     perl -0777 -pne							      \
       "s@(<key>($$KEYS)</key>\s*<string>)[^<>]+(</string>)@\$${1}$$V\$${3}@g" \
@@ -53,7 +81,7 @@ 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 ;						      \