Merge branch 'reverting-b7' into release

This commit is contained in:
Cas Cremers 2007-05-21 16:41:19 +02:00
commit 76c516dee0
18 changed files with 138 additions and 1024 deletions

3
dist/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
scyther*.zip
scyther*.tgz
*.swp

7
dist/NewVersion.txt vendored
View File

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

146
dist/gitdist.sh vendored
View File

@ -8,59 +8,133 @@
# #
# gitdist ARCH TAG # gitdist ARCH TAG
# #
ARCH=w32 # ARCH is any of
TAG="v1.0-beta7.1" #
# linux
# w32
# mac
#
# The tag is checked out of the current repository (so it should exist)
# and this is used to construct a archive with the binary of the
# selected architecture.
DOCDIR=doc/manual if [ "x$1" = "x" -o "x$2" = "x" ]
then
echo
echo "Scyther binary distribution generator."
echo
echo " Usage: $0 <arch> <tag>"
echo
echo "where <arch> is one of linux,w32,mac"
echo "and <tag> is any tag in the current git repository."
echo
exit
fi
ARCH=$1
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 "Please use one of linux,w32,mac"
exit
fi
TAG=$2
FOUND=`git-tag -l $TAG`
if [ "x$TAG" = "x$FOUND" ]
then
echo "Tag $TAG found."
else
echo "Don't know tag $TAG, please select one from below:"
git-tag -l
exit
fi
# Note without extension, this will added later
ARCHNAME=scyther-$ARCH-$TAG
# Directory locations
CURDIR=`pwd`
DESTDIR=$CURDIR
TMPDIR="/tmp"
SRCNAME=$ARCHNAME-src
# Hard coded connections, do not change this (hardcoded in git-archive
# usage and archive creation)
SRCDIR=$TMPDIR/$SRCNAME
BUILDDIR=$TMPDIR/$ARCHNAME
# Archive destination file without extension
DESTFILE=$DESTDIR/$ARCHNAME
# Internal locations
DOCDIR=$SRCDIR/doc/manual
MANUAL=scyther-manual.pdf MANUAL=scyther-manual.pdf
DNAM="scyther-$TAG" rm -rf $SRCDIR
TMPDIR="/tmp" rm -rf $BUILDDIR
RESDIR="$TMPDIR/$DNAM"
rm -rf $RESDIR
ZIPDIR=$TMPDIR # Change into the lower directory (main archive dir)
ZIPNAME=scyther-$ARCH-$TAG.zip cd .. && git-archive --format=tar --prefix=$SRCNAME/ $TAG | (cd $TMPDIR && tar xf -)
rm -f $ZIPDIR/$ZIPNAME # Base of the package is the gui directory
mv $SRCDIR/gui $BUILDDIR
cd .. && git-archive --format=tar --prefix=$DNAM/ $TAG | (cd $TMPDIR && tar xf -) # Prepare tag for gui version
echo "SCYTHER_GUI_VERSION = \"$TAG\"" >$BUILDDIR/Gui/Version.py
ls $RESDIR
# Windows binary
cd $RESDIR/src
# Where is stuff going to
DESTDIR=$RESDIR/gui
# Prepare version.h with the correct flag (tag) # Prepare version.h with the correct flag (tag)
echo "#define SVNVERSION \"Unknown\"" >$RESDIR/src/version.h echo "#define TAGVERSION \"$TAG\"" >$SRCDIR/src/version.h
echo "#define TAGVERSION \"$TAG\"" >>$RESDIR/src/version.h echo "" >>$SRCDIR/src/version.h
echo "" >>$RESDIR/src/version.h
# Manual # Manual
cp $RESDIR/$DOCDIR/$MANUAL $DESTDIR cp $DOCDIR/$MANUAL $BUILDDIR
# Change into sources directory
cd $SRCDIR/src
# Default flags # Default flags
CMFLAGS="-D CMAKE_BUILD_TYPE:STRING=Release" CMFLAGS="-D CMAKE_BUILD_TYPE:STRING=Release"
# Make for windows and linux if [ $ARCH = "w32" ]
then
BIN="scyther-w32.exe"
cmake $CMFLAGS -D TARGETOS=Win32 . && make cmake $CMFLAGS -D TARGETOS=Win32 . && make
#cmake $CMFLAGS . && make
BINDIR=$RESDIR/gui/Scyther/Bin elif [ $ARCH = "linux" ]
mkdir $BINDIR then
cp scyther-w32.exe $BINDIR BIN="scyther-linux"
cmake $CMFLAGS . && make
# Prepare tag for gui version elif [ $ARCH = "mac" ]
echo "SCYTHER_GUI_VERSION = \"$TAG\"" >$DESTDIR/Gui/Version.py then
# Make for ppc and intel, and combine into universal binary
BIN="scyther-mac"
cmake $CMFLAGS -D TARGETOS=MacPPC . && make
cmake $CMFLAGS -D TARGETOS=MacIntel . && make
cmake $CMFLAGS . && make scyther-mac
fi
# Make archive out of the result # Copy the resulting binary to the correct location
WORKNAME="scyther-$TAG" BINDIR=$BUILDDIR/Scyther/
cd $RESDIR cp $BIN $BINDIR
mv gui $WORKNAME
zip -r $ZIPDIR/$ZIPNAME $WORKNAME # Compress the whole thing into an archive
rm -rf $RESDIR cd $TMPDIR
if [ $ARCH = "w32" ]
then
DESTARCH=$DESTFILE.zip
rm -f $DESTARCH
zip -r $DESTARCH $ARCHNAME
else
DESTARCH=$DESTFILE.tgz
rm -f $DESTARCH
tar zcvf $DESTARCH $ARCHNAME
fi
# Remove the temporary working directory
rm -rf $BUILDDIR
rm -rf $SRCDIR

