diff options
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 945335d218..e773619b38 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: '2' + 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: [ @@ -61,6 +88,7 @@ Project { "src/plugins/perforce/perforce.qbs", "src/plugins/projectexplorer/projectexplorer.qbs", "src/plugins/qbsprojectmanager/qbsprojectmanager.qbs", + "src/plugins/pythoneditor/pythoneditor.qbs", // "src/plugins/qmldesigner/qmldesigner.qbs", "src/plugins/qmljseditor/qmljseditor.qbs", "src/plugins/qmljstools/qmljstools.qbs", @@ -139,10 +167,11 @@ Project { } Application { - name: "qtcreator" + name: project.ide_app_target consoleApplication: qbs.debugInformation - cpp.rpaths: ["$ORIGIN/../lib/qtcreator"] + cpp.rpaths: qbs.targetOS == "mac" ? ["@executable_path/.."] + : ["$ORIGIN/../lib/qtcreator"] cpp.defines: Defaults.defines(qbs) cpp.linkerFlags: { if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")) @@ -175,7 +204,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" @@ -198,7 +227,7 @@ Project { Group { fileTagsFilter: product.type qbs.install: true - qbs.installDir: "bin" + qbs.installDir: project.ide_app_path } } } |