diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-10-26 03:00:05 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-10-29 16:52:00 +0000 |
| commit | 48aebfdaab1269069e2de1b74fbcdb0bcb78d5de (patch) | |
| tree | 600af965a04ec6fd8322dbeb208931dd2b4b2698 | |
| parent | 2d6ec966281278d66a67f2230f852d84a14f9ba1 (diff) | |
Add some additional environment variables for Info.plist replacement.
Change-Id: I2bf5f77c11fc3d8d1976b4bab1e456843d999dd4
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 8 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index 414a55222..efe085b47 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -155,6 +155,10 @@ Module { // private properties readonly property bool isShallowContents: product.type.contains("inapppurchase") + readonly property var extraEnv: ({ + "PRODUCT_BUNDLE_IDENTIFIER": identifier + }) + readonly property var qmakeEnv: { return { "BUNDLEIDENTIFIER": identifier, @@ -208,6 +212,7 @@ Module { cmd.infoPlist = ModUtils.moduleProperty(product, "infoPlist") || {}; cmd.processInfoPlist = ModUtils.moduleProperty(product, "processInfoPlist"); cmd.infoPlistFormat = ModUtils.moduleProperty(product, "infoPlistFormat"); + cmd.extraEnv = ModUtils.moduleProperty(product, "extraEnv"); cmd.qmakeEnv = ModUtils.moduleProperty(product, "qmakeEnv"); cmd.buildEnv = product.moduleProperty("cpp", "buildEnv"); @@ -307,6 +312,9 @@ Module { } env["MAC_OS_X_PRODUCT_BUILD_VERSION"] = osBuildVersion; + for (key in extraEnv) + env[key] = extraEnv[key]; + for (key in buildEnv) env[key] = buildEnv[key]; diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index 83248a845..11171d1f2 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -113,6 +113,7 @@ UnixGCC { // private properties readonly property var buildEnv: { var env = { + "ARCHS_STANDARD": targetArch, // TODO: this will be affected by multi-arch support "EXECUTABLE_NAME": product.targetName, "LANG": "en_US.US-ASCII", "PRODUCT_NAME": product.name |