X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile.in;h=aa66e317492dfcfc247935ea30a2393d52b3e18c;hb=a94197e76a5dea5cb60542840809d6c20d0abbf3;hp=00a5d99d389b004972cd77624be251c89281547b;hpb=df7adbee81405e2849728a24b498ad2117784b1f;p=xscreensaver diff --git a/Makefile.in b/Makefile.in index 00a5d99d..aa66e317 100644 --- a/Makefile.in +++ b/Makefile.in @@ -13,10 +13,6 @@ TARFILES = README README.VMS README.debugging INSTALL xscreensaver.lsm \ config.sub makevms.com screenblank.txt \ xscreensaver.lsm.sh xscreensaver.spec TAR = tar -COMPRESS = gzip --verbose --best -COMPRESS_EXT = gz -# COMPRESS = compress -# COMPRESS_EXT = Z MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done @@ -67,6 +63,7 @@ tar: 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/xscreensaver-\1/p' utils/version.h` ; \ rm -rf $$NAME ; ln -s . $$NAME ; \ FILES= ; \ + ADIR=archive/ ; \ for subdir in $(SUBDIRS) ; do \ d=`pwd` ; \ cd $$subdir ; \ @@ -75,10 +72,9 @@ tar: | sed \"s|^|$$subdir/|g;s| | $$subdir/|g\" \ ` "; \ cd $$d ; done ; \ - echo creating tar file $${NAME}.tar.$(COMPRESS_EXT)... ; \ - $(TAR) -vchf - \ - `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` \ - | $(COMPRESS) > $${NAME}.tar.$(COMPRESS_EXT) ; \ + echo creating tar file $$ADIR$$NAME.tar.gz... ; \ + GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz \ + `echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ; \ rm $$NAME @@ -131,12 +127,13 @@ bump-version:: 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."; \ + D=`date '+%d-%b-%Y'`; \ + ADIR=archive/ ; \ + if [ ! -f $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz ]; then \ + echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$MINOR.tar.gz does not exist.";\ fi ; \ - if [ -f xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then \ - echo "WARNING: xscreensaver-$$MAJOR.$$NEW.tar.gz already exists."; \ + if [ -f $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then \ + echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz already exists.";\ fi ; \ echo -n "Bumping $$MAJOR.$$MINOR to $$MAJOR.$$NEW ($$D), ok? "; \ read line; \ @@ -161,7 +158,7 @@ update_spec_version:: V=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ; \ echo -n "Updating version number in $$S to \"$$V\"... " ; \ T=/tmp/xs.$$$$ ; \ - sed "s/^\(Version:[^0-9]*\)\(.*\)/\1$$V/" \ + sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V/" \ < $$S > $$T ; \ if cmp -s $$S $$T ; then \ echo "unchanged." ; \ @@ -172,23 +169,41 @@ update_spec_version:: rm $$T rpm:: - @ \ - VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \ - DIR=/usr/src/redhat ; \ - cp -p xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ; \ - rpm -ba xscreensaver.spec ; \ - rm -f $$DIR/xscreensaver-$$VERS.tar.gz ; \ - rm -rf $$DIR/BUILD/xscreensaver-$$VERS ; \ - mv $$DIR/RPMS/i386/xscreensaver-$$VERS-*.rpm . ; \ - mv $$DIR/SRPMS/xscreensaver-$$VERS-*.rpm . ; \ - echo '' ; \ - ls -lFG xscreensaver-$$VERS-*.rpm + @ \ + VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \ + DIR=`pwd`/rpm_build ; \ + ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ; \ + ADIR=archive/ ; \ + TGZ=xscreensaver-$$VERS.tar.gz ; \ + if [ ! -f $${ADIR}$$TGZ ]; then \ + echo "$${ADIR}$$TGZ does not exist! Did you forget to \`make tar'?" ; \ + exit 1 ; \ + fi ; \ + rm -rf /var/tmp/xscreensaver-$$VERS-root ; \ + rm -rf $$DIR ; \ + mkdir $$DIR ; \ + ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ; \ + cp -p $${ADIR}$$TGZ $$DIR/SOURCES/ ; \ + rpm --define "_topdir $$DIR" \ + --define "USE_GL yes" \ + -v -ba xscreensaver.spec ; \ + echo '' ; \ + echo 'RPM build complete' ; \ + echo '' ; \ + rm -f $$DIR/$$TGZ ; \ + rm -rf $$DIR/BUILD/xscreensaver-$$VERS ; \ + mv $$DIR/SRPMS/xscreensaver*-$$VERS-*.rpm . ; \ + mv $$DIR/RPMS/$$ARCH/xscreensaver*-$$VERS-*.rpm . ; \ + rm -rf $$DIR ; \ + echo '' ; \ + ls -lFG xscreensaver*-$$VERS-*.rpm 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" ; \ + ADIR=archive/ ; \ + NAME="$${ADIR}$$D.tar.gz" ; \ if [ ! -f $$NAME ]; then \ echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \ exit 1 ; \ @@ -201,7 +216,7 @@ test-tar:: chmod -R u+w $$D ; \ fi ; \ rm -rf $$D ; \ - zcat $$D.tar.gz | tar -xf - ; \ + zcat $${ADIR}$$D.tar.gz | tar -xf - ; \ cd $$D ; \ chmod -R a-w . ; \ chmod u+w . ; \ @@ -223,7 +238,7 @@ test-tar:: ( cd BIN/lesstif ; \ CC=cc ; \ export CC ; \ - ../../configure --with-motif=/usr/local/lesstif ; \ + ../../configure --with-motif=/usr/local/lesstif --without-gnome ; \ echo --------------------------------------------------------------- ; \ ( cd utils; gmake all ) ; \ ( cd driver; gmake all ) ; \ @@ -237,22 +252,25 @@ www:: DEST=$$HOME/www/xscreensaver ; \ VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \ HEAD="xscreensaver-$$VERS" ; \ - NAME="$$HEAD.tar.gz" ; \ + ADIR=archive/ ; \ + BNAME="$$HEAD.tar.gz" ; \ + NAME="$$ADIR$$BNAME" ; \ + DNAME="$$DEST/$$HEAD.tar.gz" ; \ \ if [ ! -f $$NAME ]; then \ echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \ exit 1 ; \ fi ; \ chmod a-w $$NAME ; \ - if [ -f $$DEST/$$NAME ]; then \ - echo -n "WARNING: $$DEST/$$NAME already exists! Overwrite? "; \ + if [ -f $$DNAME ]; then \ + echo -n "WARNING: $$DNAME already exists! Overwrite? "; \ read line; \ if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \ exit 1 ; \ fi ; \ fi ; \ - cp -p $$NAME $$DEST/$$NAME ; \ - chmod u+w $$DEST/$$NAME ; \ + cp -p $$NAME $$DNAME ; \ + chmod u+w $$DNAME ; \ cd $$DEST ; \ \ TMP=/tmp/xd.$$$$ ; \ @@ -271,7 +289,7 @@ www:: else \ set -x ; \ fi ; \ - cvs add -kb $$NAME ; \ + cvs add -kb $$BNAME ; \ cat $$TMP > download.html ; \ rm -f $$TMP ; \ \