projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.17.tar.gz
[xscreensaver]
/
OSX
/
Makefile
diff --git
a/OSX/Makefile
b/OSX/Makefile
index c1ad1fb7c995163f778f7745c6f057278525fb00..63a5aba5b15c3b5c3b172a95d43aa38062f8d274 100644
(file)
--- 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
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 \
distclean:
-rm -f config.status config.cache config.log \
@@
-18,18
+22,18
@@
distclean:
distdepend:: update_plist_version
debug: distdepend
distdepend:: update_plist_version
debug: distdepend
- cd ..;
xcodebuild -target $(XCODE_TARGET
) -configuration Debug build
+ cd ..;
$(XCODEBUILD) $(ARCH) $(TARGETS
) -configuration Debug build
release:: distdepend
release:: distdepend
- cd ..;
xcodebuild -target $(XCODE_TARGET
) -configuration Release build
+ cd ..;
$(XCODEBUILD) $(ARCH) $(TARGETS
) -configuration Release build
release:: check_versions
release:: sign
sign:
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:
done
check_versions:
@@
-38,7
+42,7
@@
check_versions:
V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' $$SRC` ; \
DIR=build/Release ; \
RESULT=0 ; \
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@<key>CFBundleVersion</key>\s*<string>(.*?)</string>@si \
for P in $$S/Contents/Info.plist ; do \
V2=`perl -0000 -n -e \
'm@<key>CFBundleVersion</key>\s*<string>(.*?)</string>@si \
@@
-67,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.$$$$ ; \
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 Saver
Tester.plist ; do
\
+ for S in XScreenSaver.plist Saver
Runner.plist iSaverRunner.plist ; do
\
/bin/echo -n "Updating version number in $$S to \"$$V\"... " ; \
KEYS="CFBundleVersion|CFBundleShortVersionString" ; \
perl -0777 -pne \
/bin/echo -n "Updating version number in $$S to \"$$V\"... " ; \
KEYS="CFBundleVersion|CFBundleShortVersionString" ; \
perl -0777 -pne \
@@
-90,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" ; \
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" ; \
BASE="xscreensaver-$$V" ; \
OUTDIR="../archive" ; \
DMG="$$OUTDIR/$$BASE.dmg" ; \
@@
-103,10
+108,13
@@
dmg:: distdepend check_versions
\
retired=`perl -0 -ne \
's/\\\\\\n//g; m/^RETIRED_EXES\s*=\s*(.*)$$/m && print "$$1\n"' \
\
retired=`perl -0 -ne \
's/\\\\\\n//g; m/^RETIRED_EXES\s*=\s*(.*)$$/m && print "$$1\n"' \
- ../hacks/Makefile.in \
- ../hacks/glx/Makefile.in` ; \
+ ../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 ; 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 \
ok=yes ; \
ff=`echo $$f | perl -e '$$_=<>; s@^.*/(.*)\..*$$@\L$$1@; print'`; \
for r in $$retired ; do \
@@
-125,6
+133,7
@@
dmg:: distdepend check_versions
cp -p XScreenSaverDMG.icns "$$STAGE/.VolumeIcon.icns" ; \
/Developer/Tools/SetFile -a C "$$STAGE" ; \
/Developer/Tools/SetFile -a E "$$STAGE/ READ ME.rtf" ; \
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" ; \
hdiutil makehybrid -quiet -ov -hfs -hfs-volume-name "$$VOLNAME" \
-hfs-openfolder "$$STAGE" "$$STAGE" -o "$$TMPDMG" ; \
rm -rf "$$STAGE" ; \