Merge branch 'testing' of cas@roivas.shape9.nl:/export/git/scyther into reverting-b7

dist/NewVersion.txt

@@ -1,7 +0,0 @@
-Where are the version numbers? (way too distributed)
-
-- Gui has a version number in Version.py. This is propagated into the
-  binary and into the archive name as well.
-- ChangeLog
-- Readme.txt
-

dist/gitdist.sh

@@ -36,7 +36,8 @@ if [ "x$ARCH" = "xlinux" -o "x$ARCH" = "xw32" -o "x$ARCH" = "xmac" ]
 then
 	echo "Architecture $ARCH detected."
 else
-	echo "Don't know architecture $ARCH"
+	echo "Don't know architecture $ARCH."
+	echo "Please use one of linux,w32,mac"
 	exit
 fi
 
@@ -46,7 +47,8 @@ if [ "x$TAG" = "x$FOUND" ]
 then
 	echo "Tag $TAG found."
 else
-	echo "Don't know tag $TAG"
+	echo "Don't know tag $TAG, please select one from below:"
+	git-tag -l
 	exit
 fi
 
@@ -80,9 +82,11 @@ cd .. && git-archive --format=tar --prefix=$SRCNAME/ $TAG | (cd $TMPDIR && tar x
 # Base of the package is the gui directory
 mv $SRCDIR/gui $BUILDDIR
 
+# Prepare tag for gui version
+echo "SCYTHER_GUI_VERSION = \"$TAG\"" >$BUILDDIR/Gui/Version.py
+
 # Prepare version.h with the correct flag (tag)
-echo "#define SVNVERSION \"Unknown\"" >$SRCDIR/src/version.h
-echo "#define TAGVERSION \"$TAG\"" >>$SRCDIR/src/version.h
+echo "#define TAGVERSION \"$TAG\"" >$SRCDIR/src/version.h
 echo "" >>$SRCDIR/src/version.h
 
 # Manual
@@ -116,9 +120,6 @@ fi
 BINDIR=$BUILDDIR/Scyther/
 cp $BIN $BINDIR
 
-# Prepare tag for gui version
-echo "SCYTHER_GUI_VERSION = \"$TAG\"" >$BUILDDIR/Gui/Version.py
-
 # Compress the whole thing into an archive
 cd $TMPDIR
 if [ $ARCH = "w32" ]

dist/makedist.sh

@@ -1,82 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-#
-#	makedist.sh
-#
-#	Make a Scyther distribution of the most recent revision.
-#
-#
-#	A distribution is a directory
-#
-#	   scyther/
-#	      - everything from ../gui
-#	      SPORE/
-#	        - spore files
-#	      
-
-#------------------------------------------------------------------------------
-#
-#	Parameters
-
-#	Creates a temporary subdirectory here.
-TMPDIR=/tmp/scytherdist
-WORKNAME=scyther
-
-#	Repository
-PROTROOT=https://svn.win.tue.nl/repos/scyther/trunk/spdl
-SVNROOT=https://svn.win.tue.nl/repos/scyther/trunk
-DOCROOT=https://svn.win.tue.nl/repos/scyther/trunk/manual
-
-MANUAL=scyther-manual.pdf
-
-#------------------------------------------------------------------------------
-#
-#	Derived things
-
-WORKDIR=$TMPDIR/$WORKNAME
-CURDIR=$PWD
-DOCDEST=$WORKDIR/doc
-
-#------------------------------------------------------------------------------
-#
-#	Init
-
-#	Remove old remnants and create a new directory
-rm -f $DEST
-rm -f $ZIPDEST
-rm -rf $TMPDIR
-mkdir $TMPDIR
-
-#------------------------------------------------------------------------------
-#
-#	Collect required data and set up
-
-
-#	Fill
-svn export $SVNROOT/gui $WORKDIR
-svn export $PROTROOT/SPORE $WORKDIR/SPORE
-
-svn cat $DOCROOT/$MANUAL >$WORKDIR/$MANUAL
-
-#------------------------------------------------------------------------------
-#
-#	Collected all needed data, finish up
-
-TAGVERSION=`awk 'BEGIN { FS="\""; } { print $2; }' ../gui/Gui/Version.py`
-RELEASE="scyther-$TAGVERSION"
-
-ARCHIVE="$RELEASE.tgz"
-ZIPPED="$RELEASE.zip"
-DEST=$PWD/$ARCHIVE
-ZIPDEST=$PWD/$ZIPPED
-
-#	Compress
-cd $TMPDIR
-tar zcvf $DEST $WORKNAME
-zip -r $ZIPDEST $WORKNAME
-
-#	Remove garbage
-rm -rf $TMPDIR
-
-#------------------------------------------------------------------------------
-# Done.