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>

dist/installer/ifw/config/config-linux.xml.in

+<?xml version="1.0"?>
+<Installer>
+    <Name>Qt Creator</Name>
+    <Version>{version}</Version>
+    <Title>Qt Creator {version}</Title>
+    <MaintenanceTitle>Qt Creator Maintenance</MaintenanceTitle>
+    <Publisher>Qt Project</Publisher>
+    <ProductUrl>http://qt-project.org</ProductUrl>
+
+    <Icon>logo.png</Icon>
+    <Watermark>watermark.png</Watermark>
+    <UninstallerName>QtCreatorUninstaller</UninstallerName>
+    <!-- @homeDir@ and @rootDir@ are some of the supported vars -->
+    <TargetDir>@homeDir@/qtcreator-{version}</TargetDir>
+    <AdminTargetDir>/opt/qtcreator-{version}</AdminTargetDir>
+
+    <Pages>
+      <Page name="LicenseAgreementPage">
+        <AcceptLicenseLabel>I have read and understood the terms contained in the above license agreements.</AcceptLicenseLabel>
+        <RejectLicenseLabel>I do not accept the terms contained in the above license agreements.</RejectLicenseLabel>
+      </Page>
+    </Pages>
+
+</Installer>

dist/installer/ifw/config/config.xml.in → dist/installer/ifw/config/config-windows.xml.in

@@ -2,7 +2,7 @@
 <Installer>
     <Name>Qt Creator</Name>
     <Version>{version}</Version>
-    <Title>Qt Creator</Title>
+    <Title>Qt Creator {version}</Title>
     <MaintenanceTitle>Qt Creator Maintenance</MaintenanceTitle>
     <Publisher>Qt Project</Publisher>
     <ProductUrl>http://qt-project.org</ProductUrl>
@@ -11,8 +11,7 @@
     <Watermark>watermark.png</Watermark>
     <UninstallerName>QtCreatorUninstaller</UninstallerName>
     <!-- @homeDir@ and @rootDir@ are some of the supported vars -->
-    <TargetDir>@homeDir@/QtCreator</TargetDir>
-    <AdminTargetDir>/opt/QtCreator</AdminTargetDir>
+    <TargetDir>@rootDir@/QtCreator/qtcreator-{version}</TargetDir>
 
     <Pages>
       <Page name="LicenseAgreementPage">

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...'