diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2013-06-19 13:25:48 -0400 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-09-09 10:15:06 +0200 |
commit | 443621ce2d2ac7ed99af8f29dba90c0ae5a16748 (patch) | |
tree | 978ef8d6b859b90fad2e910eacb0de54472d3daf /share/qbs/modules/cpp/DarwinGCC.qbs | |
parent | 679ec570fafcc4d5903b53c92b67af57fd4de46e (diff) |
Move Interface Builder document handling to its own module.
New/changed functionality:
- Properly sets minimum OS deployment target.
- Works if sysroot is not set.
- Provide some options for the user to set.
- Custom flags to ibtool compiler.
- Support both xib and nib extensions.
Task-number: QBS-328
Change-Id: I8702e83ddc31b00eef8ff72fb1b3fb8341babcc9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share/qbs/modules/cpp/DarwinGCC.qbs')
-rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 54 |
1 files changed, 2 insertions, 52 deletions
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index 77257041c..5c4f70010 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -299,7 +299,7 @@ UnixGCC { Rule { multiplex: true - inputs: ["application", "infoplist", "pkginfo", "dsym", "nib", "resourcerules", "ipa"] + inputs: ["application", "infoplist", "pkginfo", "dsym", "compiled_nib", "resourcerules", "ipa"] Artifact { fileName: product.destinationDirectory + "/" + BundleTools.wrapperName(product) @@ -317,7 +317,7 @@ UnixGCC { Rule { multiplex: true - inputs: ["dynamiclibrary", "infoplist", "pkginfo", "dsym", "nib"] + inputs: ["dynamiclibrary", "infoplist", "pkginfo", "dsym", "compiled_nib"] Artifact { fileName: product.destinationDirectory + "/" + BundleTools.wrapperName(product) @@ -346,54 +346,4 @@ UnixGCC { return commands; } } - - FileTagger { - pattern: "*.xib" - fileTags: ["xib"] - } - - Rule { - inputs: ["xib"] - explicitlyDependsOn: ["infoplist"] - - Artifact { - fileName: { - var path = product.destinationDirectory; - - var xibFilePath = input.baseDir + '/' + input.fileName; - var key = DarwinTools.localizationKey(xibFilePath); - if (key) { - path += '/' + BundleTools.localizedResourcesFolderPath(product, key); - var subPath = DarwinTools.relativeResourcePath(xibFilePath); - if (subPath && subPath !== '.') - path += '/' + subPath; - } else { - path += '/' + BundleTools.unlocalizedResourcesFolderPath(product); - path += '/' + input.baseDir; - } - - return path + '/' + input.completeBaseName + ".nib"; - } - - fileTags: ["nib"] - } - - prepare: { - var cmd = new Command("ibtool", [ - '--output-format', 'human-readable-text', - '--warnings', '--errors', '--notices', - '--compile', output.fileName, input.fileName, - '--sdk', product.moduleProperty("qbs", "sysroot")]); - - cmd.description = 'ibtool ' + FileInfo.fileName(input.fileName); - - // Also display the language name of the XIB being compiled if it has one - var localizationKey = DarwinTools.localizationKey(input.fileName); - if (localizationKey) - cmd.description += ' (' + localizationKey + ')'; - - cmd.highlight = 'compiler'; - return cmd; - } - } } |