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
+default::
+ @$(MAKE_SUBDIR)
all::
@$(MAKE_SUBDIR)
install:
'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 ; \
| 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
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; \
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." ; \
rm $$T
rpm::
- @ \
- VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][0-9]*\).*/\1/p' utils/version.h` ; \
- cp -p xscreensaver-$$VERS.tar.gz /usr/src/redhat/SOURCES/ ; \
- rpm -ba xscreensaver.spec
+ @ \
+ 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/ ; \
+ rm -rf $$DIR ; \
+ mkdir $$DIR ; \
+ ( cd $$DIR; mkdir BUILD RPMS RPMS/$$ARCH SOURCES SPECS SRPMS ) ; \
+ cp -p $${ADIR}xscreensaver-$$VERS.tar.gz $$DIR/SOURCES/ ; \
+ rpm --define "_topdir $$DIR" \
+ --define "USE_GL yes" \
+ -v -ba xscreensaver.spec ; \
+ echo '' ; \
+ echo 'RPM build complete' ; \
+ echo '' ; \
+ rm -f $$DIR/xscreensaver-$$VERS.tar.gz ; \
+ 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 ; \
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 . ; \
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 --without-xpm --with-motif=/usr/local/motif ; \
+ ../../configure --without-xpm --without-xdbe --without-xshm \
+ --with-motif=/usr/local/motif ; \
echo --------------------------------------------------------------- ; \
- gmake ; \
- ( cd driver; gmake xscreensaver-demo-Xaw ) ; \
+ gmake all ; \
+ ( cd driver; gmake tests ) ; \
echo --------------------------------------------------------------- ); \
\
( 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 ) ; \
- ( cd driver; gmake ) ; \
- ( cd driver; gmake xscreensaver-demo-Xaw ) ; \
+ ( cd utils; gmake all ) ; \
+ ( cd driver; gmake all ) ; \
echo --------------------------------------------------------------- ); \
\
chmod -R u+w .
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 ; \
- if [ -f $$DEST/$$NAME ]; then \
- echo -n "WARNING: $$DEST/$$NAME already exists! Overwrite? "; \
+ chmod a-w $$NAME ; \
+ 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.$$$$ ; \
else \
set -x ; \
fi ; \
- cvs add -kb $$NAME ; \
+ cvs add -kb $$BNAME ; \
cat $$TMP > download.html ; \
rm -f $$TMP ; \
\
projects / xscreensaver / blobdiff