82
dist/makedist.sh vendored
View File

@ -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.

View File

@ -191,7 +191,6 @@ class AttackThread(threading.Thread):
if self.parent and self.parent.mainwin: if self.parent and self.parent.mainwin:
fontsize = self.parent.mainwin.settings.fontsize fontsize = self.parent.mainwin.settings.fontsize
setAttr("fontsize=%s" % fontsize) setAttr("fontsize=%s" % fontsize)
#setAttr("height=\"0.1\"",NODE) #setAttr("height=\"0.1\"",NODE)
#setAttr("width=\"1.0\"",NODE) #setAttr("width=\"1.0\"",NODE)
#setAttr("margin=\"0.3,0.03\"",NODE) #setAttr("margin=\"0.3,0.03\"",NODE)
@ -212,28 +211,26 @@ class AttackThread(threading.Thread):
# command to write to temporary file # command to write to temporary file
(fd2,fpname2) = Tempfile.tempcleaned(ext) (fd2,fpname2) = Tempfile.tempcleaned(ext)
f = os.fdopen(fd2,'w') f = os.fdopen(fd2,'w')
(fd3,fpname3) = Tempfile.tempcleaned(ext)
dotfile = os.fdopen(fd3,'w')
self.writeGraph(attack.scytherDot,dotfile)
dotfile.flush()
dotfile.seek(0)
cmd = "dot -T%s -o%s %s" % (type,fpname2,fpname3) cmd = "dot -T%s" % (type)
# execute command # execute command
# Start the process cin,cout = os.popen2(cmd,'b')
safeCommand(cmd)
# Print self.writeGraph(attack.scytherDot,cin)
#print fpname2 cin.close()
#raw_input()
for l in cout.read():
f.write(l)
cout.close()
f.flush()
f.close()
# if this is done, store and report # if this is done, store and report
attack.filetype = type attack.filetype = type
attack.file = fpname2 # this is where the file name is stored attack.file = fpname2 # this is where the file name is stored
# Maybe we should remove the temporary file... TODO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
class VerificationWindow(wx.Dialog): class VerificationWindow(wx.Dialog):

