From d0ee59521aab8cbc3b55996d95fd3b71f37c4b5b Mon Sep 17 00:00:00 2001 From: Cas Cremers Date: Sun, 20 May 2007 16:00:14 +0200 Subject: [PATCH 1/4] - Removed obsolete files for new versions. --- dist/NewVersion.txt | 7 ---- dist/makedist.sh | 82 --------------------------------------------- 2 files changed, 89 deletions(-) delete mode 100644 dist/NewVersion.txt delete mode 100755 dist/makedist.sh diff --git a/dist/NewVersion.txt b/dist/NewVersion.txt deleted file mode 100644 index ccec53b..0000000 --- a/dist/NewVersion.txt +++ /dev/null @@ -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 - diff --git a/dist/makedist.sh b/dist/makedist.sh deleted file mode 100755 index d86e3bb..0000000 --- a/dist/makedist.sh +++ /dev/null @@ -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. From db78b7f941a2d3399ec9f8910c7eebe958d9838e Mon Sep 17 00:00:00 2001 From: Cas Cremers Date: Sun, 20 May 2007 16:00:41 +0200 Subject: [PATCH 2/4] - Added some further explanations for users of the dist script if the tag/arch is not found. --- dist/gitdist.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dist/gitdist.sh b/dist/gitdist.sh index 0ba1a48..153e0d4 100755 --- a/dist/gitdist.sh +++ b/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 From f56a10646fdb2727e842d36514347fb71b6fde6d Mon Sep 17 00:00:00 2001 From: Cas Cremers Date: Sun, 20 May 2007 16:08:56 +0200 Subject: [PATCH 3/4] Got rid of obsolete version number encoding. The old version numbers were retrieved from SVN; of course this no longer works. Now no versions are retrieved on normal building. Instead, this is covered by the dist building script. --- src/CMakeLists.txt | 3 - src/SVNVersion.cmake | 58 -- src/Scyther.dev | 789 ---------------------------- src/subbuild-version-information.sh | 19 - src/switches.c | 5 +- src/version.h | 1 + 6 files changed, 2 insertions(+), 873 deletions(-) delete mode 100644 src/SVNVersion.cmake delete mode 100644 src/Scyther.dev delete mode 100755 src/subbuild-version-information.sh create mode 100644 src/version.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aaf8a91..5b66766 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,9 +24,6 @@ set (Scyther_sources # If we are in a debug mode we want to be strict set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -DDEBUG") -# Determine version number -include (SVNVersion.cmake) - # Make scanner and parser include (ScannerParser.cmake) diff --git a/src/SVNVersion.cmake b/src/SVNVersion.cmake deleted file mode 100644 index a8350af..0000000 --- a/src/SVNVersion.cmake +++ /dev/null @@ -1,58 +0,0 @@ -################################################################ -# Name: SVNVersion.cmake -# Purpose: Determine subversion revision id for Scyther -# and write it into a macro in version.h -# Author: Cas Cremers -################################################################ - -# Technically, this only needs to be redone each time a file -# changes, so this is a target with dependencies on all files. - -# Checkout version info -find_program (SVNVERSION_EXECUTABLE NAMES svnversion) -mark_as_advanced (SVNVERSION_EXECUTABLE) -mark_as_advanced (SVNVERSION_DYNAMIC) -set (SVNVERSION_DYNAMIC false) -if (SVNVERSION_EXECUTABLE) - # test whether svnversion gives useful info - execute_process ( - COMMAND ${SVNVERSION_EXECUTABLE} --no-newline - OUTPUT_VARIABLE SVN_Result - ) - mark_as_advanced (SVN_Result) - if (NOT ${SVN_Result} STREQUAL "exported") - # svnversion gives useful stuff - ## write to file - #file (WRITE version.h "#define SVNVERSION \"${SVN_Result}\"\n") - set (SVNVERSION_DYNAMIC true) - endif (NOT ${SVN_Result} STREQUAL "exported") - mark_as_advanced (SVNDIR) -endif (SVNVERSION_EXECUTABLE) - -# If dynamic generation is required, this means another target in the -# makefile -if (SVNVERSION_DYNAMIC) - # add a command to generate version.h - message (STATUS "Generating version.h dynamically using svnversion command") - add_custom_command ( - OUTPUT version.h - # The version number depends on all the files; if they - # don't change, neither should the version number - # (although this might be incorrect when updating the - # current directory) - DEPENDS ${Scyther_sources} - DEPENDS .svn - COMMAND ./subbuild-version-information.sh - COMMENT "Generating subversion and tag version information in version.h using svnversion command" - ) -else (SVNVERSION_DYNAMIC) - # Don't dynamically generate, simply empty every time - file (WRITE version.h "#define SVNVERSION \"Unknown\"\n#define TAGVERSION \"Unknown\"") -endif (SVNVERSION_DYNAMIC) - -# add the version number to the sources -set_source_files_properties(version.h - PROPERTIES - GENERATED true) -set (Scyther_sources ${Scyther_sources} version.h) - diff --git a/src/Scyther.dev b/src/Scyther.dev deleted file mode 100644 index c50735f..0000000 --- a/src/Scyther.dev +++ /dev/null @@ -1,789 +0,0 @@ -[Project] -FileName=Scyther.dev -Name=Scyther -UnitCount=72 -Type=1 -Ver=1 -ObjFiles= -Includes= -Libs= -PrivateResource= -ResourceIncludes= -MakeIncludes= -Compiler= -CppCompiler= -Linker= -IsCpp=0 -Icon= -ExeOutput=..\gui\Scyther -ObjectOutput= -OverrideOutput=0 -OverrideOutputName=Scyther.exe -HostApplication= -Folders= -CommandLine= -UseCustomMakefile=0 -CustomMakefile= -IncludeVersionInfo=0 -SupportXPThemes=0 -CompilerSet=0 -CompilerSettings=0000000000000000000000 - -[Unit1] -FileName=xmlout.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit2] -FileName=arachne.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit3] -FileName=arachne.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit4] -FileName=binding.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit5] -FileName=binding.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit6] -FileName=claim.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit7] -FileName=claim.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit8] -FileName=color.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit9] -FileName=color.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit10] -FileName=compiler.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit11] -FileName=compiler.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit12] -FileName=cost.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit13] -FileName=cost.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit14] -FileName=debug.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit15] -FileName=debug.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit16] -FileName=depend.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit17] -FileName=depend.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit18] -FileName=dotout.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit19] -FileName=dotout.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit20] -FileName=error.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit21] -FileName=error.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit22] -FileName=heuristic.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit23] -FileName=heuristic.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit24] -FileName=hidelevel.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit25] -FileName=hidelevel.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit26] -FileName=intruderknowledge.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit27] -FileName=intruderknowledge.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit28] -FileName=knowledge.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit29] -FileName=knowledge.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit30] -FileName=label.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit31] -FileName=label.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit32] -FileName=list.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit33] -FileName=list.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit35] -FileName=mgu.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit36] -FileName=pheading.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit37] -FileName=prune_bounds.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit38] -FileName=prune_bounds.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit39] -FileName=prune_theorems.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit40] -FileName=prune_theorems.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit41] -FileName=role.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit42] -FileName=role.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit43] -FileName=specialterm.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit44] -FileName=specialterm.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit45] -FileName=states.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit46] -FileName=states.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit48] -FileName=switches.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit49] -FileName=symbol.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit50] -FileName=symbol.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit51] -FileName=system.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit52] -FileName=system.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit53] -FileName=tac.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit54] -FileName=tac.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit55] -FileName=term.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit56] -FileName=term.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit57] -FileName=termlist.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit58] -FileName=termlist.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit59] -FileName=termmap.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit60] -FileName=termmap.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit61] -FileName=timer.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit62] -FileName=timer.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit63] -FileName=type.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit64] -FileName=type.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit65] -FileName=warshall.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit66] -FileName=warshall.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit67] -FileName=xmlout.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit68] -FileName=main.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit69] -FileName=version.h -CompileCpp=0 -Folder= -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit70] -FileName=parser.h -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit71] -FileName=scanner.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[VersionInfo] -Major=0 -Minor=1 -Release=1 -Build=1 -LanguageID=1033 -CharsetID=1252 -CompanyName= -FileVersion= -FileDescription=Developed using the Dev-C++ IDE -InternalName= -LegalCopyright= -LegalTrademarks= -OriginalFilename= -ProductName= -ProductVersion= -AutoIncBuildNr=0 - -[Unit34] -FileName=mgu.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit72] -FileName=parser.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit73] -FileName=scanner.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit74] -FileName=parser.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - -[Unit47] -FileName=switches.c -CompileCpp=0 -Folder=Scyther -Compile=1 -Link=1 -Priority=1000 -OverrideBuildCmd=0 -BuildCmd= - diff --git a/src/subbuild-version-information.sh b/src/subbuild-version-information.sh deleted file mode 100755 index 843815e..0000000 --- a/src/subbuild-version-information.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# -# Arguments: -# -# svnversion executable path -# - -SVNVERSION=`svnversion` -TAGVERSION=`awk 'BEGIN { FS="\""; } { print $2; }' ../gui/Gui/Version.py` - -echo $SVNVERSION -echo $TAGVERSION - -# Fix svnversion information -echo "#define SVNVERSION \"$SVNVERSION\"" >version.h -# Fix version tag -echo "#define TAGVERSION \"$TAGVERSION\"" >>version.h - - diff --git a/src/switches.c b/src/switches.c index 5b4ac9f..6e0bd68 100644 --- a/src/switches.c +++ b/src/switches.c @@ -1247,10 +1247,7 @@ switcher (const int process, int index, int commandline) if (switches.expert) { #ifdef DEBUG - printf ("Revision %s, compiled with debugging support.\n", - SVNVERSION); -#else - printf ("Revision %s\n", SVNVERSION); + printf ("Compiled with debugging support.\n"); #endif } printf ("Code by Cas Cremers\n"); diff --git a/src/version.h b/src/version.h new file mode 100644 index 0000000..9eb79b0 --- /dev/null +++ b/src/version.h @@ -0,0 +1 @@ +#define TAGVERSION "unknown" From db78f91af1cbcdc0e37753773e9126a482e34ad5 Mon Sep 17 00:00:00 2001 From: Cas Cremers Date: Sun, 20 May 2007 16:14:40 +0200 Subject: [PATCH 4/4] Fixed version information updates of both the compiled code as well as the Gui. --- dist/gitdist.sh | 9 ++++----- gui/Gui/Version.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dist/gitdist.sh b/dist/gitdist.sh index 153e0d4..c7b8043 100755 --- a/dist/gitdist.sh +++ b/dist/gitdist.sh @@ -82,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 @@ -119,9 +121,6 @@ BINDIR=$BUILDDIR/Scyther/Bin mkdir $BINDIR 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" ] diff --git a/gui/Gui/Version.py b/gui/Gui/Version.py index b4a78dc..720884f 100644 --- a/gui/Gui/Version.py +++ b/gui/Gui/Version.py @@ -1 +1 @@ -SCYTHER_GUI_VERSION = "1.0-beta7" +SCYTHER_GUI_VERSION = "Unknown"