Use new version_minimum() func to compare XCode versions (#424)

Signed-off-by: Ole Herman Schumacher Elgesem <[email protected]>

Author: olehermanse

bin/cocos.py

@@ -717,6 +717,29 @@ def get_xcode_version():
 
     return version
 
+def version_minimum(a, b):
+    '''Compares two version numbers to see if a >= b
+
+    expects two dot separated version numbers
+    can be string, float or int
+    '''
+    if a == b or str(a).strip() == str(b).strip():
+        return True
+
+    a = [int(x) for x in str(a).split(".")]
+    b = [int(x) for x in str(b).split(".")]
+    for i in range(max(len(a), len(b))):
+        ai, bi = 0, 0
+        if len(a) > i:
+            ai = a[i]
+        if len(b) > i:
+            bi = b[i]
+        if ai > bi:
+            return True
+        if ai < bi:
+            return False
+
+    return True
 
 def copy_files_in_dir(src, dst):
 

plugins/plugin_compile/project_compile.py

@@ -804,10 +804,12 @@ def build_ios(self):
                 "CONFIGURATION_BUILD_DIR=\"%s\"" % (output_dir),
                 "%s" % "VALID_ARCHS=\"i386\"" if self.use_sdk == 'iphonesimulator' else ''
                 ])
- 
+
             # PackageApplication is removed since xcode 8.3, should use new method to generate .ipa
             # should generate .xcarchive first, then generate .ipa
-            use_new_ipa_method = float(cocos.get_xcode_version()) >= 8.3
+            xcode_version = cocos.get_xcode_version()
+
+            use_new_ipa_method = cocos.version_minimum(xcode_version, 8.3)
 
             if self._sign_id is not None:
                 if use_new_ipa_method: