aboutsummaryrefslogtreecommitdiff
path: root/makedist.sh
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2014-09-24 10:33:21 +0000
committerSimon Tatham <anakin@pobox.com>2014-09-24 10:33:21 +0000
commit2ebbdbf2a567c73d75af4f0e04f4f42bfe6d3530 (patch)
treeffba948f9ec31406431f027e96a36a518bba56c6 /makedist.sh
parentbc930a121466e0e33b46ff01db0153f5cfb79054 (diff)
downloadpuzzles-2ebbdbf2a567c73d75af4f0e04f4f42bfe6d3530.zip
puzzles-2ebbdbf2a567c73d75af4f0e04f4f42bfe6d3530.tar.gz
puzzles-2ebbdbf2a567c73d75af4f0e04f4f42bfe6d3530.tar.bz2
puzzles-2ebbdbf2a567c73d75af4f0e04f4f42bfe6d3530.tar.xz
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]
Diffstat (limited to 'makedist.sh')
-rwxr-xr-xmakedist.sh27
1 files changed, 8 insertions, 19 deletions
diff --git a/makedist.sh b/makedist.sh
index 3b87bff..65eb519 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -2,27 +2,15 @@
# Build a Unix source distribution from the Puzzles SVN area.
#
-# Pass a numeric argument to have the archive tagged as that SVN
-# revision. Otherwise, the script will work it out itself by
-# calling `svnversion', or failing that it will not version-tag the
+# Pass a version number argument to have the archive tagged with that
+# version number. Otherwise, the script will not version-tag the
# archive at all.
-case "$#" in
- 0)
- # Ignore errors; if we can't get a version, we'll have a blank
- # string.
- rev=`svnversion . 2>/dev/null`
- if test "x$rev" = "xexported"; then rev=; fi
- ;;
- *)
- case "$1" in *[!0-9M]*) echo "Malformed revision number '$1'">&2;exit 1;;esac
- rev="$1"
- ;;
-esac
+version="$1"
-if test "x$rev" != "x"; then
- arcsuffix="-r$rev"
- ver="-DREVISION=$rev"
+if test "x$version" != "x"; then
+ arcsuffix="-$version"
+ ver="-DVER=$version"
else
arcsuffix=
ver=
@@ -45,7 +33,8 @@ for i in *.c *.m *.h *.R *.rc *.but *.plist *.icns LICENCE README Recipe \
HACKING puzzles.txt puzzles.hlp puzzles.cnt puzzles.chm \
icons/Makefile icons/*.{sav,pl,sh} icons/win16pal.xpm \
icons/*.png icons/*.ico icons/*.rc icons/*.c \
- configure.ac mkauto.sh aclocal.m4 configure depcomp install-sh missing; do
+ configure.ac mkauto.sh aclocal.m4 \
+ configure depcomp install-sh missing compile; do
case $i in
*/*) ln -s ../../../$i tmp.$$/puzzles$arcsuffix/$i;;
*) ln -s ../../$i tmp.$$/puzzles$arcsuffix/$i;;