projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.34.tar.gz
[xscreensaver]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index f6f2efb57659ed5f86f3c872f704aafa6ad0e2f6..bd6dd28b7892b24658030dfc50cef4beb1172aff 100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-1,4
+1,4
@@
-# Makefile.in --- xscreensaver, Copyright (c) 1999 Jamie Zawinski.
+# Makefile.in --- xscreensaver, Copyright (c) 1999
-2014
Jamie Zawinski.
# the `../configure' script generates `Makefile' from this file.
@SET_MAKE@
# the `../configure' script generates `Makefile' from this file.
@SET_MAKE@
@@
-6,17
+6,20
@@
srcdir = @srcdir@
VPATH = @srcdir@
SHELL = /bin/sh
VPATH = @srcdir@
SHELL = /bin/sh
-SUBDIRS = utils driver hacks hacks/glx po
-TARFILES = README README.VMS README.debugging INSTALL xscreensaver.lsm \
+SUBDIRS = utils driver hacks hacks/glx po
+SUBDIRS2 = $(SUBDIRS) OSX android
+TARFILES = README README.hacking README.VMS INSTALL \
configure configure.in Makefile.in config.h.in \
config.h-vms install-sh setup.com config.guess aclocal.m4 \
configure configure.in Makefile.in config.h.in \
config.h-vms install-sh setup.com config.guess aclocal.m4 \
- config.sub makevms.com \
+
ax_pthread.m4
config.sub makevms.com \
intltool-merge.in intltool-extract.in intltool-update.in \
intltool-merge.in intltool-extract.in intltool-update.in \
- xscreensaver.lsm.sh xscreensaver.spec \
+ xscreensaver.spec \
+ OSX/xscreensaver.xcodeproj/project.pbxproj
TAR = tar
TAR = tar
-MAKE_SUBDIR = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
+MAKE_SUBDIR = for dir in $(SUBDIRS); do $(MAKE) -C $$dir $@ || exit 5; done
+MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do $(MAKE) -C $$dir $@ || exit 5; done
default::
@$(MAKE_SUBDIR)
default::
@$(MAKE_SUBDIR)
@@
-40,15
+43,19
@@
depend::
@$(MAKE_SUBDIR)
distdepend::
@$(MAKE) update_spec_version
@$(MAKE_SUBDIR)
distdepend::
@$(MAKE) update_spec_version
- @$(MAKE_SUBDIR)
+ @$(MAKE_SUBDIR2)
+ @$(MAKE) -C po update-po
+
TAGS:: tags
tags::
@$(MAKE_SUBDIR)
TAGS:: tags
tags::
@$(MAKE_SUBDIR)
+
clean::
clean::
- @$(MAKE_SUBDIR)
+ @$(MAKE_SUBDIR2)
+
distclean:: clean
-rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* intltool-extract intltool-merge intltool-update
distclean:: clean
-rm -f config.h Makefile config.status config.cache config.log TAGS *~ "#"* intltool-extract intltool-merge intltool-update
- @$(MAKE_SUBDIR)
+ @$(MAKE_SUBDIR
2
)
dist:: tar
dist:: tar
@@
-58,16
+65,13
@@
tar::
sh config.status ; \
rm -f configure ; \
$(MAKE) configure ; \
sh config.status ; \
rm -f configure ; \
$(MAKE) configure ; \
- $(MAKE) distdepend ; \
- sh xscreensaver.lsm.sh > xscreensaver.lsm.$$$$ ; \
- mv xscreensaver.lsm.$$$$ xscreensaver.lsm ; \
- NAME=`sed -n \
- 's/[^0-9]*\([0-9]\.[0-9][0-9]*b\?[0-9]*\).*/xscreensaver-\1/p' \
- utils/version.h` ; \
+ $(MAKE) version-date distdepend ; \
+ VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ; \
+ NAME="xscreensaver-$$VERS" ; \
rm -rf $$NAME ; ln -s . $$NAME ; \
FILES= ; \
ADIR=archive/ ; \
rm -rf $$NAME ; ln -s . $$NAME ; \
FILES= ; \
ADIR=archive/ ; \
- for subdir in $(SUBDIRS
) ; do
\
+ for subdir in $(SUBDIRS
2) ; do
\
d=`pwd` ; \
cd $$subdir ; \
FILES="$$FILES `$(MAKE) echo_tarfiles \
d=`pwd` ; \
cd $$subdir ; \
FILES="$$FILES `$(MAKE) echo_tarfiles \
@@
-76,7
+80,8
@@
tar::
` "; \
cd $$d ; done ; \
echo creating tar file $$ADIR$$NAME.tar.gz... ; \
` "; \
cd $$d ; done ; \
echo creating tar file $$ADIR$$NAME.tar.gz... ; \
- GZIP="-9v" $(TAR) -vchzf $$ADIR$$NAME.tar.gz \
+ export COPYFILE_DISABLE=true ; \
+ GZIP="-9v" $(TAR) -vczf $$ADIR$$NAME.tar.gz \
`echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ; \
rm $$NAME
`echo $(TARFILES) $$FILES | sed "s|^|$$NAME/|g; s| | $$NAME/|g" ` ; \
rm $$NAME
@@
-89,7
+94,9
@@
tar::
# of autoconf other than the ones I've tried (2.12 and 2.13.)
#
configure::
# of autoconf other than the ones I've tried (2.12 and 2.13.)
#
configure::
+ aclocal
autoconf
autoconf
+ autoheader
@TMP=configure.$$$$ ; \
echo "munging configure's --help message..." ; \
( perl -e ' \
@TMP=configure.$$$$ ; \
echo "munging configure's --help message..." ; \
( perl -e ' \
@@
-100,8
+107,6
@@
configure::
s/^(Configuration:)$$/\n$$1\n/m; \
s/^(Directory and file names:)$$/\n$$1\n/m; \
s/^ --sbindir=.*\n//m; \
s/^(Configuration:)$$/\n$$1\n/m; \
s/^(Directory and file names:)$$/\n$$1\n/m; \
s/^ --sbindir=.*\n//m; \
- s/^ --libexecdir.*\n//m; \
- s/^ --datadir.*\n.*\n//m; \
s/^ --sysconfdir.*\n//m; \
s/^ --sharedstatedir.*\n.*\n//m; \
s/^ --localstatedir.*\n//m; \
s/^ --sysconfdir.*\n//m; \
s/^ --sharedstatedir.*\n.*\n//m; \
s/^ --localstatedir.*\n//m; \
@@
-116,6
+121,10
@@
configure::
--x-includes=DIR X include files are in DIR\n \
--x-libraries=DIR X library files are in DIR/m; \
\
--x-includes=DIR X include files are in DIR\n \
--x-libraries=DIR X library files are in DIR/m; \
\
+ s@mandir=.\$${prefix}/man.@mandir=\\\$${datadir}/man@; \
+ \
+ s@rm -f conftest@rm -rf conftest@g; \
+ \
print;' \
< configure \
> $$TMP && \
print;' \
< configure \
> $$TMP && \
@@
-125,7
+134,7
@@
configure::
bump-version::
@ \
SRC=utils/version.h ; \
bump-version::
@ \
SRC=utils/version.h ; \
- VERS=`sed -n 's/[^0-9]*\([0-9]\)\.\([0-9][
0-9
]*\).*/\1 \2/p' $$SRC` ; \
+ VERS=`sed -n 's/[^0-9]*\([0-9]\)\.\([0-9][
^.
]*\).*/\1 \2/p' $$SRC` ; \
set - $$VERS ; \
MAJOR="$$1"; MINOR="$$2"; \
NEW=`echo $$MINOR + 1 | bc` ; \
set - $$VERS ; \
MAJOR="$$1"; MINOR="$$2"; \
NEW=`echo $$MINOR + 1 | bc` ; \
@@
-138,7
+147,7
@@
bump-version::
if [ -f $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz ]; then \
echo "WARNING: $${ADIR}xscreensaver-$$MAJOR.$$NEW.tar.gz already exists.";\
fi ; \
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? ";
\
+
/bin/echo -n "Bumping $$MAJOR.$$MINOR to $$MAJOR.$$NEW ($$D), ok? ";
\
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
@@
-147,7
+156,7
@@
bump-version::
sed -e "s/\([0-9]\.[0-9][0-9]*\)/$$MAJOR.$$NEW/" \
-e "s/\(([0-9][0-9]*-[A-Za-z][a-z][a-z]-[0-9][0-9][0-9]*\))/($$D)/" \
$$SRC > $$TMP ; \
sed -e "s/\([0-9]\.[0-9][0-9]*\)/$$MAJOR.$$NEW/" \
-e "s/\(([0-9][0-9]*-[A-Za-z][a-z][a-z]-[0-9][0-9][0-9]*\))/($$D)/" \
$$SRC > $$TMP ; \
-
echo -n "New version and date are ";
\
+
/bin/echo -n "New version and date are ";
\
sed -n "s/[^0-9]*\([0-9]\.[0-9][0-9]*\) (\([-A-Za-z0-9]*\)).*/\1, \2./p" \
$$TMP; \
cat $$TMP > $$SRC ; \
sed -n "s/[^0-9]*\([0-9]\.[0-9][0-9]*\) (\([-A-Za-z0-9]*\)).*/\1, \2./p" \
$$TMP; \
cat $$TMP > $$SRC ; \
@@
-159,13
+168,29
@@
bump_version:: bump-version
tick-version:: bump-version
tick_version:: bump-version
tick-version:: bump-version
tick_version:: bump-version
+version-date::
+ @ \
+ SRC=utils/version.h ; \
+ D=`date '+%d-%b-%Y'`; \
+ TMP=/tmp/bv.$$ ; \
+ sed -e "s/([0-9][^()]*)/($$D)/" < $$SRC > $$TMP ; \
+ /bin/echo -n "Updating date in $$SRC to \"$$D\"... " ; \
+ if cmp -s $$SRC $$TMP ; then \
+ echo "unchanged." ; \
+ else \
+ cat $$TMP > $$SRC ; \
+ echo "done." ; \
+ fi ; \
+ rm -f $$TMP
+
+
update_spec_version::
@S=$(srcdir)/xscreensaver.spec ; \
U=$(srcdir)/utils/version.h ; \
update_spec_version::
@S=$(srcdir)/xscreensaver.spec ; \
U=$(srcdir)/utils/version.h ; \
- V
=`sed -n 's/.*\([0-9][0-9]*\.[0-9]*\).*/\1/p' < $$U` ;
\
-
echo -n "Updating $$S to \"$$V\"... " ;
\
+ V
ERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ;
\
+
/bin/echo -n "Updating $$S to \"$$VERS\"... " ;
\
T=/tmp/xs.$$$$ ; \
T=/tmp/xs.$$$$ ; \
- sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V
/"
\
+ sed "s/^\(%define.version[^0-9]*\)\(.*\)/\1$$V
ERS/"
\
< $$S > $$T ; \
if cmp -s $$S $$T ; then \
echo "unchanged." ; \
< $$S > $$T ; \
if cmp -s $$S $$T ; then \
echo "unchanged." ; \
@@
-177,7
+202,7
@@
update_spec_version::
rpm::
@ \
rpm::
@ \
- VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][
0-9
]*\).*/\1/p' utils/version.h` ; \
+ VERS=`sed -n 's/[^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/ ; \
DIR=`pwd`/rpm_build ; \
ARCH=`rpm --showrc | sed -n 's/^build arch *: //p'` ; \
ADIR=archive/ ; \
@@
-207,7
+232,7
@@
rpm::
test-tar::
@ \
test-tar::
@ \
- VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][
0-9
]*\).*/\1/p' utils/version.h` ; \
+ VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][
^.
]*\).*/\1/p' utils/version.h` ; \
D=xscreensaver-$$VERS ; \
ADIR=archive/ ; \
NAME="$${ADIR}$$D.tar.gz" ; \
D=xscreensaver-$$VERS ; \
ADIR=archive/ ; \
NAME="$${ADIR}$$D.tar.gz" ; \
@@
-253,70
+278,110
@@
test-tar::
\
chmod -R u+w .
\
chmod -R u+w .
+dmg::
+ $(MAKE) -C OSX release dmg
www::
@ \
DEST=$$HOME/www/xscreensaver ; \
www::
@ \
DEST=$$HOME/www/xscreensaver ; \
- VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][
0-9
]*\).*/\1/p' utils/version.h` ; \
+ VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][
^.
]*\).*/\1/p' utils/version.h` ; \
HEAD="xscreensaver-$$VERS" ; \
ADIR=archive/ ; \
BNAME="$$HEAD.tar.gz" ; \
NAME="$$ADIR$$BNAME" ; \
DNAME="$$DEST/$$HEAD.tar.gz" ; \
HEAD="xscreensaver-$$VERS" ; \
ADIR=archive/ ; \
BNAME="$$HEAD.tar.gz" ; \
NAME="$$ADIR$$BNAME" ; \
DNAME="$$DEST/$$HEAD.tar.gz" ; \
+ BNAME2="$$HEAD.dmg" ; \
+ NAME2="$$ADIR$$BNAME2" ; \
+ DNAME2="$$DEST/$$HEAD.dmg" ; \
+ \
+ if ! git diff --quiet ; then \
+ echo "uncommitted changes exist!" ; \
+ exit 1 ; \
+ fi ; \
+ \
+ $(MAKE) -C OSX updates.xml ; \
\
if [ ! -f $$NAME ]; then \
echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \
exit 1 ; \
fi ; \
\
if [ ! -f $$NAME ]; then \
echo "$$NAME does not exist! Did you forget to \`make tar'?" ; \
exit 1 ; \
fi ; \
+ if [ ! -f $$NAME2 ]; then \
+ echo "$$NAME2 does not exist! Did you forget to \`make dmg'?" ; \
+ exit 1 ; \
+ fi ; \
chmod a-w $$NAME ; \
if [ -f $$DNAME ]; then \
chmod a-w $$NAME ; \
if [ -f $$DNAME ]; then \
- echo -n "WARNING: $$DNAME already exists! Overwrite? "; \
+ /bin/echo -n "WARNING: $$DNAME already exists! Overwrite? "; \
+ read line; \
+ if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
+ exit 1 ; \
+ fi ; \
+ fi ; \
+ if [ -f $$DNAME2 ]; then \
+ /bin/echo -n "WARNING: $$DNAME2 already exists! Overwrite? "; \
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
fi ; \
fi ; \
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
fi ; \
fi ; \
+ \
+ git tag -a "v$$VERS" -m "$$VERS" ; \
+ git commit -m "$$VERS" . ; \
+ \
+ ( cd $$DEST ; git pull ) ; \
+ \
cp -p $$NAME $$DNAME ; \
cp -p $$NAME $$DNAME ; \
- chmod u+w $$DNAME ; \
+ cp -p $$NAME2 $$DNAME2 ; \
+ chmod u+w $$DNAME $$DNAME2 ; \
+ cp -p OSX/updates.xml $$DEST ; \
cd $$DEST ; \
\
TMP=/tmp/xd.$$$$ ; \
cd $$DEST ; \
\
TMP=/tmp/xd.$$$$ ; \
- sed "s/xscreensaver-
[0-9]\.[0-9][0-9]*/$$HEAD/g" download.html > $$TMP ;
\
+ sed "s/xscreensaver-
5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ;
\
echo '' ; \
echo '' ; \
- diff -
u
0 download.html $$TMP ; \
+ diff -
U
0 download.html $$TMP ; \
echo '' ; \
\
echo '' ; \
\
- OLDEST=`ls xscreensaver*.tar.gz | head -1` ; \
- echo -n "Delete $$DEST/$$OLDEST? "; \
- read line; \
- if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then \
- set -x ; \
- rm $$OLDEST ; \
- cvs remove $$OLDEST ; \
- else \
- set -x ; \
- fi ; \
- cvs add -kb $$BNAME ; \
+ for EXT in tar.gz dmg ; do \
+ OLDEST=`ls xscreensaver*.$$EXT | \
+ fgrep -v 5.14 | \
+ head -n 1` ; \
+ /bin/echo -n "Delete $$DEST/$$OLDEST? "; \
+ read line; \
+ if [ "x$$line" = "xyes" -o "x$$line" = "xy" ]; then \
+ set -x ; \
+ rm $$OLDEST ; \
+ git rm $$OLDEST ; \
+ set +x ; \
+ fi ; \
+ done ; \
+ set -x ; \
cat $$TMP > download.html ; \
rm -f $$TMP ; \
\
cat $$TMP > download.html ; \
rm -f $$TMP ; \
\
- (cd ..; $(MAKE) xscreensaver/changelog.html ); \
- cvs diff -u0 changelog.html ; \
+ git add $$BNAME $$BNAME2 ; \
+ \
+ $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
+ git diff changelog.html ; \
set +x ; \
\
set +x ; \
\
-
echo -n "Ok? ";
\
+
/bin/echo -n "Ok? ";
\
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
fi ; \
\
read line; \
if [ "x$$line" != "xyes" -a "x$$line" != "xy" ]; then \
exit 1 ; \
fi ; \
\
- cvs commit -m "$$VERS"
+ git tag -a "v$$VERS" -m "$$VERS" ; \
+ git commit -m "$$VERS" . ; \
+ git push ; \
+
count::
@ \
count::
@ \
- echo -n "Current hack count: " ; \
+
/bin/
echo -n "Current hack count: " ; \
( ( cd hacks; make -s INSTALL=true install-program install-scripts ) ; \
( cd hacks/glx; make -s INSTALL=true install-program ) ) | \
grep true | \
grep -v helper | \
( ( cd hacks; make -s INSTALL=true install-program install-scripts ) ; \
( cd hacks/glx; make -s INSTALL=true install-program ) ) | \
grep true | \
grep -v helper | \
+ grep -v ljlatest | \
wc -l
wc -l