diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2013-05-09 17:14:56 -0400 |
---|---|---|
committer | Jake Petroules <jake.petroules@petroules.com> | 2015-04-30 03:36:34 +0000 |
commit | 8ce511b8ae46f81aaafc93c191308ff950f6fe02 (patch) | |
tree | a28037afbf13f7de07137be0fc2e1a8dc09e736f /src/lib/corelib/api/runenvironment.cpp | |
parent | aee8631573f7a75772fd61646c87824410c45a0c (diff) |
Add support for building Common Language Infrastructure assemblies.
Currently includes support for C#, F#, and Visual Basic.
Task-number: QBS-227
Change-Id: I6c82ad2dda6e99b407e31683ccdb3e355b21b21f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'src/lib/corelib/api/runenvironment.cpp')
-rw-r--r-- | src/lib/corelib/api/runenvironment.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/corelib/api/runenvironment.cpp b/src/lib/corelib/api/runenvironment.cpp index 59430ce34..d039fc469 100644 --- a/src/lib/corelib/api/runenvironment.cpp +++ b/src/lib/corelib/api/runenvironment.cpp @@ -158,6 +158,11 @@ int RunEnvironment::runTarget(const QString &targetBin, const QStringList &argum QLatin1String("qbs"), QLatin1String("targetOS")).toStringList(); + const QStringList toolchain = PropertyFinder().propertyValue( + d->resolvedProduct->moduleProperties->value(), + QLatin1String("qbs"), + QLatin1String("toolchain")).toStringList(); + QString targetExecutable = targetBin; QStringList targetArguments = arguments; const QString completeSuffix = QFileInfo(targetBin).completeSuffix(); @@ -176,6 +181,11 @@ int RunEnvironment::runTarget(const QString &targetBin, const QStringList &argum } } + if (toolchain.contains(QLatin1String("mono"))) { + targetArguments.prepend(targetExecutable); + targetExecutable = QLatin1String("mono"); + } + if (completeSuffix == QLatin1String("js")) { // The Node.js binary is called nodejs on Debian/Ubuntu-family operating systems due to a // conflict with another package containing a binary named node |