http://www.jwz.org/xscreensaver/xscreensaver-5.12.tar.gz

[xscreensaver] / OSX / Makefile

diff --git a/OSX/Makefile b/OSX/Makefile
index 2ff5fe1bcbac8538301ff029a0bd9a5bd39e6ebc..2353dc160094a7d347f8a5ffadb4dc6b40e2615c 100644 (file)
--- a/OSX/Makefile
+++ b/OSX/Makefile
@@ -90,6 +90,7 @@ dmg:: distdepend check_versions
   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" ;                                                \
@@ -100,14 +101,34 @@ dmg:: distdepend check_versions
   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` ;                                            \
+                                                                             \
+  for f in $$SRC/*.saver $$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" ;                                                         \