diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2019-12-14 00:17:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-14 00:17:13 +0100 |
commit | 3740ec25f7dd4febba89f771972f7f29321cca43 (patch) | |
tree | 6d78bc8b2e6c6be5efae6fe7f1602ed8e79b91ff | |
parent | d23b8719f4b49b94d4f57c641963d3135b6ff9c3 (diff) | |
parent | 41c3c77e800172cf81cd3b847ac4d3276bc33f17 (diff) |
Merge pull request #34339 from NoFr1ends/fix-bundle-verify-ios
Change bundle name rules on iOS to match Apple's requirements
-rw-r--r-- | platform/iphone/export/export.cpp | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index 4f4439bc60..8eac120939 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -114,54 +114,14 @@ class EditorExportPlatformIOS : public EditorExportPlatform { return false; } - int segments = 0; - bool first = true; for (int i = 0; i < pname.length(); i++) { CharType c = pname[i]; - if (first && c == '.') { - if (r_error) { - *r_error = TTR("Identifier segments must be of non-zero length."); - } - return false; - } - if (c == '.') { - segments++; - first = true; - continue; - } - if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-')) { + if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '.')) { if (r_error) { *r_error = vformat(TTR("The character '%s' is not allowed in Identifier."), String::chr(c)); } return false; } - if (first && (c >= '0' && c <= '9')) { - if (r_error) { - *r_error = TTR("A digit cannot be the first character in a Identifier segment."); - } - return false; - } - if (first && c == '-') { - if (r_error) { - *r_error = vformat(TTR("The character '%s' cannot be the first character in a Identifier segment."), String::chr(c)); - } - return false; - } - first = false; - } - - if (segments == 0) { - if (r_error) { - *r_error = TTR("The Identifier must have at least one '.' separator."); - } - return false; - } - - if (first) { - if (r_error) { - *r_error = TTR("Identifier segments must be of non-zero length."); - } - return false; } return true; |