feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
6b6ad446ebdff5709278e299f525dba6173f3427
qt-creator/qtcreator.qbs

71 lines
2.8 KiB
QML
Raw Normal View History

use new base import style in qbs files Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 11:30:14 +01:00
import qbs 1.0
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
Project {
Adapt to qbs' libexec infrastructure. Change-Id: Ic2d609e017d201b7b3e0b3bcb08359652428aeaa Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-06-03 17:07:29 +02:00
name: "Qt Creator"
qbs build: Make use of AutotestRunner. And fix some autotest project file problems uncovered by this. Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-12-18 11:23:03 +01:00
minimumQbsVersion: "1.4"
Add qbs project files for autotests. Note: Since not all autotests are able to run from an installed location, we need to be able to start them from the build directory, which in turn forces us to set a destination directory for libraries and plugins, so they will be found at run-time. Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-26 17:50:02 +02:00
property bool withAutotests: qbs.buildVariant === "debug"
Version bump Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
2013-10-04 17:07:23 +02:00
property string ide_version_major: '3'
Version bump Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-10 14:21:50 +02:00
property string ide_version_minor: '5'
property string ide_version_release: '81'
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release
Version bump Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
2013-10-04 17:07:23 +02:00
property string ide_compat_version_major: '3'
Version bump Change-Id: I3176d21a40001779bf6c19b05a3f9ff068695a8e Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-10 14:21:50 +02:00
property string ide_compat_version_minor: '5'
property string ide_compat_version_release: '81'
Add QTCREATOR_COMPAT_VERSION Necessary for keeping compatibility within a minor series. When bumping versions, the compatVersion now needs to be taken into account too. Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-05 10:40:51 +02:00
property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release
qbs project files: Add project property ide_source_tree. The qmake project has this as well. Will become more useful later on. Change-Id: I6e9b6b1d1a46ea6263a6d5fac4cb30d883a3e077 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-05 14:56:45 +02:00
property path ide_source_tree: path
qbs files: fix OS X checks 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>
2013-06-25 18:17:15 +02:00
property string ide_app_path: qbs.targetOS.contains("osx") ? "" : "bin"
property string ide_app_target: qbs.targetOS.contains("osx") ? "Qt Creator" : "qtcreator"
qbs project: Add properties for pulling in additional resources. We need this to build plugins located outside the source tree. Change-Id: Ie587b5e838bf0ce67b19d3222bbc40b53b888e69 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-01 10:33:41 +02:00
property pathList additionalPlugins: []
property pathList additionalLibs: []
property pathList additionalTools: []
qbs build: Add the possibility to include additional autotests. For plugins that don't live in the main repo. Change-Id: Iebe4b05bfb60f86531ec82a4ae555fdfaac39ead Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-01-23 17:47:29 +01:00
property pathList additionalAutotests: []
qbs build: Introduce convenience project property sharedSourcesDir. Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-18 15:35:45 +01:00
property string sharedSourcesDir: path + "/src/shared"
Support configurable library location in qbs build. And also in the qbs sub-project (for the qbs and qmake builds). This becomes possible with the qbs submodule update that is part of this patch. Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-27 18:18:54 +01:00
property string libDirName: "lib"
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>
2013-04-19 16:20:22 +02:00
property string ide_library_path: {
qbs files: fix OS X checks 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>
2013-06-25 18:17:15 +02:00
if (qbs.targetOS.contains("osx"))
Fix library and plugin paths OSX: Move libraries from PlugIns/ to Frameworks/ other: move QmlDesigner plugins to plugins directory Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-26 13:26:21 +02:00
return ide_app_target + ".app/Contents/Frameworks"
update qbs files Use the new contains function and the targetOS list. Change-Id: I38b995eb9328e449befad85792512c45670cc8c9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 14:43:33 +02:00
else if (qbs.targetOS.contains("windows"))
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>
2013-04-19 16:20:22 +02:00
return ide_app_path
else
Support configurable library location in qbs build. And also in the qbs sub-project (for the qbs and qmake builds). This becomes possible with the qbs submodule update that is part of this patch. Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-27 18:18:54 +01:00
return libDirName + "/qtcreator"
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>
2013-04-19 16:20:22 +02:00
}
property string ide_plugin_path: {
qbs files: fix OS X checks 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>
2013-06-25 18:17:15 +02:00
if (qbs.targetOS.contains("osx"))
Fix library and plugin paths OSX: Move libraries from PlugIns/ to Frameworks/ other: move QmlDesigner plugins to plugins directory Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-26 13:26:21 +02:00
return ide_app_target + ".app/Contents/PlugIns"
update qbs files Use the new contains function and the targetOS list. Change-Id: I38b995eb9328e449befad85792512c45670cc8c9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 14:43:33 +02:00
else if (qbs.targetOS.contains("windows"))
Support configurable library location in qbs build. And also in the qbs sub-project (for the qbs and qmake builds). This becomes possible with the qbs submodule update that is part of this patch. Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-27 18:18:54 +01:00
return libDirName + "/qtcreator/plugins"
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>
2013-04-19 16:20:22 +02:00
else
return ide_library_path + "/plugins"
}
qbs files: fix OS X checks 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>
2013-06-25 18:17:15 +02:00
property string ide_data_path: qbs.targetOS.contains("osx")
update qbs files Use the new contains function and the targetOS list. Change-Id: I38b995eb9328e449befad85792512c45670cc8c9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 14:43:33 +02:00
? ide_app_target + ".app/Contents/Resources"
: "share/qtcreator"
qbs files: fix OS X checks 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>
2013-06-25 18:17:15 +02:00
property string ide_libexec_path: qbs.targetOS.contains("osx")
Use a proper libexec path for Unix builds. Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-03 15:39:49 +02:00
? ide_data_path : qbs.targetOS.contains("windows")
? ide_app_path
: "libexec/qtcreator"
qbs files: fix OS X checks 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>
2013-06-25 18:17:15 +02:00
property string ide_doc_path: qbs.targetOS.contains("osx")
update qbs files Use the new contains function and the targetOS list. Change-Id: I38b995eb9328e449befad85792512c45670cc8c9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 14:43:33 +02:00
? ide_data_path + "/doc"
: "share/doc/qtcreator"
qbs files: fix OS X checks 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>
2013-06-25 18:17:15 +02:00
property string ide_bin_path: qbs.targetOS.contains("osx")
update qbs files Use the new contains function and the targetOS list. Change-Id: I38b995eb9328e449befad85792512c45670cc8c9 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 14:43:33 +02:00
? ide_app_target + ".app/Contents/MacOS"
: ide_app_path
qbs build: Adapt to function renaming. Change-Id: Ia4cc4447e59aaa4f283a7818847633bb7cf9a8aa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-04-15 16:31:27 +02:00
property bool testsEnabled: qbs.getEnv("TEST") || qbs.buildVariant === "debug"
Move some functions out of defaults.js and make them project properties. The one that is left is the only one that's actually a function taking real input. This saves a number of includes. Change-Id: I77e777bbf6ed7ed4086f9a40de4dc3dd8c91a7af Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-05 17:24:24 +02:00
property stringList generalDefines: [
"QT_CREATOR",
Support configurable library location in qbs build. And also in the qbs sub-project (for the qbs and qmake builds). This becomes possible with the qbs submodule update that is part of this patch. Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-27 18:18:54 +01:00
'IDE_LIBRARY_BASENAME="' + libDirName + '"',
Move some functions out of defaults.js and make them project properties. The one that is left is the only one that's actually a function taking real input. This saves a number of includes. Change-Id: I77e777bbf6ed7ed4086f9a40de4dc3dd8c91a7af Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-05 17:24:24 +02:00
"QT_NO_CAST_TO_ASCII",
"QT_NO_CAST_FROM_ASCII"
].concat(testsEnabled ? ["WITH_TESTS"] : [])
qbs project files: Make use of new qbsSearchPaths property. Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-02 17:52:45 +02:00
qbsSearchPaths: "qbs"
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
references: [
Refactor qbs project files. - Use sub-projects. - Move the main application and the application header products into dedicated files. As a result, qtcreator.qbs becomes much simpler to understand, consisting now of just a bunch of global properties and a few sub-project references. Change-Id: Ic7300d489d3982394be5ad1d12a79a2914320298 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-21 13:12:30 +02:00
"src/src.qbs",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"share/share.qbs",
qbs files: Generate translations Change-Id: Ia8e486e377a0858974fd6503f85762bb34039786 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-24 12:02:35 +02:00
"share/qtcreator/translations/translations.qbs",
Add qbs project files for autotests. Note: Since not all autotests are able to run from an installed location, we need to be able to start them from the build directory, which in turn forces us to set a destination directory for libraries and plugins, so they will be found at run-time. Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-08-26 17:50:02 +02:00
"tests/tests.qbs"
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
]
qbs build: Make use of AutotestRunner. And fix some autotest project file problems uncovered by this. Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-12-18 11:23:03 +01:00
AutotestRunner {}
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
}
Copy Permalink