aboutsummaryrefslogtreecommitdiffstats
path: root/share/qbs/modules
diff options
context:
space:
mode:
Diffstat (limited to 'share/qbs/modules')
-rw-r--r--share/qbs/modules/bundle/BundleModule.qbs36
-rw-r--r--share/qbs/modules/cpp/CppModule.qbs5
-rw-r--r--share/qbs/modules/cpp/gcc.js13
-rw-r--r--share/qbs/modules/cpp/ios-gcc.qbs34
-rw-r--r--share/qbs/modules/xcode/xcode.js51
-rw-r--r--share/qbs/modules/xcode/xcode.qbs48
6 files changed, 159 insertions, 28 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs
index c553946d8..d1dee8e14 100644
--- a/share/qbs/modules/bundle/BundleModule.qbs
+++ b/share/qbs/modules/bundle/BundleModule.qbs
@@ -426,7 +426,7 @@ Module {
condition: qbs.targetOS.contains("darwin")
multiplex: true
inputs: ["infoplist", "pkginfo", "hpp",
- "icns", "resourcerules", "ipa",
+ "icns", "resourcerules",
"compiled_nib", "compiled_storyboard", "compiled_assetcatalog"]
outputFileTags: ["bundle",
@@ -610,12 +610,36 @@ Module {
if (cmd.sources && cmd.sources.length)
commands.push(cmd);
- if (product.type.contains("application") && product.moduleProperty("qbs", "hostOS").contains("darwin")) {
+ if (product.moduleProperty("qbs", "hostOS").contains("darwin")) {
for (i in bundles) {
- cmd = new Command(ModUtils.moduleProperty(product, "lsregisterPath"),
- ["-f", bundles[i].filePath]);
- cmd.description = "register " + ModUtils.moduleProperty(product, "bundleName");
- commands.push(cmd);
+ var actualSigningIdentity = product.moduleProperty("xcode", "actualSigningIdentity");
+ var codesignDisplayName = product.moduleProperty("xcode", "actualSigningIdentityDisplayName");
+ if (actualSigningIdentity) {
+ // If this is a framework, we need to sign its versioned directory
+ var subpath = "";
+ var frameworkVersion = ModUtils.moduleProperty(product, "frameworkVersion");
+ if (frameworkVersion) {
+ subpath = ModUtils.moduleProperty(product, "contentsFolderPath");
+ subpath = subpath.substring(subpath.indexOf(ModUtils.moduleProperty("qbs", "pathSeparator")));
+ }
+
+ cmd = new Command(product.moduleProperty("xcode", "codesignPath"),
+ (product.moduleProperty("xcode", "codesignFlags") || [])
+ .concat(["--force", "--sign", actualSigningIdentity,
+ bundles[i].filePath + subpath]));
+ cmd.description = "codesign "
+ + ModUtils.moduleProperty(product, "bundleName")
+ + " using " + codesignDisplayName
+ + " (" + actualSigningIdentity + ")";
+ commands.push(cmd);
+ }
+
+ if (product.type.contains("application")) {
+ cmd = new Command(ModUtils.moduleProperty(product, "lsregisterPath"),
+ ["-f", bundles[i].filePath]);
+ cmd.description = "register " + ModUtils.moduleProperty(product, "bundleName");
+ commands.push(cmd);
+ }
}
}
diff --git a/share/qbs/modules/cpp/CppModule.qbs b/share/qbs/modules/cpp/CppModule.qbs
index 3443f1c7b..cc382c0b2 100644
--- a/share/qbs/modules/cpp/CppModule.qbs
+++ b/share/qbs/modules/cpp/CppModule.qbs
@@ -239,11 +239,6 @@ Module {
property stringList platformLinkerFlags
// OS X and iOS properties
- property bool buildIpa: !qbs.targetOS.contains('ios-simulator')
-
- property string signingIdentity
- property path provisioningProfile
-
property bool automaticReferenceCounting
PropertyOptions {
name: "automaticReferenceCounting"
diff --git a/share/qbs/modules/cpp/gcc.js b/share/qbs/modules/cpp/gcc.js
index ce92771a5..a8af8353b 100644
--- a/share/qbs/modules/cpp/gcc.js
+++ b/share/qbs/modules/cpp/gcc.js
@@ -667,6 +667,19 @@ function prepareLinker(project, product, inputs, outputs, input, output) {
}
}
+ var actualSigningIdentity = product.moduleProperty("xcode", "actualSigningIdentity");
+ var codesignDisplayName = product.moduleProperty("xcode", "actualSigningIdentityDisplayName");
+ if (actualSigningIdentity && !product.moduleProperty("bundle", "isBundle")) {
+ cmd = new Command(product.moduleProperty("xcode", "codesignPath"),
+ ["--force", "--sign", actualSigningIdentity,
+ primaryOutput.filePath]);
+ cmd.description = "codesign "
+ + primaryOutput.fileName
+ + " using " + codesignDisplayName
+ + " (" + actualSigningIdentity + ")";
+ commands.push(cmd);
+ }
+
return commands;
}
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs
index 93df91c9c..c6ad1f8da 100644
--- a/share/qbs/modules/cpp/ios-gcc.qbs
+++ b/share/qbs/modules/cpp/ios-gcc.qbs
@@ -31,6 +31,7 @@
import qbs 1.0
import qbs.DarwinTools
import qbs.File
+import qbs.FileInfo
import qbs.ModUtils
DarwinGCC {
@@ -78,36 +79,35 @@ DarwinGCC {
}
Rule {
- condition: product.moduleProperty("cpp", "buildIpa")
- multiplex: true
- inputs: ["application", "infoplist", "pkginfo", "resourcerules", "compiled_nib"]
+ inputsFromDependencies: ["bundle"]
Artifact {
- filePath: product.destinationDirectory + "/" + product.targetName + ".ipa"
+ filePath: FileInfo.joinPaths(product.destinationDirectory, product.targetName + ".ipa")
fileTags: ["ipa"]
}
prepare: {
- var signingIdentity = product.moduleProperty("cpp", "signingIdentity");
+ var signingIdentity = product.moduleProperty("xcode", "actualSigningIdentity");
+ var signingIdentityDisplay = product.moduleProperty("xcode",
+ "actualSigningIdentityDisplayName");
if (!signingIdentity)
throw "The name of a valid signing identity must be set using " +
- "cpp.signingIdentity in order to build an IPA package.";
+ "xcode.signingIdentity in order to build an IPA package.";
- var provisioningProfile = product.moduleProperty("cpp", "provisioningProfile");
- if (!provisioningProfile)
+ var provisioningProfilePath = product.moduleProperty("xcode",
+ "provisioningProfilePath");
+ if (!provisioningProfilePath)
throw "The path to a provisioning profile must be set using " +
- "cpp.provisioningProfile in order to build an IPA package.";
+ "xcode.provisioningProfilePath in order to build an IPA package.";
- var args = ["-sdk", product.moduleProperty("cpp", "xcodeSdkName"), "PackageApplication",
- "-v", product.buildDirectory + "/" + product.moduleProperty("bundle", "bundleName"),
- "-o", outputs.ipa[0].filePath, "--sign", signingIdentity,
- "--embed", provisioningProfile];
+ var args = [input.filePath,
+ "-o", output.filePath,
+ "--sign", signingIdentity,
+ "--embed", provisioningProfilePath];
- var command = "/usr/bin/xcrun";
- var cmd = new Command(command, args)
- cmd.description = "creating ipa, signing with " + signingIdentity;
+ var cmd = new Command("PackageApplication", args);
+ cmd.description = "creating ipa, signing with " + signingIdentityDisplay;
cmd.highlight = "codegen";
- cmd.workingDirectory = product.buildDirectory;
return cmd;
}
}
diff --git a/share/qbs/modules/xcode/xcode.js b/share/qbs/modules/xcode/xcode.js
index 6b93b9985..75c0ec580 100644
--- a/share/qbs/modules/xcode/xcode.js
+++ b/share/qbs/modules/xcode/xcode.js
@@ -30,6 +30,7 @@
var File = loadExtension("qbs.File");
var FileInfo = loadExtension("qbs.FileInfo");
+var Process = loadExtension("qbs.Process");
var PropertyList = loadExtension("qbs.PropertyList");
function applePlatformDirectoryName(targetOSList, version, throwOnError) {
@@ -97,3 +98,53 @@ function sdkInfoList(sdksPath) {
return sdkInfo;
}
+
+function findSigningIdentities(security, searchString) {
+ var process;
+ var identities;
+ if (searchString) {
+ try {
+ process = new Process();
+ if (process.exec(security, ["find-identity", "-p", "codesigning", "-v"], true) !== 0)
+ print(process.readStdErr());
+
+ var lines = process.readStdOut().split("\n");
+ for (var i in lines) {
+ // e.g. 1) AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA "Mac Developer: John Doe (XXXXXXXXXX) john.doe@example.org"
+ var match = lines[i].match(/^\s*[0-9]+\)\s+([A-Fa-f0-9]{40})\s+"([^"]+)"$/);
+ if (match !== null) {
+ var hexId = match[1];
+ var displayName = match[2];
+ if (hexId === searchString || displayName.startsWith(searchString)) {
+ if (!identities)
+ identities = [];
+ identities.push([hexId, displayName]);
+ break;
+ }
+ }
+ }
+ } finally {
+ process.close();
+ }
+ }
+ return identities;
+}
+
+function readProvisioningProfileData(path) {
+ var process;
+ try {
+ process = new Process();
+ if (process.exec("openssl", ["smime", "-verify", "-noverify", "-inform", "DER", "-in", path], true) !== 0)
+ print(process.readStdErr());
+
+ var propertyList = new PropertyList();
+ try {
+ propertyList.readFromString(process.readStdOut());
+ return propertyList.toObject();
+ } finally {
+ propertyList.clear();
+ }
+ } finally {
+ process.close();
+ }
+}
diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs
index a8464b330..998520417 100644
--- a/share/qbs/modules/xcode/xcode.qbs
+++ b/share/qbs/modules/xcode/xcode.qbs
@@ -54,6 +54,36 @@ Module {
}
}
+ property string signingIdentity
+ readonly property string actualSigningIdentity: {
+ if (_actualSigningIdentity && _actualSigningIdentity.length === 1)
+ return _actualSigningIdentity[0][0];
+ }
+
+ readonly property string actualSigningIdentityDisplayName: {
+ if (_actualSigningIdentity && _actualSigningIdentity.length === 1)
+ return _actualSigningIdentity[0][1];
+ }
+
+ property string provisioningProfile
+ property path provisioningProfilePath: {
+ var files = _availableProvisioningProfiles;
+ for (var i in files) {
+ var data = Utils.readProvisioningProfileData(files[i]);
+ if (data["UUID"] === provisioningProfile ||
+ data["Name"] === provisioningProfile) {
+ return files[i];
+ }
+ }
+ }
+
+ property string securityName: "security"
+ property string securityPath: securityName
+
+ property string codesignName: "codesign"
+ property string codesignPath: codesignName
+ property stringList codesignFlags
+
readonly property path toolchainPath: FileInfo.joinPaths(toolchainsPath,
"XcodeDefault" + ".xctoolchain")
readonly property path platformPath: FileInfo.joinPaths(platformsPath,
@@ -75,6 +105,23 @@ Module {
readonly property path toolchainInfoPlist: FileInfo.joinPaths(toolchainPath,
"ToolchainInfo.plist")
+ readonly property stringList _actualSigningIdentity: {
+ if (/^[A-Fa-f0-9]{40}$/.test(signingIdentity)) {
+ return signingIdentity;
+ }
+
+ var identities = Utils.findSigningIdentities(securityPath, signingIdentity);
+ if (identities && identities.length > 1) {
+ throw "Signing identity '" + signingIdentity + "' is ambiguous";
+ }
+
+ return identities;
+ }
+
+ property path provisioningProfilesPath: {
+ return FileInfo.joinPaths(qbs.getEnv("HOME"), "Library/MobileDevice/Provisioning Profiles");
+ }
+
readonly property var _availableSdks: Utils.sdkInfoList(sdksPath)
readonly property var _sdkSettings: {
@@ -135,6 +182,7 @@ Module {
property var buildEnv: {
return {
+ "CODESIGN_ALLOCATE": platformPath + "/Developer/usr/bin/codesign_allocate",
"DEVELOPER_DIR": developerPath
};
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 07:22:13 +0000