diff options
| author | ruki <[email protected]> | 2020-04-10 23:26:42 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-04-10 14:40:14 +0800 |
| commit | f4d5f872d84b8314c51d140679e54b847bb917b8 (patch) | |
| tree | 9eac3756e9ad7067fbf1ec119b1a1cd8fb9ea3b6 | |
| parent | 37eed913e7c1ff50a1c874492d760083768755d8 (diff) | |
fix pass mobile provision
| -rw-r--r-- | xmake/modules/detect/sdks/find_xcode.lua | 22 | ||||
| -rw-r--r-- | xmake/rules/xcode/application/build.lua | 6 |
2 files changed, 17 insertions, 11 deletions
diff --git a/xmake/modules/detect/sdks/find_xcode.lua b/xmake/modules/detect/sdks/find_xcode.lua index 213a90133..d7eb2ddd7 100644 --- a/xmake/modules/detect/sdks/find_xcode.lua +++ b/xmake/modules/detect/sdks/find_xcode.lua @@ -95,16 +95,22 @@ function _find_xcode(sdkdir, xcode_sdkver, plat, arch) end -- find mobile provision only for iphoneos - local mobile_provision = config.get("xcode_mobile_provision") - if mobile_provision == nil then -- we will disable mobile_provision if be false - mobile_provision = global.get("xcode_mobile_provision") - end - if mobile_provision == nil and is_plat("iphoneos") then + local mobile_provision + if is_plat("iphoneos") then local mobile_provisions = codesign.mobile_provisions() if mobile_provisions then - for provision, _ in pairs(mobile_provisions) do - mobile_provision = provision - break + mobile_provision = config.get("xcode_mobile_provision") + if mobile_provision == nil then -- we will disable mobile_provision if be false + mobile_provision = global.get("xcode_mobile_provision") + end + if mobile_provision == nil then + for provision, _ in pairs(mobile_provisions) do + mobile_provision = provision + break + end + -- valid mobile provision not found? reset it + elseif not mobile_provisions[mobile_provision] then + mobile_provision = nil end end end diff --git a/xmake/rules/xcode/application/build.lua b/xmake/rules/xcode/application/build.lua index 82d7f335a..3ff16dcb0 100644 --- a/xmake/rules/xcode/application/build.lua +++ b/xmake/rules/xcode/application/build.lua @@ -69,9 +69,9 @@ function main (target, opt) os.tryrm(mobile_provision_embedded) local provisions = codesign.mobile_provisions() if provisions then - mobile_provision = provisions[mobile_provision] - if mobile_provision then - io.writefile(mobile_provision_embedded, mobile_provision) + local mobile_provision_data = provisions[mobile_provision] + if mobile_provision_data then + io.writefile(mobile_provision_embedded, mobile_provision_data) end end end |