diff options
| author | ruki <[email protected]> | 2025-09-19 23:51:40 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-09-19 23:51:40 +0800 |
| commit | ca784dc5ed3be5a75e787c9711da8fdf619df619 (patch) | |
| tree | 20e9df17f1446788597ae692cebbee31db8700d9 /xmake/rules/xcode | |
| parent | 4ca5b7977c312b8e87336c4392d35885b863df48 (diff) | |
| parent | 286b5301449d1cd26c07c05d37d39fe424e678c0 (diff) | |
Merge pull request #6832 from xmake-io/sign
optimize codesign
Diffstat (limited to 'xmake/rules/xcode')
| -rw-r--r-- | xmake/rules/xcode/application/build.lua | 21 | ||||
| -rw-r--r-- | xmake/rules/xcode/bundle/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/xcode/framework/xmake.lua | 2 |
3 files changed, 14 insertions, 11 deletions
diff --git a/xmake/rules/xcode/application/build.lua b/xmake/rules/xcode/application/build.lua index 74a8b2431..a98baf57a 100644 --- a/xmake/rules/xcode/application/build.lua +++ b/xmake/rules/xcode/application/build.lua @@ -86,21 +86,24 @@ function main (target, opt) end -- generate embedded.mobileprovision to *.app/embedded.mobileprovision + local mobile_provision local mobile_provision_embedded = path.join(bundledir, "embedded.mobileprovision") - local mobile_provision = target:values("xcode.mobile_provision") or get_config("xcode_mobile_provision") - if mobile_provision and target:is_plat("iphoneos") then - os.tryrm(mobile_provision_embedded) - local provisions = codesign.mobile_provisions() - if provisions then - local mobile_provision_data = provisions[mobile_provision] - if mobile_provision_data then - io.writefile(mobile_provision_embedded, mobile_provision_data) + if target:is_plat("iphoneos") then + mobile_provision = target:values("xcode.mobile_provision") or codesign.xcode_mobile_provision() + if mobile_provision then + os.tryrm(mobile_provision_embedded) + local provisions = codesign.mobile_provisions() + if provisions then + local mobile_provision_data = provisions[mobile_provision] + if mobile_provision_data then + io.writefile(mobile_provision_embedded, mobile_provision_data) + end end end end -- do codesign - local codesign_identity = target:values("xcode.codesign_identity") or get_config("xcode_codesign_identity") + local codesign_identity = target:values("xcode.codesign_identity") or codesign.xcode_codesign_identity() if target:is_plat("macosx") or (target:is_plat("iphoneos") and target:is_arch("x86_64", "i386")) then codesign_identity = nil end diff --git a/xmake/rules/xcode/bundle/xmake.lua b/xmake/rules/xcode/bundle/xmake.lua index 9d697e3cf..bb3bed28f 100644 --- a/xmake/rules/xcode/bundle/xmake.lua +++ b/xmake/rules/xcode/bundle/xmake.lua @@ -103,7 +103,7 @@ rule("xcode.bundle") end -- do codesign - local codesign_identity = target:values("xcode.codesign_identity") or get_config("xcode_codesign_identity") + local codesign_identity = target:values("xcode.codesign_identity") or codesign.xcode_codesign_identity() if target:is_plat("macosx") or (target:is_plat("iphoneos") and target:is_arch("x86_64", "i386")) then codesign_identity = nil end diff --git a/xmake/rules/xcode/framework/xmake.lua b/xmake/rules/xcode/framework/xmake.lua index 4e849f51b..2f0d47b87 100644 --- a/xmake/rules/xcode/framework/xmake.lua +++ b/xmake/rules/xcode/framework/xmake.lua @@ -156,7 +156,7 @@ rule("xcode.framework") -- do codesign, only for dynamic library if target:is_shared() then - local codesign_identity = target:values("xcode.codesign_identity") or get_config("xcode_codesign_identity") + local codesign_identity = target:values("xcode.codesign_identity") or codesign.xcode_codesign_identity() if target:is_plat("macosx") or (target:is_plat("iphoneos") and target:is_arch("x86_64", "i386")) then codesign_identity = nil end |