Qbs build files: Install files to correct location

First step in fixing the Mac build

Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

8 files changed, 39 insertions, 16 deletions

diff --git a/lib/qtcreator/qtcomponents/qtcomponents.qbs b/lib/qtcreator/qtcomponents/qtcomponents.qbs
index 02feb04119d..e3e7a5e6010 100644
--- a/lib/qtcreator/qtcomponents/qtcomponents.qbs
+++ b/lib/qtcreator/qtcomponents/qtcomponents.qbs
@@ -5,7 +5,8 @@ Product {
 
     Group {
         qbs.install: true
-        qbs.installDir: "lib/qtcreator/qtcomponents/"
+        qbs.installDir: (qbs.targetOS == "windows" ? "lib/qtcreator" : project.ide_library_path)
+                        + "/qtcomponents"
         files: [
             "*.qml",
             "qmldir",
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 02b36a2066f..ba93b13540b 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -3,10 +3,37 @@ import qbs.fileinfo as FileInfo
 import "qbs/defaults.js" as Defaults
 
 Project {
+
     property string ide_version_major: '2'
     property string ide_version_minor: '7'
     property string ide_version_release: '81'
     property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
+    property string ide_app_path: qbs.targetOS == "mac" ? "" : "bin"
+    property string ide_app_target: qbs.targetOS == "mac" ? "Qt Creator" : "qtcreator"
+    property string ide_library_path: {
+        if (qbs.targetOS == "mac")
+            return ide_app_target + ".app/Contents/PlugIns"
+        else if (qbs.targetOS == "windows")
+            return ide_app_path
+        else
+            return "lib/qtcreator"
+    }
+    property string ide_plugin_path: {
+        if (qbs.targetOS == "mac")
+            return ide_library_path
+        else if (qbs.targetOS == "windows")
+            return "lib/qtcreator/plugins"
+        else
+            return ide_library_path + "/plugins"
+    }
+    property string ide_data_path: qbs.targetOS == "mac" ? ide_app_target + ".app/Contents/Resources"
+                                                         : "share/qtcreator"
+    property string ide_libexec_path: qbs.targetOS == "mac" ? ide_data_path
+                                                            : ide_app_path
+    property string ide_doc_path: qbs.targetOS == "mac" ? ide_data_path + "/doc"
+                                                        : "share/doc/qtcreator"
+    property string ide_bin_path: qbs.targetOS == "mac" ? ide_app_target + ".app/Contents/MacOS"
+                                                        : ide_app_path
     moduleSearchPaths: "qbs"
 
     references: [
@@ -140,7 +167,7 @@ Project {
     }
 
     Application {
-        name: "qtcreator"
+        name: project.ide_app_target
         consoleApplication: qbs.debugInformation
 
         cpp.rpaths: ["$ORIGIN/../lib/qtcreator"]
@@ -176,7 +203,7 @@ Project {
         ]
 
         Group {
-            condition: qbs.targetPlatform.indexOf("unix") != -1
+            condition: qbs.targetPlatform.indexOf("unix") != -1 && qbs.targetOS != "mac"
             files: "bin/qtcreator.sh"
             qbs.install: true
             qbs.installDir: "bin"
@@ -199,7 +226,7 @@ Project {
         Group {
             fileTagsFilter: product.type
             qbs.install: true
-            qbs.installDir: "bin"
+            qbs.installDir: project.ide_app_path
         }
     }
 }
diff --git a/share/qtcreator/translations/translations.qbs b/share/qtcreator/translations/translations.qbs
index f6fc8f88130..5f9dba66398 100644
--- a/share/qtcreator/translations/translations.qbs
+++ b/share/qtcreator/translations/translations.qbs
@@ -9,6 +9,6 @@ Product {
     Group {
         fileTagsFilter: product.type
         qbs.install: true
-        qbs.installDir: "share/qtcreator/translations"
+        qbs.installDir: project.ide_data_path + "/translations"
     }
 }
diff --git a/share/share.qbs b/share/share.qbs
index e998dcbc7fa..7f4689d33f5 100644
--- a/share/share.qbs
+++ b/share/share.qbs
@@ -5,7 +5,7 @@ Product {
 
     Group {
         qbs.install: true
-        qbs.installDir: "share/qtcreator"
+        qbs.installDir: project.ide_data_path
         prefix: "qtcreator/"
         files: [
             "designer",
@@ -26,7 +26,7 @@ Product {
 
     Group {
         qbs.install: true
-        qbs.installDir: "share/qtcreator/externaltools"
+        qbs.installDir: project.ide_data_path + "/externaltools"
         prefix: "../src/share/qtcreator/externaltools/"
         files: {
             var list = [
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 3672957743b..c15baeec1c5 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -23,11 +23,6 @@ DynamicLibrary {
     Group {
         fileTagsFilter: product.type
         qbs.install: true
-        qbs.installDir: {
-            if (qbs.targetOS == "windows")
-                return "bin"
-            else
-                return "lib/qtcreator"
-        }
+        qbs.installDir: project.ide_library_path
     }
 }
diff --git a/src/libs/qtcomponents/styleitem/styleitem.qbs b/src/libs/qtcomponents/styleitem/styleitem.qbs
index 3577fe4712d..6d948222f98 100644
--- a/src/libs/qtcomponents/styleitem/styleitem.qbs
+++ b/src/libs/qtcomponents/styleitem/styleitem.qbs
@@ -32,6 +32,6 @@ DynamicLibrary {
     Group {
         fileTagsFilter: product.type
         qbs.install: true
-        qbs.installDir: "lib/qtcreator/qtcomponents/plugin"
+        qbs.installDir: project.ide_library_path + "/qtcomponents/plugin"
     }
 }
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 0535da287b0..4202310baff 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -45,7 +45,7 @@ Product {
     Group {
         fileTagsFilter: product.type
         qbs.install: true
-        qbs.installDir: "lib/qtcreator/plugins/" + provider
+        qbs.installDir: project.ide_plugin_path + "/" + provider
     }
 
     ProductModule {
diff --git a/src/tools/QtcTool.qbs b/src/tools/QtcTool.qbs
index 2ae70db106a..854ea5f0e30 100644
--- a/src/tools/QtcTool.qbs
+++ b/src/tools/QtcTool.qbs
@@ -12,6 +12,6 @@ Application {
     Group {
         fileTagsFilter: product.type
         qbs.install: true
-        qbs.installDir: "bin"
+        qbs.installDir: project.ide_app_path
     }
 }