X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=OSX%2FMakefile;h=a4dff53c5f88313bfddf43d7acb84ce5a2d09a70;hp=b2354dfae06aa02bd678650327890dcfb45a85c1;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=ff35d056d723c9a5ffe728dbba5f1c25e141be04
diff --git a/OSX/Makefile b/OSX/Makefile
index b2354dfa..a4dff53c 100644
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -1,4 +1,4 @@
-# XScreenSaver for MacOS X, Copyright (c) 2006-2012 by Jamie Zawinski.
+# XScreenSaver for MacOS X, Copyright (c) 2006-2013 by Jamie Zawinski.
XCODEBUILD = /usr/bin/xcodebuild
TARGETS = -target "All Savers"
@@ -6,20 +6,24 @@ ARCH = -arch i386 -arch x86_64
CERT = 'Jamie Zawinski'
CERT = 'iPhone Developer: Jamie Zawinski (Y5M82TL69N)'
THUMBDIR = $(HOME)/www/xscreensaver/screenshots/
+PKGID = org.jwz.xscreensaver
+SETFILE = /Applications/Xcode.app/Contents/Developer/Tools/SetFile
+SETICON = /usr/local/bin/seticon
default: release
all: debug release
clean:
-rm -rf build
-# cd ..; $(XCODEBUILD) -target $(TARGETS) clean
+# cd ..; $(XCODEBUILD) $(TARGETS) clean
distclean:
-rm -f config.status config.cache config.log \
*.bak *.rej TAGS *~ "#"*
-rm -rf autom4te*.cache
- -rm -rf build
+ -rm -rf build Sparkle.framework
+distdepend:: Sparkle.framework
distdepend:: update_plist_version
debug: distdepend
@@ -32,9 +36,13 @@ release:: check_versions
release:: update_thumbs
release:: sign
+Sparkle.framework:
+ unzip ../archive/Sparkle.framework-2013-12-04.zip
+
sign:
- @for f in build/Release/*.{saver,app} ; do \
- codesign -vfs $(CERT) $$f ; \
+ @for f in build/Release/*.app/Contents/*/*.saver \
+ build/Release/*.{saver,app} ; do \
+ codesign --deep -vfs $(CERT) $$f ; \
done
check_versions:
@@ -45,9 +53,10 @@ check_versions:
RESULT=0 ; \
for S in $$DIR/*.{saver,app} ; do \
for P in $$S/Contents/Info.plist ; do \
- V2=`perl -0000 -n -e \
+ V2=`plutil -convert xml1 -o - "$$P" | \
+ perl -0000 -n -e \
'm@CFBundleVersion\s*(.*?)@si \
- && print $$1' < $$P` ; \
+ && print $$1'` ; \
if [ "$$V2" != "$$V" ] ; then \
echo "Wrong version: $$S ($$V2)" ; \
RESULT=1 ; \
@@ -62,16 +71,16 @@ update_thumbs::
# Arrrrgh
-ios_function_tables.h::
- @./build-fntable.pl build/Debug-iphoneos/XScreenSaver.app $@
+ios-function-table.m::
+ @./build-fntable.pl build/Debug-iphonesimulator/XScreenSaver.app $@
echo_tarfiles:
@echo `find . \
\( \( -name '.??*' -o -name build -o -name CVS -o -name '*~*' \
- -o -name 'jwz.*' \) \
+ -o -name 'jwz.*' -o -name 'Screen Savers' \) \
-prune \) \
- -o -type f -print \
+ -o \( -type f -o -type l \) -print \
| sed 's@^\./@@' \
| sort`
@@ -80,9 +89,9 @@ 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 SaverRunner.plist iSaverRunner.plist ; do \
+ for S in *.plist ; do \
/bin/echo -n "Updating version number in $$S to \"$$V\"... " ; \
- KEYS="CFBundleVersion|CFBundleShortVersionString" ; \
+ KEYS="CFBundleVersion|CFBundleShortVersionString|CFBundleLongVersionString|CFBundleGetInfoString|NSHumanReadableCopyright" ; \
perl -0777 -pne \
"s@(($$KEYS)\s*)[^<>]+()@\$${1}$$V\$${3}@g" \
< $$S > $$T ; \
@@ -96,8 +105,68 @@ update_plist_version:
rm $$T
+updates.xml::
+ ./updates.pl xscreensaver ../README ../archive ~/www/xscreensaver
+ @$(MAKE) test_sig
+
+test_sig::
+ @ \
+ U=../version.h ; \
+ V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ;]*\).*/\1/p' < $$U` ; \
+ V=`echo $$V | sed 's/\.//g'` ; \
+ ZIP="../archive/DaliClock-$$V.dmg" ; \
+ SIG=`sed -n 's/^.*dsaSignature="\(.*\)".*/\1/p' updates.xml` ; \
+ PUB="sparkle_dsa_pub.pem" ; \
+ NN="t.$$$$" ; \
+ SIGB=/tmp/$$NN.sig ; \
+ HASH=/tmp/$$NN.hash ; \
+ rm -f "$$SIGB" "$$HASH" ; \
+ echo "$$SIG " | base64 -D > "$$SIGB" ; \
+ set -e ; \
+ for OPENSSL in /usr/bin/openssl /opt/local/bin/openssl ; do \
+ $$OPENSSL dgst -sha1 -binary < "$$ZIP" > "$$HASH" ; \
+ /bin/echo -n "$$OPENSSL `$$OPENSSL version`: " ; \
+ $$OPENSSL dgst -dss1 -verify "$$PUB" -signature "$$SIGB" "$$HASH" ; \
+ done ; \
+ rm -f "$$SIGB" "$$HASH" ; \
+
+
+build/Release/installer.pkg: installer.rtf installer.xml installer.sh installer.png ../utils/version.h
+ @\
+ set -e ; \
+ SRC=../utils/version.h ; \
+ V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \
+ \
+ DIST="installer.xml" ; \
+ STAGE="build/Release/pkg_stage" ; \
+ PKG1="$@" ; \
+ PKG2="$$STAGE/contents.pkg" ; \
+ SCRIPTS="$$STAGE/scripts" ; \
+ RES="$$STAGE/resources" ; \
+ \
+ set -x ; \
+ rm -rf "$$STAGE" ; \
+ mkdir -p "$$SCRIPTS" "$$RES" ; \
+ \
+ cp -p installer.sh "$$SCRIPTS/preinstall" ; \
+ cp -p installer.png "$$RES/background.png" ; \
+ cp -p installer.rtf "$$RES/welcome.rtf" ; \
+ \
+ pkgbuild --identifier "$(PKGID)" --version "$$V" \
+ --scripts "$$SCRIPTS" --nopayload "$$PKG2" ; \
+ codesign -vfs $(CERT) "$$PKG2" ; \
+ codesign -vd "$$PKG2" ; \
+ \
+ productbuild --distribution "$$DIST" --resources "$$RES" \
+ --package-path "$$STAGE" --version "$$V" "$$PKG1" ; \
+ codesign -vfs $(CERT) "$$PKG1" ; \
+ codesign -vd "$$PKG1" ; \
+ \
+ rm -rf "$$STAGE" ; \
+
+
# -format UDBZ saves 4% (~1.2 MB) over UDZO.
-dmg:: distdepend check_versions
+dmg:: distdepend check_versions build/Release/installer.pkg
@ \
set -e ; \
SRC=../utils/version.h ; \
@@ -111,10 +180,12 @@ dmg:: distdepend check_versions
TMPDMG="$$TMPDIR/tmp.dmg" ; \
VOLNAME="XScreenSaver $$V" ; \
STAGE="$$TMPDIR/dmg_stage" ; \
+ DST="$$STAGE/Screen Savers" ; \
+ PKG="$$STAGE/Install Everything.pkg" ; \
rm -f "$$DMG" ; \
rm -rf "$$STAGE" ; \
- echo + mkdir "$$STAGE" ; \
- mkdir "$$STAGE" ; \
+ echo + mkdir -p "$$DST" ; \
+ mkdir -p "$$DST" ; \
\
retired=`perl -0 -ne \
's/\\\\\\n//g; m/^RETIRED_EXES\s*=\s*(.*)$$/m && print "$$1\n"' \
@@ -132,28 +203,30 @@ dmg:: distdepend check_versions
if [ "$$ff" = "$$r" ]; then ok=no ; fi ; \
done ; \
if [ "$$ok" = yes ]; then \
- echo + cp -pr "$$f" "$$STAGE/" ; \
- cp -pr "$$f" "$$STAGE/" ; \
+ echo + cp -pR "$$f" "$$DST/" ; \
+ cp -pR "$$f" "$$DST/" ; \
else \
echo skipping "$$f" ; \
fi ; \
done ; \
set -x ; \
- cp -p bindist.rtf "$$STAGE/ READ ME.rtf" ; \
+ cp -p bindist.rtf "$$STAGE/Read Me.rtf" ; \
+ cp -p build/Release/installer.pkg "$$PKG" ; \
cp -p bindist-DS_Store "$$STAGE/.DS_Store" ; \
+ cp -p bindist.webloc "$$STAGE/Get the iPhone:iPad Version.webloc" ; \
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;\
+ ${SETFILE} -a C "$$STAGE" ; \
+ ${SETFILE} -a E "$$STAGE"/*.{rtf,pkg,webloc} ; \
+ $(SETICON) -d ../../xdaliclock/OSX/daliclockSaver.icns \
+ "$$DST/DaliClock.saver" ; \
+ $(SETICON) -d XScreenSaverFolder.icns "$$DST" ; \
+ $(SETICON) -d XScreenSaverWebloc.icns "$$STAGE"/*.webloc ; \
+ $(SETICON) -d XScreenSaverPkg.icns "$$STAGE"/*.pkg ; \
hdiutil makehybrid -quiet -ov -hfs -hfs-volume-name "$$VOLNAME" \
-hfs-openfolder "$$STAGE" "$$STAGE" -o "$$TMPDMG" ; \
rm -rf "$$STAGE" ; \
hdiutil convert -quiet -ov -format UDBZ -imagekey zlib-level=9 \
"$$TMPDMG" -o "$$DMG" ; \
+ xattr -w com.apple.quarantine "0000;00000000;;" "$$DMG" ; \
rm -f "$$TMPDMG" ; \
ls -ldhgF "$$DMG"
-
-# Adding this is cute:
-# hdiutil internet-enable -yes -quiet "$$DMG"
-# but means that nobody will ever see the display settings I used!
-# When finder copies the .dmg to a folder, it doesn't preserve them.