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

Move version info to common

Signed-off-by: Michael Büsch's avatarMichael Buesch <m@bues.ch>
parent b5b89b86
...@@ -28,6 +28,7 @@ import getopt ...@@ -28,6 +28,7 @@ import getopt
import traceback import traceback
import signal import signal
from awlsim.common import *
from awlsim.core import * from awlsim.core import *
from awlsim.coreclient import * from awlsim.coreclient import *
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
from __future__ import division, absolute_import, print_function, unicode_literals from __future__ import division, absolute_import, print_function, unicode_literals
from awlsim.common.compat import * from awlsim.common.compat import *
from awlsim.common import *
from awlsim.gui import * from awlsim.gui import *
import getopt import getopt
......
...@@ -27,10 +27,11 @@ import sys ...@@ -27,10 +27,11 @@ import sys
import os import os
import getopt import getopt
from awlsim.common.version import *
from awlsim.core.main import * from awlsim.core.main import *
from awlsim.core.parser import * from awlsim.core.parser import *
from awlsim.core.util import * from awlsim.core.util import *
from awlsim.core.version import VERSION_MAJOR, VERSION_MINOR
try: try:
import hal as LinuxCNC_HAL import hal as LinuxCNC_HAL
......
...@@ -26,6 +26,7 @@ from awlsim.common.compat import * ...@@ -26,6 +26,7 @@ from awlsim.common.compat import *
import sys import sys
import getopt import getopt
from awlsim.common import *
from awlsim.core import * from awlsim.core import *
from awlsim.coreserver import * from awlsim.coreserver import *
......
...@@ -26,7 +26,7 @@ from awlsim.common.compat import * ...@@ -26,7 +26,7 @@ from awlsim.common.compat import *
import sys import sys
import getopt import getopt
from awlsim.core.version import * from awlsim.common import *
from awlsim.core.symbolparser import * from awlsim.core.symbolparser import *
......
...@@ -10,4 +10,5 @@ from awlsim.common.project import * ...@@ -10,4 +10,5 @@ from awlsim.common.project import *
from awlsim.common.subprocess import * from awlsim.common.subprocess import *
from awlsim.common.templates import * from awlsim.common.templates import *
from awlsim.common.util import * from awlsim.common.util import *
from awlsim.common.version import *
from awlsim.common.wordpacker import * from awlsim.common.wordpacker import *
...@@ -6,4 +6,3 @@ from awlsim.core.cpu import * ...@@ -6,4 +6,3 @@ from awlsim.core.cpu import *
from awlsim.core.hardware import * from awlsim.core.hardware import *
from awlsim.core.parser import * from awlsim.core.parser import *
from awlsim.core.util import * from awlsim.core.util import *
from awlsim.core.version import *
...@@ -24,7 +24,6 @@ from awlsim.common.compat import * ...@@ -24,7 +24,6 @@ from awlsim.common.compat import *
from awlsim.common.project import * from awlsim.common.project import *
from awlsim.core.version import *
from awlsim.core.util import * from awlsim.core.util import *
from awlsim.core.parser import * from awlsim.core.parser import *
from awlsim.core.cpu import * from awlsim.core.cpu import *
......
...@@ -15,7 +15,7 @@ done ...@@ -15,7 +15,7 @@ done
hook_get_version() hook_get_version()
{ {
local file="$1/awlsim/core/version.py" local file="$1/awlsim/common/version.py"
local maj="$(cat "$file" | grep -e VERSION_MAJOR | head -n1 | awk '{print $3;}')" local maj="$(cat "$file" | grep -e VERSION_MAJOR | head -n1 | awk '{print $3;}')"
local min="$(cat "$file" | grep -e VERSION_MINOR | head -n1 | awk '{print $3;}')" local min="$(cat "$file" | grep -e VERSION_MINOR | head -n1 | awk '{print $3;}')"
version="$maj.$min" version="$maj.$min"
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
SET PATH=%PATH%;C:\WINDOWS;C:\WINDOWS\SYSTEM32;C:\PYTHON34;%ProgramFiles%\7-Zip SET PATH=%PATH%;C:\WINDOWS;C:\WINDOWS\SYSTEM32;C:\PYTHON34;%ProgramFiles%\7-Zip
py -c "from awlsim.core.version import VERSION_MAJOR, VERSION_MINOR; print('%%d.%%d' %% (VERSION_MAJOR, VERSION_MINOR))" > version.txt py -c "from awlsim.common.version import VERSION_MAJOR, VERSION_MINOR; print('%%d.%%d' %% (VERSION_MAJOR, VERSION_MINOR))" > version.txt
set /p version= < version.txt set /p version= < version.txt
set distdir=awlsim-win-standalone-%version% set distdir=awlsim-win-standalone-%version%
......
...@@ -11,7 +11,7 @@ import shutil ...@@ -11,7 +11,7 @@ import shutil
import hashlib import hashlib
from distutils.core import setup from distutils.core import setup
from distutils.extension import Extension from distutils.extension import Extension
from awlsim.core.version import VERSION_MAJOR, VERSION_MINOR from awlsim.common.version import VERSION_MAJOR, VERSION_MINOR
try: try:
import py2exe import py2exe
except ImportError as e: except ImportError as e:
......
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