zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-22 16:32:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove dependencies on Subversion.

Browse Source 
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]
This commit is contained in:
Simon Tatham
2014-09-24 10:33:21 +00:00
parent bc930a1214
commit 2ebbdbf2a5
8 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Recipe
View File

@ -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 && \