Commit e3fd2525 authored by Eike Ziller's avatar Eike Ziller

Qbs build files: Install files to correct location

First step in fixing the Mac build

Change-Id: I86659b9b46c01fc17fd93b8ffc3b378d2b580c36
Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent ca2c9b5c
......@@ -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",
......
......@@ -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
}
}
}
......@@ -9,6 +9,6 @@ Product {
Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: "share/qtcreator/translations"
qbs.installDir: project.ide_data_path + "/translations"
}
}
......@@ -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 = [
......
......@@ -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
}
}
......@@ -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"
}
}
......@@ -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 {
......
......@@ -12,6 +12,6 @@ Application {
Group {
fileTagsFilter: product.type
qbs.install: true
qbs.installDir: "bin"
qbs.installDir: project.ide_app_path
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment