diff options
| -rw-r--r-- | share/qbs/modules/codesign/codesign.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/share/qbs/modules/codesign/codesign.js b/share/qbs/modules/codesign/codesign.js index 10fa7575f..463e7cbb7 100644 --- a/share/qbs/modules/codesign/codesign.js +++ b/share/qbs/modules/codesign/codesign.js @@ -308,9 +308,7 @@ function prepareSign(project, product, inputs, outputs, input, output) { } } - var args = product.codesign.codesignFlags || []; - args.push("--force"); - args.push("--sign", actualSigningIdentity.SHA1); + var args = ["--force", "--sign", actualSigningIdentity.SHA1]; // If signingTimestamp is undefined or empty, do not specify the flag at all - // this uses the system-specific default behavior @@ -328,6 +326,9 @@ function prepareSign(project, product, inputs, outputs, input, output) { args.push("--entitlements", inputs["codesign.xcent"][j].filePath); break; // there should only be one } + + args = args.concat(product.codesign.codesignFlags || []); + args.push(outputFilePath + subpath); cmd = new Command(product.codesign.codesignPath, args); cmd.description = "codesign " + outputFileName @@ -425,7 +426,7 @@ function prepareSigntool(project, product, inputs, outputs, input, output) { if (!product.codesign.enableCodeSigning) return cmds; - var args = ["sign"].concat(product.codesign.codesignFlags || []); + var args = ["sign"]; var subjectName = product.codesign.subjectName; if (subjectName) @@ -459,6 +460,8 @@ function prepareSigntool(project, product, inputs, outputs, input, output) { if (crossCertificatePath) args.push("/ac", crossCertificatePath); + args = args.concat(product.codesign.codesignFlags || []); + var outputArtifact = outputs["codesign.signed_artifact"][0]; args.push(outputArtifact.filePath); |