lp:qbs

Branch merges

This import branch has no branches proposed for merge into it.

No branches dependent on this one.

Related source package recipes

2 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

3388. By Christian Kandeler <email address hidden> on 2017-12-08

Fix setupRunEnvironment autotest for mingw

Change-Id: I9cc91977cffe2ed4b77be7b90f3d91e6a9751c06
Reviewed-by: Jake Petroules <email address hidden>

3387. By Jake Petroules <email address hidden> on 2017-12-08

MinGW: add missing 'config' property in call to setupRunEnvironment

Change-Id: Ia65748dd6c401ecb896ffb6968c44d7b782eb969
Reviewed-by: Christian Kandeler <email address hidden>

3386. By Jake Petroules <email address hidden> on 2017-12-08

Uncomment a platform check now that the respective properties exist

Change-Id: Ia7ec169eac2d5381137771a92ccb25c01c17245b
Reviewed-by: Christian Kandeler <email address hidden>

3385. By Jake Petroules <email address hidden> on 2017-12-08

Rewrite rpath handling for binaries that are a part of Qbs itself

Exporting a list of rpaths from a target is completely bogus as-is,
because a target cannot know a dependee's install location relative to
itself. This patch instead has each target category (executables in bin,
libraries in lib, libexec binaries in libexec/qbs, and plugins in
lib/qbs/plugins) set its relative installation directory at the product
level, and then an appropriate rpath is created for the target by
calculating a relative path from the target to the lib directory in the
context of an installed build. This also has the advantage that rpaths
are now calculated dynamically at build time rather than hardcoded, so
if a user changes the directory depth of pluginsInstallDir, for example,
everything will be adjusted automatically. Each target also therefore
now has an rpath pointing exactly to its immediate dependencies, instead
of relying on the parent process to inherit the rpath entries. Among
simply being correct, this also has the advantage that any target can
now be loaded correctly by another process which itself sets no rpath
happening to point to the qbs lib directory.

Change-Id: I8fdf24b74ef60426cea0930b7941479919226fd2
Reviewed-by: Christian Kandeler <email address hidden>

3384. By Jake Petroules <email address hidden> on 2017-12-08

Introduce cpp.rpathOrigin

[ChangeLog] Added property cpp.rpathOrigin which evaluates to
@loader_path on Darwin and $ORIGIN on other Unix-like platforms.

Change-Id: If5770a83ae32f29ee520fd00b07ed8f0caf6bd48
Reviewed-by: Christian Kandeler <email address hidden>

3383. By Christian Kandeler <email address hidden> on 2017-12-08

setupRunEnvironment: Remove redundant code

The functionality was already present in ModUtils.

Change-Id: I36ee3b6eee0817448db1ef7e95eb6f72a5ac99c9
Reviewed-by: Jake Petroules <email address hidden>

3382. By Jake Petroules <email address hidden> on 2017-12-07

macOS: set a compatibility version on our shared libraries

Qbs currently promises BC for the same minor release. Therefore, set the
compatibility version to the same as the SONAME version. In addition to
the mere declaration for correctness, this also helps to allow the OS
to prevent loading a mismatched qbs binary and libraries if such a
situation happens to occur.

Change-Id: Ic1cfdcab29e1efd6c51872d650d77f2ea7f2bbf1
Reviewed-by: Christian Kandeler <email address hidden>

3381. By Christian Kandeler <email address hidden> on 2017-12-07

Get rid of all remaining dynamic_casts

This speeds up rule execution by another 2%.

Change-Id: If819144f2c01bd243ec98f7a6d050bc5faa2b02c
Reviewed-by: Jake Petroules <email address hidden>

3380. By Christian Kandeler <email address hidden> on 2017-12-07

Do not use the set class outside corelib

It was and is meant for internal use only.

Change-Id: Ibe15f5838f9b728ec397a668a94128abe4ef5efa
Reviewed-by: Jake Petroules <email address hidden>

3379. By Jake Petroules <email address hidden> on 2017-12-07

Add the qbs.toolchainType property

[ChangeLog] Added the qbs.toolchainType property, which is a scalar
version of the qbs.toolchain property and is used to set the current
toolchain.

Change-Id: I65b2ac44c0be0ea79fd0b1699f8f77c93def3437
Reviewed-by: Christian Kandeler <email address hidden>