aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-08-21 14:23:40 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-08-21 16:04:57 +0200
commitee996a6620ecada0068804b236cf24e2ffef37ea (patch)
tree77274d02929291a41329636c8ac6573d6bac839f /dist
parentcdf0f729ca8847624933a69e39f63c58a1cff9c8 (diff)
Use the version string from .qmake.conf for installers
Change-Id: I85fde0e8e36ec892a53ad45f78e60ddded688b32 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'dist')
-rw-r--r--dist/create_installer.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/dist/create_installer.py b/dist/create_installer.py
index fa449b3..508a410 100644
--- a/dist/create_installer.py
+++ b/dist/create_installer.py
@@ -28,6 +28,8 @@ binarycreator = "binarycreator"
# visual studio
#setEnv = "c:\\Program Files\\Microsoft SDKs\\Windows\\v7.1\\Bin\\SetEnv.Cmd"
+# should be extracted from .qmake.conf
+VERSION = "unknown_version"
# Build Enginio
@@ -99,8 +101,14 @@ for package in packages:
# src/enginio_plugin
headerPath = "dist/packages/com.digia.enginio/data/include/Enginio/"
-#FIXME FIXME FIXME version string
-privateHeaderPath = headerPath + "0.5.0/Enginio/private"
+import fileinput
+for line in fileinput.input(".qmake.conf"):
+ if line.startswith("MODULE_VERSION"):
+ import re
+ VERSION = re.search(r'[0-9.]+', line).group(0)
+
+
+privateHeaderPath = headerPath + VERSION + "/Enginio/private"
import glob
allHeaders = glob.glob("src/*/*.h")
for header in allHeaders:
@@ -124,6 +132,6 @@ os.mkdir(modulesPath)
shutil.copyfile("build/mkspecs/modules-inst/qt_lib_enginio.pri", modulesPath + "/qt_lib_enginio.pri")
-subprocess.check_call([binarycreator, "-c", "config" + os.sep + "config.xml", "-p", "packages", "EnginioInstaller"])
+subprocess.check_call([binarycreator, "-c", "config" + os.sep + "config.xml", "-p", "packages", "EnginioInstaller_" + VERSION])
print("Installer created.")