feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qbs files: fix OS X checks

Browse Source 
Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Joerg Bornemann
2013-06-25 18:17:15 +02:00
parent ee70e9d267
commit 5a3c4cc8ef
10 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
qtcreator.qbs
View File

@@ -5,10 +5,10 @@ Project {
property string ide_version_minor: '7' property string ide_version_minor: '7'
property string ide_version_release: '84' property string ide_version_release: '84'
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
property string ide_app_path: qbs.targetOS.contains("mac") ? "" : "bin" property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
property string ide_app_target: qbs.targetOS.contains("mac") ? "Qt Creator" : "qtcreator" property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator"
property string ide_library_path: { property string ide_library_path: {
if (qbs.targetOS.contains("mac")) if (qbs.targetOS.contains("osx"))
return ide_app_target + ".app/Contents/PlugIns" return ide_app_target + ".app/Contents/PlugIns"
else if (qbs.targetOS.contains("windows")) else if (qbs.targetOS.contains("windows"))
return ide_app_path return ide_app_path
@@ -16,23 +16,23 @@ Project {
return "lib/qtcreator" return "lib/qtcreator"
} }
property string ide_plugin_path: { property string ide_plugin_path: {
if (qbs.targetOS.contains("mac")) if (qbs.targetOS.contains("osx"))
return ide_library_path return ide_library_path
else if (qbs.targetOS.contains("windows")) else if (qbs.targetOS.contains("windows"))
return "lib/qtcreator/plugins" return "lib/qtcreator/plugins"
else else
return ide_library_path + "/plugins" return ide_library_path + "/plugins"
} }
property string ide_data_path: qbs.targetOS.contains("mac") property string ide_data_path: qbs.targetOS.contains("osx")
? ide_app_target + ".app/Contents/Resources" ? ide_app_target + ".app/Contents/Resources"
: "share/qtcreator" : "share/qtcreator"
property string ide_libexec_path: qbs.targetOS.contains("mac") property string ide_libexec_path: qbs.targetOS.contains("osx")
? ide_data_path ? ide_data_path
: ide_app_path : ide_app_path
property string ide_doc_path: qbs.targetOS.contains("mac") property string ide_doc_path: qbs.targetOS.contains("osx")
? ide_data_path + "/doc" ? ide_data_path + "/doc"
: "share/doc/qtcreator" : "share/doc/qtcreator"
property string ide_bin_path: qbs.targetOS.contains("mac") property string ide_bin_path: qbs.targetOS.contains("osx")
? ide_app_target + ".app/Contents/MacOS" ? ide_app_target + ".app/Contents/MacOS"
: ide_app_path : ide_app_path
moduleSearchPaths: "qbs" moduleSearchPaths: "qbs"

4
src/app/app.qbs
View File

@@ -5,7 +5,7 @@ Application {
name: project.ide_app_target name: project.ide_app_target
consoleApplication: qbs.debugInformation consoleApplication: qbs.debugInformation
cpp.rpaths: qbs.targetOS.contains("mac") ? ["@executable_path/.."] cpp.rpaths: qbs.targetOS.contains("osx") ? ["@executable_path/.."]
: ["$ORIGIN/../lib/qtcreator"] : ["$ORIGIN/../lib/qtcreator"]
cpp.defines: Defaults.defines(qbs) cpp.defines: Defaults.defines(qbs)
cpp.linkerFlags: { cpp.linkerFlags: {
@@ -40,7 +40,7 @@ Application {
Group { Group {
name: "qtcreator.sh" name: "qtcreator.sh"
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac") condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
files: "../../bin/qtcreator.sh" files: "../../bin/qtcreator.sh"
qbs.install: true qbs.install: true
qbs.installDir: "bin" qbs.installDir: "bin"

2
src/libs/QtcLibrary.qbs
View File

@@ -14,7 +14,7 @@ DynamicLibrary {
return ["-Wl,-s"] return ["-Wl,-s"]
} }
cpp.installNamePrefix: "@rpath/PlugIns/" cpp.installNamePrefix: "@rpath/PlugIns/"
cpp.rpaths: qbs.targetOS.contains("mac") cpp.rpaths: qbs.targetOS.contains("osx")
? ["@loader_path/..", "@executable_path/.."] ? ["@loader_path/..", "@executable_path/.."]
: ["$ORIGIN", "$ORIGIN/.."] : ["$ORIGIN", "$ORIGIN/.."]
cpp.includePaths: [ ".", ".." ] cpp.includePaths: [ ".", ".." ]

4
src/libs/ssh/ssh.qbs
View File

@@ -58,7 +58,7 @@ QtcLibrary {
result.push("advapi32", "user32") result.push("advapi32", "user32")
else if (qbs.targetOS.contains("linux")) else if (qbs.targetOS.contains("linux"))
result.push("rt", "dl"); result.push("rt", "dl");
else if (qbs.targetOS.contains("mac")) else if (qbs.targetOS.contains("osx"))
result.push("dl"); result.push("dl");
else if (qbs.targetOS.contains("unix")) else if (qbs.targetOS.contains("unix"))
result.push("rt"); result.push("rt");
@@ -82,7 +82,7 @@ QtcLibrary {
"BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM", "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
"BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW", "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",
"BOTAN_HAS_ENTROPY_SRC_UNIX", "BOTAN_HAS_MUTEX_PTHREAD", "BOTAN_HAS_PIPE_UNIXFD_IO") "BOTAN_HAS_ENTROPY_SRC_UNIX", "BOTAN_HAS_MUTEX_PTHREAD", "BOTAN_HAS_PIPE_UNIXFD_IO")
if (qbs.targetOS.contains("mac")) if (qbs.targetOS.contains("osx"))
result.push("BOTAN_TARGET_OS_IS_DARWIN", "BOTAN_TARGET_OS_HAS_GETTIMEOFDAY", result.push("BOTAN_TARGET_OS_IS_DARWIN", "BOTAN_TARGET_OS_HAS_GETTIMEOFDAY",
"BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM", "BOTAN_HAS_ALLOC_MMAP", "BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM",
"BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW", "BOTAN_HAS_ENTROPY_SRC_EGD", "BOTAN_HAS_ENTROPY_SRC_FTW",

2
src/libs/utils/utils.qbs
View File

@@ -15,7 +15,7 @@ QtcLibrary {
] ]
} }
Properties { Properties {
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac") condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
cpp.dynamicLibraries: ["X11"] cpp.dynamicLibraries: ["X11"]
} }

2
src/plugins/QtcPlugin.qbs
View File

@@ -31,7 +31,7 @@ Product {
cpp.defines: Defaults.defines(qbs).concat([name.toUpperCase() + "_LIBRARY"]) cpp.defines: Defaults.defines(qbs).concat([name.toUpperCase() + "_LIBRARY"])
cpp.installNamePrefix: "@rpath/PlugIns/" + provider + "/" cpp.installNamePrefix: "@rpath/PlugIns/" + provider + "/"
cpp.rpaths: qbs.targetOS.contains("mac") ? ["@loader_path/../..", "@executable_path/.."] cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../..", "@executable_path/.."]
: ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."] : ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."]
cpp.linkerFlags: { cpp.linkerFlags: {
if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw")) if (qbs.buildVariant == "release" && (qbs.toolchain == "gcc" || qbs.toolchain == "mingw"))

2
src/plugins/clearcase/clearcase.qbs
View File

@@ -6,7 +6,7 @@ QtcPlugin {
name: "ClearCase" name: "ClearCase"
// provider: "AudioCodes" // provider: "AudioCodes"
condition: !qbs.targetOS.contains("mac") condition: !qbs.targetOS.contains("osx")
Depends { name: "Qt.widgets" } Depends { name: "Qt.widgets" }
Depends { name: "Core" } Depends { name: "Core" }

6
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -31,7 +31,7 @@ QtcPlugin {
] ]
} }
cpp.frameworks: qbs.targetOS.contains("mac") ? ["AppKit"] : undefined cpp.frameworks: qbs.targetOS.contains("osx") ? ["AppKit"] : undefined
files: [ files: [
"basefilewizard.cpp", "basefilewizard.cpp",
@@ -241,7 +241,7 @@ QtcPlugin {
Group { Group {
name: "ProgressManager_mac" name: "ProgressManager_mac"
condition: qbs.targetOS.contains("mac") condition: qbs.targetOS.contains("osx")
files: [ files: [
"macfullscreen.h", "macfullscreen.h",
"macfullscreen.mm", "macfullscreen.mm",
@@ -251,7 +251,7 @@ QtcPlugin {
Group { Group {
name: "ProgressManager_x11" name: "ProgressManager_x11"
condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("mac") condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("osx")
files: [ files: [
"progressmanager/progressmanager_x11.cpp", "progressmanager/progressmanager_x11.cpp",
] ]

2
src/plugins/debugger/debugger.qbs
View File

@@ -287,7 +287,7 @@ QtcPlugin {
Group { Group {
name: "LLDBOptions" name: "LLDBOptions"
condition: qbs.targetOS.contains("mac") condition: qbs.targetOS.contains("osx")
files: [ files: [
"lldblib/lldboptionspage.cpp", "lldblib/lldboptionspage.cpp",
"lldblib/lldboptionspage.h", "lldblib/lldboptionspage.h",

2
src/tools/sdktool/sdktool.qbs
View File

@@ -9,7 +9,7 @@ QtcTool {
Depends { name: "app_version_header" } Depends { name: "app_version_header" }
cpp.includePaths: "../../libs" cpp.includePaths: "../../libs"
cpp.defines: base.concat([qbs.targetOS.contains("mac") cpp.defines: base.concat([qbs.targetOS.contains("osx")
? 'DATA_PATH="."' : 'DATA_PATH="../share/qtcreator"']) ? 'DATA_PATH="."' : 'DATA_PATH="../share/qtcreator"'])
files: [ files: [