From 2ebbdbf2a567c73d75af4f0e04f4f42bfe6d3530 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 24 Sep 2014 10:33:21 +0000 Subject: Remove dependencies on Subversion. I'm going through all my projects and reworking them to avoid depending on the monotonic integer-valued source control revision identifier provided by Subversion, so I can migrate everything to git without my builds and versioning breaking. Puzzles's version number is now of the form YYYYMMDD.vvvvvv, where vvvvvv is some string of source control information (currently still the SVN-style "rNNNNN", but free to change in future). The date provides monotonicity between my official automated builds, and the second component is the one I'll be most interested in when people send bug reports. [originally from svn r10263] --- Recipe | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Recipe') diff --git a/Recipe b/Recipe index e6af51d..0d9e2a3 100644 --- a/Recipe +++ b/Recipe @@ -118,8 +118,6 @@ version.o: version.c version2.def version2.def: FORCE if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \ cat version.def > version2.def.new; \ - elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \ - echo "-DREVISION=`svnversion .`" >version2.def.new; \ else \ echo "$(VER)" >version2.def.new; \ fi && \ @@ -136,7 +134,7 @@ version2.def: FORCE # backtick expression. We also force rebuilding via a -D option that # makes version.o include empty.h, which we construct ourselves and # touch whenever any source file is updated. -!cflags am version $(VER) -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir) && test -f manifest && md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/version.def; elif test -z "$(VER)" && test -d $(srcdir)/.svn && svnversion $(srcdir) >/dev/null 2>&1; then echo "-DREVISION=\`svnversion $(srcdir)\`"; else echo "$(VER)"; fi` +!cflags am version -DINCLUDE_EMPTY_H `if test -z "$(VER)" && (cd $(srcdir) && test -f manifest && md5sum -c manifest >/dev/null 2>&1); then cat $(srcdir)/version.def; else echo "$(VER)"; fi` !begin am BUILT_SOURCES = empty.h CLEANFILES = empty.h @@ -156,8 +154,6 @@ version.o: version.c version2.def version2.def: FORCE if test -z "$(VER)" && test -f manifest && md5sum -c manifest; then \ cat version.def > version2.def.new; \ - elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \ - echo "-DREVISION=`svnversion .`" >version2.def.new; \ else \ echo "$(VER)" >version2.def.new; \ fi && \ @@ -180,8 +176,6 @@ version.i386.o: version.c version2.def version2.def: FORCE if test -z "$(VER)" && test -f manifest && (md5 -r `awk '{print $$2}' manifest` | diff -w manifest -); then \ cat version.def > version2.def.new; \ - elif test -z "$(VER)" && test -d .svn && svnversion . >/dev/null 2>&1; then \ - echo "-DREVISION=`svnversion .`" >version2.def.new; \ else \ echo "$(VER)" >version2.def.new; \ fi && \ -- cgit v1.1