# XCODE_APP = /Applications/Xcode-5.0.2.app
TARGETS = All Savers
-ARCH = -arch i386 -arch x86_64 ONLY_ACTIVE_ARCH=NO
+#ARCH = -arch i386 -arch x86_64 ONLY_ACTIVE_ARCH=NO
CERT = 'Developer ID Installer: Jamie Zawinski (4627ATJELP)'
PKGID = org.jwz.xscreensaver
THUMBDIR = build/screenshots
# update-info-plist.pl runs this as needed.
# Might be better to do this with curl, since that is installed by default.
-URL = https://www.jwz.org/xscreensaver/screenshots/
+BASE = xscreensaver/screenshots/
+URL = https://www.jwz.org/$(BASE)
WGET = wget -q -U xscreensaver-build-osx
CVT = -thumbnail '200x150^' -gravity center -extent 200x150 \
\( +clone -alpha extract \
if [ ! -d $(THUMBDIR) ]; then mkdir -p $(THUMBDIR) ; fi ; \
rm -f "$$FILE2" "$$TMP" ; \
set +e ; \
- echo "downloading $$URL..." ; \
- $(WGET) -O"$$TMP" "$$URL" ; \
- if [ ! -s "$$TMP" ]; then \
- echo "downloading $$URL2..." ; \
- $(WGET) -O"$$TMP" "$$URL2" ; \
- fi ; \
- if [ ! -s "$$TMP" ]; then \
- rm -f "$$TMP" ; \
- echo "failed: $$URL" ; \
- exit 1 ; \
+ if [ -f "$$HOME/www/$(BASE)/$$FILE1" ]; then \
+ cp -p "$$HOME/www/$(BASE)/$$FILE1" "$$TMP" ; \
+ else \
+ echo "downloading $$URL..." ; \
+ $(WGET) -O"$$TMP" "$$URL" ; \
+ if [ ! -s "$$TMP" ]; then \
+ echo "downloading $$URL2..." ; \
+ $(WGET) -O"$$TMP" "$$URL2" ; \
+ fi ; \
+ if [ ! -s "$$TMP" ]; then \
+ rm -f "$$TMP" ; \
+ echo "failed: $$URL" ; \
+ exit 1 ; \
+ fi ; \
fi ; \
rm -f "$$FILE2" ; \
convert jpg:- $(CVT) "$$FILE2" < "$$TMP" ; \
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/" ; \
+ cp -p bindist*.webloc "$$STAGE/" ; \
cp -p XScreenSaverDMG.icns "$$STAGE/.VolumeIcon.icns" ; \
${SETFILE} -a C "$$STAGE" ; \
${SETFILE} -a E "$$STAGE"/*.{rtf,pkg,webloc} ; \
$(SETICON) -d XScreenSaverFolder.icns "$$DST" ; \
$(SETICON) -d XScreenSaver.icns "$$DST"/*.saver ; \
$(SETICON) -d SaverRunner.icns "$$DST"/*.app ; \
- $(SETICON) -d XScreenSaverWebloc.icns "$$STAGE"/*.webloc ; \
+ $(SETICON) -d XScreenSaverWebloc.icns "$$STAGE"/bindist.webloc ; \
+ $(SETICON) -d XScreenSaverAndroidWebloc.icns "$$STAGE"/bindist2.webloc ; \
$(SETICON) -d XScreenSaverPkg.icns "$$STAGE"/*.pkg ; \
- mv "$$STAGE/bindist.webloc" "$$STAGE/Get the iPhone:iPad Version.webloc" ; \
+ mv "$$STAGE/bindist.webloc" "$$STAGE/Get the iPhone:iPad Version.webloc" ; \
+ mv "$$STAGE/bindist2.webloc" "$$STAGE/Get the Android Version.webloc" ; \
\
set +x ; \
echo "Checking signatures..." ; \