View File

@ -1 +1 @@
SCYTHER_GUI_VERSION = "1.0-beta7" SCYTHER_GUI_VERSION = "Unknown"

View File

@ -34,7 +34,7 @@ def scyther_to_dotfile():
""" Run Scyther, return dotfile name """ """ Run Scyther, return dotfile name """
mydir = os.path.dirname(__file__) mydir = os.path.dirname(__file__)
scythername = os.path.join(mydir, "../Scyther/Bin/scyther-linux") scythername = os.path.join(mydir, "../Scyther/scyther-linux")
args = " ".join(sys.argv[1:]) args = " ".join(sys.argv[1:])
tmpdotfile = generateTemp('dot') tmpdotfile = generateTemp('dot')

View File

@ -7,6 +7,6 @@
import Scyther import Scyther
import os.path import os.path
bindir = os.path.join(__path__[0],"Bin") bindir = __path__[0]
Scyther.setBinDir(bindir) Scyther.setBinDir(bindir)

View File

@ -15,7 +15,7 @@ Please install this package in order to use the graphical user
interface of Scyther. interface of Scyther.
The [wxPython] packages can be found at http://www.wxpython.org/ The [wxPython] packages can be found at http://www.wxpython.org/
Note that you can still use the Scyther binaries in the 'Bin' directory. Note that you can still use the Scyther binaries in the 'Scyther' directory.
""" """
sys.exit(1) sys.exit(1)
import os import os

View File

@ -24,9 +24,6 @@ set (Scyther_sources
# If we are in a debug mode we want to be strict # If we are in a debug mode we want to be strict
set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -DDEBUG") set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -DDEBUG")
# Determine version number
include (SVNVersion.cmake)
# Make scanner and parser # Make scanner and parser
include (ScannerParser.cmake) include (ScannerParser.cmake)

View File

@ -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)

View File

@ -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=

View File

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
cp scyther-linux ../gui/Scyther/Bin cp scyther-linux ../gui/Scyther/
cp scyther-w32.exe ../gui/Scyther/Bin cp scyther-w32.exe ../gui/Scyther/
cp scyther-mac ../gui/Scyther/Bin cp scyther-mac ../gui/Scyther/
# bonus... # bonus...
cp scyther-linux ~/bin cp scyther-linux ~/bin

View File

@ -14,7 +14,7 @@ echo "---------------------------------------------------------"
echo "Built the Mac universal binary" echo "Built the Mac universal binary"
# Copy to the correct locations # Copy to the correct locations
cp scyther-mac ../gui/Scyther/Bin cp scyther-mac ../gui/Scyther/
echo Copied the files to their respective locations echo Copied the files to their respective locations
echo "---------------------------------------------------------" echo "---------------------------------------------------------"

View File

@ -13,8 +13,8 @@ echo "---------------------------------------------------------"
echo "Built the Linux and Windows binaries" echo "Built the Linux and Windows binaries"
# Copy to the correct locations # Copy to the correct locations
cp scyther-linux ../gui/Scyther/Bin cp scyther-linux ../gui/Scyther/
cp scyther-w32.exe ../gui/Scyther/Bin cp scyther-w32.exe ../gui/Scyther/
# bonus... # bonus...
cp scyther-linux ~/bin cp scyther-linux ~/bin

View File

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

View File

@ -1247,10 +1247,7 @@ switcher (const int process, int index, int commandline)
if (switches.expert) if (switches.expert)
{ {
#ifdef DEBUG #ifdef DEBUG
printf ("Revision %s, compiled with debugging support.\n", printf ("Compiled with debugging support.\n");
SVNVERSION);
#else
printf ("Revision %s\n", SVNVERSION);
#endif #endif
} }
printf ("Code by Cas Cremers\n"); printf ("Code by Cas Cremers\n");

1
src/version.h Normal file
View File

@ -0,0 +1 @@
#define TAGVERSION "unknown"