X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=266f4db116cba152237e967ed11f0da07a04a9de;hb=3210e7e80ee2b5a7d2049a5aaff9f17b9c93dcc9;hp=2127292bc0c7d0a1a7acfbaeed2015dd0543fc2e;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4;p=xscreensaver

diff --git a/Makefile.in b/Makefile.in
index 2127292b..266f4db1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,7 @@ tar:
   mv xscreensaver.lsm.$$$$ xscreensaver.lsm ;				    \
   NAME=`sed -n								    \
   's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ;  \
-  rm -f $$NAME ; ln -s . $$NAME ;					    \
+  rm -rf $$NAME ; ln -s . $$NAME ;					    \
   FILES= ;								    \
   for subdir in $(SUBDIRS) ; do						    \
     d=`pwd` ;								    \
@@ -127,6 +127,7 @@ bump-version::
   set - $$VERS ;							    \
   MAJOR="$$1"; MINOR="$$2";						    \
   NEW=`echo $$MINOR + 1 | bc` ;						    \
+  NEW=`echo $$NEW | sed 's/^\([0-9]\)$$/0\1/'` ;			    \
   D=`date '+%d-%b-%y'`;							    \
   if [ ! -f xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then			    \
     echo "WARNING: xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";    \
@@ -151,18 +152,78 @@ bump-version::
   echo "overwrote $$SRC"; 						    \
   ls -lFd $$SRC
 
+test-tar::
+	@								    \
+  VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
+  D=xscreensaver-$$VERS ;						    \
+  NAME="$$D.tar.gz" ;							    \
+  if [ ! -f $$NAME ]; then						    \
+    echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;	    \
+    exit 1 ; 								    \
+  fi ;									    \
+									    \
+  set -e ;								    \
+  set -x ;								    \
+									    \
+  if [ -d $$D ]; then							    \
+   chmod -R u+w $$D ;							    \
+  fi ;									    \
+  rm -rf $$D ;								    \
+  zcat $$D.tar.gz | tar -xf - ;						    \
+  cd $$D ;								    \
+  chmod -R a-w . ;							    \
+  chmod u+w . ;								    \
+  mkdir BIN ;								    \
+  mkdir BIN/athena ;							    \
+  mkdir BIN/motif ;							    \
+  mkdir BIN/lesstif ;							    \
+  chmod a-w . ;								    \
+									    \
+  ( cd BIN/athena ;							    \
+    CC=cc ;								    \
+    export CC ;								    \
+    ../../configure --with-athena ;					    \
+    echo --------------------------------------------------------------- ;  \
+    gmake ;								    \
+    echo --------------------------------------------------------------- ); \
+									    \
+  ( cd BIN/motif ;							    \
+    CC=cc ;								    \
+    export CC ;								    \
+    ../../configure --with-motif=/usr/local/motif ;			    \
+    echo --------------------------------------------------------------- ;  \
+    ( cd utils; gmake ) ;						    \
+    ( cd driver; gmake ) ;						    \
+    ( cd driver; gmake xscreensaver-demo-Xaw ) ;			    \
+    echo --------------------------------------------------------------- ); \
+									    \
+  ( cd BIN/lesstif ;							    \
+    CC=cc ;								    \
+    export CC ;								    \
+    ../../configure --with-motif=/usr/local/lesstif ;			    \
+    echo --------------------------------------------------------------- ;  \
+    ( cd utils; gmake ) ;						    \
+    ( cd driver; gmake ) ;						    \
+    ( cd driver; gmake xscreensaver-demo-Xaw ) ;			    \
+    echo --------------------------------------------------------------- ); \
+									    \
+  chmod -R u+w .
+
+
 www::
 	@								    \
   DEST=$$HOME/www/xscreensaver ;					    \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ;  \
-  NAME="xscreensaver-$$VERS.tar.gz" ;					    \
+  HEAD="xscreensaver-$$VERS" ;						    \
+  NAME="$$HEAD.tar.gz" ;						    \
+									    \
   if [ ! -f $$NAME ]; then						    \
     echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;	    \
     exit 1 ; 								    \
   fi ;									    \
   if [ -f $$DEST/$$NAME ]; then						    \
     echo -n "WARNING: $$DEST/$$NAME already exists!  Overwrite? ";	    \
-    read line;							    \
+    read line;								    \
     if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then		    \
       exit 1 ; 								    \
     fi ;								    \
@@ -172,10 +233,9 @@ www::
   cd $$DEST ;								    \
 									    \
   TMP=/tmp/xd.$$$$ ;							    \
-  sed "s/xscreensaver-[0-9]\.[0-9][0-9]\.tar\.gz/$$NAME/g" index.html	    \
-    > $$TMP ;								    \
+  sed "s/xscreensaver-[0-9]\.[0-9][0-9]*/$$HEAD/g" download.html > $$TMP ;  \
   echo '' ;								    \
-  diff -u0 index.html $$TMP ;						    \
+  diff -u0 download.html $$TMP ;					    \
   echo '' ;								    \
 									    \
   OLDEST=`ls xscreensaver*.tar.gz | head -1` ;				    \
@@ -189,6 +249,17 @@ www::
     set -x ;								    \
   fi ;									    \
   cvs add -kb $$NAME ;							    \
-  cat $$TMP > index.html ;						    \
+  cat $$TMP > download.html ;						    \
   rm -f $$TMP ;								    \
+									    \
+  (cd ..; $(MAKE) xscreensaver/changelog.html );			    \
+  cvs diff -u0 changelog.html ;						    \
+  set +x ;								    \
+									    \
+  echo -n "Ok? ";							    \
+  read line;								    \
+  if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then			    \
+    exit 1 ;								    \
+  fi ;									    \
+									    \
   cvs commit -m "$$VERS"