summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-08-29 16:57:28 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-08-30 13:25:27 +0200
commit184e47345349bb831f008143d1779444bcd5c79d (patch)
treedd97ab2846be1b1aeaba79d98c46bf012c496dc7 /dist
parentf3b6650e37226ac6e258db8bd5b2328e4a6118a4 (diff)
downloadqtenginio-184e47345349bb831f008143d1779444bcd5c79d.tar.gz
Move dlls to bin dir on windows
Change-Id: Ica07c04d3dcb67e62168978b2c801892aec78146 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'dist')
-rw-r--r--dist/create_installer.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/dist/create_installer.py b/dist/create_installer.py
index 84b618f..584df06 100644
--- a/dist/create_installer.py
+++ b/dist/create_installer.py
@@ -13,6 +13,7 @@ import os
import shutil
import subprocess
import sys
+import glob
# Qt
qmake = "qmake"
@@ -66,6 +67,14 @@ if sys.platform == "win32": # bug with jom subtargets
else:
subprocess.check_call([make, "docs"])
+
+# on Windows dlls are built in the lib dir but need to be in bin
+if sys.platform == "win32":
+ os.mkdir("bin")
+ alldlls = glob.glob("lib/*.dll")
+ for dll in alldlls:
+ os.rename(dll, "bin" + dll[3:])
+
# Copy files around
os.chdir("../..")
@@ -74,7 +83,10 @@ packages = {
"com.digia.enginioExamples": ["examples",],
"com.digia.enginioDocumentation": ["doc/qtenginio",],
"com.digia.enginioSources": ["src",],
- }
+}
+if sys.platform == "win32":
+ packages["com.digia.enginio"].append("bin")
+
print("Creating installer...")
@@ -110,7 +122,6 @@ for line in fileinput.input(".qmake.conf"):
privateHeaderPath = headerPath + VERSION + "/Enginio/private"
-import glob
allHeaders = glob.glob("src/*/*.h")
for header in allHeaders:
fileName = header[header.rindex(os.sep):]
@@ -125,7 +136,6 @@ for header in allHeaders:
os.chdir("dist")
-
# the Module .pri file is special - take the one from mkspecs/modules_inst
modulesPath = "packages/com.digia.enginio/data/mkspecs/modules"
os.mkdir("packages/com.digia.enginio/data/mkspecs")