[RELEASE] release version 2.2.1

lutin/tools.py

@@ -381,16 +381,19 @@ def get_version_from_file_or_direct(path_module, filename_or_version):
 	line = lines[0]
 	debug.debug("Parse line: '" + line + "'")
 	#check if we have "-dev"
-	dev_mode = False
-	if line[-4:] == "-dev":
-		dev_mode = True
-		line = line[:-4]
+	dev_mode = ""
+	list_tiret = line.split('-')
+	if len(list_tiret) > 2:
+		debug.warning("more than one '-' in version file " + str(filename_or_version) + " : '" + str(list_tiret) + "' in '" + path_module + "'")
+	if len(list_tiret) >= 2:
+		dev_mode = list_tiret[1]
+		line = list_tiret[0]
 	out = []
 	list_elem = line.split('.')
 	for elem in list_elem:
 		out.append(int(elem))
-	if dev_mode == True:
-		out.append("dev")
+	if dev_mode != "":
+		out.append(dev_mode)
 	debug.debug("    ==> " + str(out))
 	return out
 

lutin/z_target/lutinTarget_IOs.py

@@ -40,8 +40,12 @@ class Target(target.Target):
 		if config["simulation"] == True:
 			arch = "i386"
 		else:
-			arch="arm64" # for ipad air
-			#arch="armv7" # for Iphone 4
+			if config["bus-size"] == "32":
+				# for Iphone 4
+				arch="armv7"
+			else:
+				# for ipad air
+				arch="arm64"
 		target.Target.__init__(self, ["IOs"] + sub_name, config, arch)
 		if self.config["simulation"] == True:
 			self.set_cross_base("/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/")

setup.py

@@ -16,7 +16,7 @@ def readme():
 
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 setup(name='lutin',
-      version='2.2.0',
+      version='2.2.1',
       description='Lutin generic builder (might replace makefile, CMake ...)',
       long_description=readme(),
       url='http://github.com/HeeroYui/lutin',