summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2012-10-09 15:48:00 +0200
committerEike Ziller <eike.ziller@digia.com>2012-10-10 09:11:47 +0200
commitf3d30dfba177ec7e165f0d9ced3587ed16ed605c (patch)
tree8faa77416b594c1855d4024bb48341df420dd908 /scripts
parentd2a07dfa0dd585869db63f3b1ed3f6ef93ac61d2 (diff)
downloadqt-creator-f3d30dfba177ec7e165f0d9ced3587ed16ed605c.tar.gz
Fix installation directory and add version to title.
Task-number: QTCREATORBUG-7991 Change-Id: I4874527fc07040dea803bf50e1e4c335d9eb6810 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/packageIfw.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/scripts/packageIfw.py b/scripts/packageIfw.py
index 82bddc7b72..c6f55bc265 100755
--- a/scripts/packageIfw.py
+++ b/scripts/packageIfw.py
@@ -86,8 +86,15 @@ def main():
raise Exception('Archive not specified (--archive)!')
installer_name = args[0]
+ config_postfix = ''
if sys.platform == 'darwin':
installer_name = installer_name + '.dmg'
+ if sys.platform.startswith('win'):
+ config_postfix = '-windows'
+ if sys.platform.startswith('linux'):
+ config_postfix = '-linux'
+
+ config_name = 'config' + config_postfix + '.xml'
try:
temp_dir = tempfile.mkdtemp()
@@ -121,7 +128,7 @@ def main():
os.makedirs(data_path)
shutil.copy(archive, data_path)
- ifw_call = [os.path.join(ifw_location, 'bin', 'binarycreator'), '-c', os.path.join(out_config_dir, 'config.xml'), '-p', out_packages_dir, installer_name, '--offline-only' ]
+ ifw_call = [os.path.join(ifw_location, 'bin', 'binarycreator'), '-c', os.path.join(out_config_dir, config_name), '-p', out_packages_dir, installer_name, '--offline-only' ]
subprocess.check_call(ifw_call, stderr=subprocess.STDOUT)
finally:
print 'Cleaning up...'