Commit b224650b authored by Michael Büsch's avatar Michael Büsch

Add VERSION_STRING

Signed-off-by: Michael Büsch's avatarMichael Buesch <m@bues.ch>
parent 51044adb
......@@ -38,7 +38,7 @@ class TextInterfaceAwlSimClient(AwlSimClient):
emitCpuDump(dumpText)
def usage():
printInfo("awlsim version %d.%d" % (VERSION_MAJOR, VERSION_MINOR))
printInfo("awlsim version %s" % VERSION_STRING)
printInfo("")
printInfo("%s [OPTIONS] <AWL-source or awlsim-project file>" % sys.argv[0])
printInfo("")
......
......@@ -33,7 +33,7 @@ import getopt
def usage():
printInfo("awlsim-gui version %d.%d" % (VERSION_MAJOR, VERSION_MINOR))
printInfo("awlsim-gui version %s" % VERSION_STRING)
printInfo("")
printInfo("%s [OPTIONS] [AWL-source]" % sys.argv[0])
printInfo("")
......
......@@ -118,7 +118,7 @@ def readInputFile(inputFile):
return project
def usage():
printInfo("awlsim-linuxcnc-hal version %d.%d" % (VERSION_MAJOR, VERSION_MINOR))
printInfo("awlsim-linuxcnc-hal version %s" % VERSION_STRING)
printInfo("")
printInfo("%s [OPTIONS] AWL-source" % sys.argv[0])
printInfo("")
......
......@@ -32,7 +32,7 @@ from awlsim.coreserver import *
def usage():
printInfo("awlsim-server version %d.%d" % (VERSION_MAJOR, VERSION_MINOR))
printInfo("awlsim-server version %s" % VERSION_STRING))
printInfo("")
printInfo("%s [OPTIONS]" % sys.argv[0])
printInfo("")
......
......@@ -31,8 +31,8 @@ from awlsim.core.symbolparser import *
def usage():
printInfo("awlsim-symtab symbol table parser, version %d.%d" %\
(VERSION_MAJOR, VERSION_MINOR))
printInfo("awlsim-symtab symbol table parser, version %s" %\
VERSION_STRING)
printInfo("")
printInfo("%s [OPTIONS] <inputfile> [outputfile]" % sys.argv[0])
printInfo("")
......
......@@ -4,3 +4,5 @@ from awlsim.common.compat import *
VERSION_MAJOR = 0
VERSION_MINOR = 35
VERSION_STRING = "%d.%d" % (VERSION_MAJOR, VERSION_MINOR)
......@@ -2,7 +2,7 @@
SET PATH=%PATH%;C:\WINDOWS;C:\WINDOWS\SYSTEM32;C:\PYTHON34;%ProgramFiles%\7-Zip
py -c "from awlsim.common.version import VERSION_MAJOR, VERSION_MINOR; print('%%d.%%d' %% (VERSION_MAJOR, VERSION_MINOR))" > version.txt
py -c "from awlsim.common.version import VERSION_STRING; print(VERSION_STRING)" > version.txt
set /p version= < version.txt
set distdir=awlsim-win-standalone-%version%
......
......@@ -2,7 +2,7 @@
SET PATH=%PATH%;C:\WINDOWS;C:\WINDOWS\SYSTEM32;C:\PYTHON34;%ProgramFiles%\7-Zip
py -c "from awlsim.common.version import VERSION_MAJOR, VERSION_MINOR; print('%%d.%%d' %% (VERSION_MAJOR, VERSION_MINOR))" > version.txt
py -c "from awlsim.common.version import VERSION_STRING; print(VERSION_STRING)" > version.txt
set /p version= < version.txt
set distdir=awlsim-win-standalone-%version%
......
......@@ -11,7 +11,7 @@ import shutil
import hashlib
from distutils.core import setup
from distutils.extension import Extension
from awlsim.common.version import VERSION_MAJOR, VERSION_MINOR
from awlsim.common.version import VERSION_STRING
try:
import py2exe
except ImportError as e:
......@@ -304,7 +304,7 @@ if cx_Freeze:
}
setup( name = "awlsim",
version = "%d.%d" % (VERSION_MAJOR, VERSION_MINOR),
version = VERSION_STRING,
description = "S7 AWL/STL Soft-PLC",
license = "GNU General Public License v2 or later",
author = "Michael Buesch",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment