From 0cb58135fd88d7506ab9d6e75dd435d091a11d29 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Wed, 17 Sep 2014 00:18:28 +0200
Subject: [PATCH] [DEBUG] android build is back

---
 lutin.py                      |  4 ++--
 lutinModule.py                |  2 +-
 lutinTarget.py                |  2 +-
 target/lutinTarget_Android.py | 23 ++++++++---------------
 target/lutinTarget_Linux.py   |  8 ++++++++
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/lutin.py b/lutin.py
index 65ea217..23b8249 100755
--- a/lutin.py
+++ b/lutin.py
@@ -163,9 +163,9 @@ def Start():
 			debug.warning("argument arch is not implemented")
 			config["arch"]=argument.get_arg()
 		elif argument.get_option_nName() == "compilator":
-			if compilator!=argument.get_arg():
+			if config["compilator"] != argument.get_arg():
 				debug.debug("change compilator ==> " + argument.get_arg())
-				config["compilator"]=argument.get_arg()
+				config["compilator"] = argument.get_arg()
 				#remove previous target
 				target = None
 		elif argument.get_option_nName() == "target":
diff --git a/lutinModule.py b/lutinModule.py
index 36a50d4..fd66b0e 100644
--- a/lutinModule.py
+++ b/lutinModule.py
@@ -326,7 +326,7 @@ class Module:
 		lutinTools.create_directory_of_file(file_dst)
 		debug.print_element("SharedLib", libName, "==>", file_dst)
 		lutinMultiprocess.run_command(cmdLine)
-		if    "release"==target.buildMode \
+		if    target.config["mode"] == "release" \
 		   or lutinEnv.get_force_strip_mode()==True:
 			# get the file size of the non strip file
 			originSize = lutinTools.file_size(file_dst);
diff --git a/lutinTarget.py b/lutinTarget.py
index cab519b..16d83a8 100644
--- a/lutinTarget.py
+++ b/lutinTarget.py
@@ -43,7 +43,7 @@ class Target:
 		self.name=name
 		self.endGeneratePackage = config["generate-package"]
 		debug.info("=================================");
-		debug.info("== Target='" + self.name + "'");
+		debug.info("== Target='" + self.name + "' " + config["bus-size"] + " bits for arch '" + config["arch"] + "'");
 		debug.info("=================================");
 		
 		self.set_cross_base()
diff --git a/target/lutinTarget_Android.py b/target/lutinTarget_Android.py
index b73645c..d7b6866 100644
--- a/target/lutinTarget_Android.py
+++ b/target/lutinTarget_Android.py
@@ -74,13 +74,6 @@ class Target(lutinTarget.Target):
 				debug.info("Gcc x86 path does not exist !!!")
 		
 		arch = "ARMv7"
-		
-		if self.selectBus = "auto":
-			
-		
-		if self.selectArch = "auto":
-			lutinHost.BUS_SIZE
-		
 		# for gcc :
 		
 		# for clang :
@@ -102,7 +95,7 @@ class Target(lutinTarget.Target):
 			self.global_include_cc.append("-I" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-x86/usr/include/")
 		
 		if True:
-			if typeCompilator == "clang":
+			if self.config["compilator"] == "clang":
 				self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/include/")
 				if arch == "ARMv5":
 					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/libs/armeabi/"
@@ -206,7 +199,7 @@ class Target(lutinTarget.Target):
 		debug.info("Generate package '" + pkgName + "'")
 		debug.debug("------------------------------------------------------------------------")
 		pkgNameApplicationName = pkgName
-		if "debug"==self.buildMode:
+		if self.config["mode"] == "debug":
 			pkgNameApplicationName += "debug"
 		# FINAL_FOLDER_JAVA_PROJECT
 		self.folder_javaProject=   self.get_staging_folder(pkgName) \
@@ -370,7 +363,7 @@ class Target(lutinTarget.Target):
 				tmpFile.write( '	<application android:label="' + pkgNameApplicationName + '" \n')
 				if "ICON" in pkgProperties.keys():
 					tmpFile.write( '	             android:icon="@drawable/icon" \n')
-				if "debug"==self.buildMode:
+				if self.config["mode"] == "debug":
 					tmpFile.write( '	             android:debuggable="true" \n')
 				tmpFile.write( '	             >\n')
 				if "ADMOD_ID" in pkgProperties:
@@ -379,7 +372,7 @@ class Target(lutinTarget.Target):
 				
 				tmpFile.write( '		<activity android:name=".' + pkgNameApplicationName + '" \n')
 				tmpFile.write( '		          android:label="' + pkgProperties['NAME'])
-				if "debug"==self.buildMode:
+				if self.config["mode"] == "debug":
 					tmpFile.write("-debug")
 				tmpFile.write( '"\n')
 				if "ICON" in pkgProperties.keys():
@@ -404,7 +397,7 @@ class Target(lutinTarget.Target):
 				tmpFile.write( '	             >\n')
 				tmpFile.write( '		<service android:name=".' + pkgNameApplicationName + '" \n')
 				tmpFile.write( '		         android:label="' + pkgProperties['NAME'])
-				if "debug"==self.buildMode:
+				if self.config["mode"] == "debug":
 					tmpFile.write("-debug")
 				tmpFile.write( '"\n')
 				if "ICON" in pkgProperties.keys():
@@ -671,7 +664,7 @@ class Target(lutinTarget.Target):
 		# http://developer.android.com/tools/publishing/app-signing.html
 		# Create a key for signing your application:
 		# keytool -genkeypair -v -keystore AndroidKey.jks -storepass Pass__AndroidDebugKey -alias alias__AndroidDebugKey -keypass PassKey__AndroidDebugKey -keyalg RSA -validity 36500
-		if "debug"==self.buildMode:
+		if self.config["mode"] == "debug":
 			tmpFile = open("tmpPass.boo", 'w')
 			tmpFile.write("Pass__AndroidDebugKey\n")
 			tmpFile.write("PassKey__AndroidDebugKey\n")
@@ -725,7 +718,7 @@ class Target(lutinTarget.Target):
 		debug.info("Install package '" + pkgName + "'")
 		debug.debug("------------------------------------------------------------------------")
 		pkgNameApplicationName = pkgName
-		if "debug"==self.buildMode:
+		if self.config["mode"] == "debug":
 			pkgNameApplicationName += "debug"
 		cmdLine = self.folder_sdk + "/platform-tools/adb install -r " \
 		          + self.get_staging_folder(pkgName) + "/" + pkgNameApplicationName + ".apk "
@@ -736,7 +729,7 @@ class Target(lutinTarget.Target):
 		debug.info("Un-Install package '" + pkgName + "'")
 		debug.debug("------------------------------------------------------------------------")
 		pkgNameApplicationName = pkgName
-		if "debug"==self.buildMode:
+		if self.config["mode"] == "debug":
 			pkgNameApplicationName += "debug"
 		cmdLine = self.folder_sdk + "/platform-tools/adb uninstall " + pkgNameApplicationName
 		RlutinMultiprocess.unCommand(cmdLine)
diff --git a/target/lutinTarget_Linux.py b/target/lutinTarget_Linux.py
index 2ead658..c5c8c76 100644
--- a/target/lutinTarget_Linux.py
+++ b/target/lutinTarget_Linux.py
@@ -25,6 +25,14 @@ class Target(lutinTarget.Target):
 		if config["bus-size"] == "auto":
 			config["bus-size"] = str(lutinHost.BUS_SIZE)
 		lutinTarget.Target.__init__(self, "Linux", config, "")
+		if self.config["bus-size"] == "64":
+			# 64 bits
+			if lutinHost.BUS_SIZE != 64:
+				self.global_flags_cc.append("-m64")
+		else:
+			# 32 bits
+			if lutinHost.BUS_SIZE != 32:
+				self.global_flags_cc.append("-m32")
 	
 	def generate_list_separate_coma(self, list):
 		result = ""