[DEV] Remove completion for linux ...

README.rst

@@ -34,11 +34,19 @@ Installation
 
 Requirements: ``Python >= 2.7`` and ``pip``
 
-Just run::
+Just run:
 
   pip install lutin
 
-On mac-os you may install pip before:
+Install pip on debian/ubuntu:
+
+  sudo apt-get install pip
+
+Install pip on ARCH-linux:
+
+  sudo pacman -S pip
+
+Install pip on MacOs:
 
   sudo easy_install pip
 

bin/lutin

@@ -19,12 +19,13 @@ import lutin.env as env
 import lutin.multiprocess as multiprocess
 
 myArgs = arguments.LutinArg()
-myArgs.add(arguments.ArgDefine("h", "help", desc="display this help"))
+myArgs.add(arguments.ArgDefine("h", "help", desc="Display this help"))
+myArgs.add(arguments.ArgDefine("H", "HELP", desc="Display this help (with all compleate information)"))
 myArgs.add_section("option", "Can be set one time in all case")
 myArgs.add(arguments.ArgDefine("v", "verbose", list=[["0","None"],["1","error"],["2","warning"],["3","info"],["4","debug"],["5","verbose"],["6","extreme_verbose"]], desc="display makefile debug level (verbose) default =2"))
-myArgs.add(arguments.ArgDefine("C", "color", desc="display makefile output in color"))
-myArgs.add(arguments.ArgDefine("f", "force", desc="Force the rebuild without checking the dependency"))
-myArgs.add(arguments.ArgDefine("P", "pretty", desc="print the debug has pretty display"))
+myArgs.add(arguments.ArgDefine("C", "color", desc="Display makefile output in color"))
+myArgs.add(arguments.ArgDefine("B", "force-build", desc="Force the rebuild without checking the dependency"))
+myArgs.add(arguments.ArgDefine("P", "pretty", desc="Print the debug has pretty display"))
 myArgs.add(arguments.ArgDefine("j", "jobs", haveParam=True, desc="Specifies the number of jobs (commands) to run simultaneously"))
 myArgs.add(arguments.ArgDefine("s", "force-strip", desc="Force the stripping of the compile elements"))
 myArgs.add(arguments.ArgDefine("w", "warning", desc="Store warning in a file build file"))
@@ -32,15 +33,15 @@ myArgs.add(arguments.ArgDefine("w", "warning", desc="Store warning in a file bui
 myArgs.add_section("properties", "keep in the sequency of the cible")
 myArgs.add(arguments.ArgDefine("t", "target", haveParam=True, desc="Select a target (by default the platform is the computer that compile this) To know list : 'lutin.py --list-target'"))
 myArgs.add(arguments.ArgDefine("c", "compilator", list=[["clang",""],["gcc",""]], desc="Compile with clang or Gcc mode (by default gcc will be used)"))
-myArgs.add(arguments.ArgDefine("", "compilator-version", haveParam=True, desc="with travis we need to specify the name of the version if we want to compile with gcc 4.9 ==> --compilator-version=4.9"))
+myArgs.add(arguments.ArgDefine("", "compilator-version", haveParam=True, desc="With travis we need to specify the name of the version if we want to compile with gcc 4.9 ==> --compilator-version=4.9"))
 myArgs.add(arguments.ArgDefine("m", "mode", list=[["debug",""],["release",""]], desc="Compile in release or debug mode (default release)"))
 myArgs.add(arguments.ArgDefine("a", "arch", list=[["auto","Automatic choice"],["arm","Arm processer"],["x86","Generic PC : AMD/Intel"],["ppc","Power PC"]], desc="Architecture to compile"))
 myArgs.add(arguments.ArgDefine("b", "bus", list=[["auto","Automatic choice"],["32","32 bits"],["64","64 bits"]], desc="Adressing size (Bus size)"))
 myArgs.add(arguments.ArgDefine("p", "package", desc="Disable the package generation (usefull when just compile for test on linux ...)"))
 myArgs.add(arguments.ArgDefine("g", "gcov", desc="Enable code coverage intrusion in code"))
-myArgs.add(arguments.ArgDefine("", "simulation", desc="simulater mode (availlable only for IOS)"))
-myArgs.add(arguments.ArgDefine("", "list-target", desc="list all availlables targets ==> for auto completion"))
-myArgs.add(arguments.ArgDefine("", "list-module", desc="list all availlables module ==> for auto completion"))
+myArgs.add(arguments.ArgDefine("", "simulation", desc="Simulater mode (availlable only for IOS)"))
+myArgs.add(arguments.ArgDefine("", "list-target", desc="List all availlables targets ==> for auto completion"))
+myArgs.add(arguments.ArgDefine("", "list-module", desc="List all availlables module ==> for auto completion"))
 
 myArgs.add_section("cible", "generate in order set")
 localArgument = myArgs.parse()
@@ -48,11 +49,11 @@ localArgument = myArgs.parse()
 """
 	display the help of this makefile
 """
-def usage():
+def usage(full=False):
 	color = debug.get_color_set()
 	# generic argument displayed : 
 	myArgs.display()
-	print("		All target can finish with '?clean' '?dump' '?gcov' ... ?action")
+	print("		All target can finish with '?clean' '?dump' '?gcov' ... ?action (@ can replace ?)" )
 	print("		" + color['green'] + "all" + color['default'])
 	print("			build all (only for the current selected board) (bynary and packages)")
 	print("		" + color['green'] + "clean" + color['default'])
@@ -63,19 +64,86 @@ def usage():
 	print("			Parse all the code of the library with the gcov resolution")
 	listOfAllModule = module.list_all_module_with_desc()
 	for mod in listOfAllModule:
-		print("		" + color['green'] + mod[0] + color['default'])
-		if mod[1] != "":
-			print("			" + mod[1])
+		data_print = "		"
+		if full == False:
+			if    mod["type"][:6] == "BINARY":
+				data_print += color['blue']
+				if mod["sub-type"] == "":
+					data_print += "* "
+				elif mod["sub-type"] == "TEST":
+					data_print += "T "
+				elif mod["sub-type"] == "TOOLS":
+					data_print += "U "
+				elif mod["sub-type"] == "SAMPLE":
+					data_print += "S "
+				else:
+					data_print += "  "
+			elif mod["type"] == "PACKAGE":
+				data_print += color['red'] + "# "
+			elif    mod["type"][:7] == "LIBRARY":
+				data_print += color['yellow'] + "  "
+			else:
+				data_print += color['default'] + "  "
+		else:
+			data_print += color['green']
+		data_print += mod["name"] + color['default']
+		if full == False:
+			data_print += "\r\t\t\t\t\t\t\t"
+			if mod["license"] != "":
+				data_print += color['yellow'] + " [" + mod["license"] + "]" + color['default']
+			if mod["version"] != []:
+				version_ID = tools.version_to_string(mod["version"])
+				data_print += color['blue'] + " (" + version_ID + ")" + color['default']
+			"""
+			if     mod["compagny-type"] != "" \
+			   and mod["compagny-name"] != "":
+				data_print += color['purple'] + " " + mod["compagny-type"] + "/" + mod["compagny-name"] + color['default']
+			elif mod["compagny-name"] != "":
+				data_print += color['purple'] + " " + mod["compagny-name"] + color['default']
+			"""
+		
+		print(data_print)
+		if mod["description"] != "":
+			print("			" + mod["description"])
+		if full == True:
+			if mod["type"] != "":
+				print("				Type:     " + mod["type"])
+			if mod["sub-type"] != "":
+				print("				Sub-Type: " + mod["sub-type"])
+			if mod["version"] != []:
+				version_ID = ""
+				for id in mod["version"]:
+					if len(version_ID) != 0:
+						if type(id) == str:
+							version_ID+="-"
+						else:
+							version_ID+="."
+					version_ID += str(id)
+				print("				version:  " + color['blue'] + version_ID + color['default'])
+			if     mod["compagny-type"] != "" \
+			   and mod["compagny-name"] != "":
+				print("				compagny: " + color['purple'] + mod["compagny-type"] + "/" + mod["compagny-name"] + color['default'])
+			elif mod["compagny-name"] != "":
+				print("				compagny: " + color['purple'] + mod["compagny-name"] + color['default'])
+			if mod["license"] != "":
+				print("				license:  " + color['yellow'] + mod["license"] + color['default'])
+			if mod["maintainer"] != []:
+				print("				maintainers:")
+				for elem in mod["maintainer"]:
+					print("					" + str(elem))
 	print("	ex: " + sys.argv[0] + " all --target=Android all -t Windows -m debug all")
 	exit(0)
 
 # preparse the argument to get the verbose element for debug mode
 def parseGenericArg(argument, active):
 	if argument.get_option_name() == "help":
-		#display help
 		if active==False:
 			usage()
 		return True
+	if argument.get_option_name() == "HELP":
+		if active==False:
+			usage(True)
+		return True
 	if argument.get_option_name() == "list-module":
 		if active==False:
 			listOfModule = module.list_all_module()

doc/010_basic_concept.bb

@@ -0,0 +1,59 @@
+=?= [center]Basic concept[/center] =?=
+___________________________________________
+
+Lutin is a compleate builder system. It is designed to answers all the application problems.
+The library and the distribution problem are partially manage (no real use-case)
+
+==Technologie==
+
+Lutin is designed in Python 2.X or 3.X to answers at the multiplatform problesm. On Linux or MacOs, it is really easy to compile with Makefile, cmake, but on Windows it is an other problem.
+The first version of Lutin has been designed in Makefile, but we need to wait 20 minutes before the first build. In Pytho it is fast as Linux.
+
+Lutin is not based over an other builder, but request compilation itself.
+
+==Features==
+
+Lutin is designed to:
+:** support many hardware platform (X86/X64/ARM...);
+:** support many operation system (windows, Ios, Android ...);
+:** support complex worktree and depedency;
+:** build only when needed;
+:** create platform specific packages (application bundle);
+:** 
+
+
+==global overview==
+
+Every build system is based on multiple concept depending of their own designed.
+
+For lutin we can différentiate 4 basics concepts:
+:** Mudule: Interface to create a part of an application, that contain binary, scipt, datas ...
+:** Target: methode to creata an application or a library (may be internal: medium level)
+:** Builder: Methode to transform element in other, for example: compile a cpp in object file, or object files in binary.
+:** System: Many OS manage basic element contain in the OS, This part permit to find generic module availlable in the system.
+
+===Module===
+
+When you use lutin, you migth first create a module, This is the basis of the framework. It permit to describe your "module", all it contain, and the deendency.
+
+We can separate a module in some part:
+:** Binary:
+:: A binary is an end point element.
+:: It can be transform in a complete standalone bundle, or in an part instalable.
+:** Library:
+:: This represent an element that is used by other application
+:** Package:
+:: To Be Define.
+
+
+===Target===
+
+
+
+===Builder===
+
+
+===System===
+
+
+

doc/020_Compile_a_module.bb

@@ -0,0 +1,153 @@
+=?= [center]Basic concept[/center] =?=
+___________________________________________
+
+Lutin permit simply to compile applications and library.
+
+To simply understand the use, we will use a simple library:
+
+[code style=bash]
+	git clone http://github.con/atria-soft/etk.git
+[/code]
+
+etk is a basic library that have drive the lutin project.
+
+
+== compile a module ==
+
+It is really simple:
+
+[code style=bash]
+	lutin yourModuleName
+	#example:
+	lutin etk
+[/code]
+
+
+
+== Option working ==
+
+Lutin have a complex option methodologie. We can consider 3 part of the option:
+:** Global option
+:** target option
+:** modules
+
+
+
+
+== Generic options ==
+
+=== Display help ===
+
+Availlable everywhere ...
+
+[code style=bash]
+	lutin -h
+	lutin --help
+[/code]
+
+You can see in this help that it take a litle time to react.
+The first time you run lutin, it parse all the file in your sub-directory.
+But the system keep the data in cash, then the next time it is faster.
+
+At the end of the help you an see an help about the etk librery with the associated help.
+
+=== Build in color ===
+
+[code style=bash]
+	lutin -C
+	lutin --color
+[/code]
+
+=== Display build line in pretty print mode ===
+
+when an error apear, the gcc or clang compile line can be really unreadable:
+[code]
+	g++ -o /home/heero/dev/plop/out/Linux_x86_64/release/build/gcc/etk/obj/etk/Color.cpp.o -I/home/heero/dev/plop/etk -std=c++11 -D__CPP_VERSION__=2011 -D__TARGET_OS__Linux -D__TARGET_ARCH__x86 -D__TARGET_ADDR__64BITS -D_REENTRANT -DNDEBUG -O3 -fpic -D__STDCPP_GNU__ -Wall -Wsign-compare -Wreturn-type -Wno-write-strings -Woverloaded-virtual -Wnon-virtual-dtor -Wno-unused-variable -DMODE_RELEASE -c -MMD -MP /home/heero/dev/plop/etk/etk/Color.cpp
+[/code]
+
+whith this option you can transform this not obvious line in a readable line:
+
+[code style=bash]
+	lutin -P
+	lutin --pretty
+[/code]
+
+result:
+[code]
+	g++ \
+		-o /home/XXX/dev/out/Linux_x86_64/release/build/gcc/etk/obj/etk/Color.cpp.o \
+		-I/home/XXX/dev/etk \
+		-std=c++11 \
+		-D__CPP_VERSION__=2011 \
+		-D__TARGET_OS__Linux \
+		-D__TARGET_ARCH__x86 \
+		-D__TARGET_ADDR__64BITS \
+		-D_REENTRANT \
+		-DNDEBUG \
+		-O3 \
+		-fpic \
+		-D__STDCPP_GNU__ \
+		-Wall \
+		-Wsign-compare \
+		-Wreturn-type \
+		-Wno-write-strings \
+		-Woverloaded-virtual \
+		-Wnon-virtual-dtor \
+		-Wno-unused-variable \
+		-DMODE_RELEASE \
+		-c \
+		-MMD \
+		-MP \
+		/home/XXX/dev/etk/etk/Color.cpp
+[/code]
+
+=== lutin log ===
+
+Lutin have an internal log system. To enable or disable it just select your debug level with the option:
+
+[code style=bash]
+	lutin -v4
+	lutin --verbose 4
+[/code]
+
+The level availlables are:
+:** 0: None
+:** 1: error
+:** 2: warning (default)
+:** 3: info
+:** 4: debug
+:** 5: verbose
+:** 6: extreme_verbose
+
+=== select the number of CPU core used ===
+
+By default lutin manage only 1 CPU core (faster to debug) but for speed requirement you can use use multiple core:
+
+[code style=bash]
+	#for 5 core
+	lutin -j5
+	lutin --jobs 5
+[/code]
+
+=== Force rebuild all ===
+
+Sometime it is needed to rebuild all the program, just do :
+
+[code style=bash]
+	lutin -B
+	lutin --force-build
+[/code]
+
+=== Force rebuild all ===
+
+Force strip of output binary (remove symboles)
+
+[code style=bash]
+	lutin -s
+	lutin --force-strip
+[/code]
+
+
+
+		-w / --warning
+			Store warning in a file build file

doc/index.bb

@@ -0,0 +1,100 @@
+=?= [center]Lutin Build system[/center] =?=
+___________________________________________
+
+===What is Lutin, and how can I use it?===
+
+Lutin is an application/library builder, it is designed to concurence CMake, Makefile, Ant, graddle ...
+
+Lutin is deveopped in Python 2.x and 3.x to permit many user to play with it.
+
+Python permit to Lutin to be used in many environement in a fast way.
+
+Lutin support can compile every thing you want, just add a builder that you need (not in the common way). Basicly Lutin support languages:
+:** C (ainsi/89/99) ==> .o;
+:** C++ (98/99/03/11/14/...) ==> .o;
+:** .S (assembleur) ==> .o;
+:** .java ==> .class;
+:** .class ==> jar;
+:** .o ==> .a;
+:** .o ==> .so;
+:** .o/.a ==> binary.
+
+Some packege can be generate for some platform:
+:** debian package;
+:** windows application zip;
+:** MacOs application .app;
+:** iOs package;
+:** Android Package .apk.
+
+Compilation is availlable for:
+:** gcc/g++;
+:** clang/clang++.
+
+Manage [b]workspace build[/b] (in oposition of CMake/make/...)
+
+
+=== Install: ===
+
+Requirements: ``Python >= 2.7`` and ``pip``
+
+==== Install lutin: ===
+Just run:
+[code style=bash]
+	pip install lutin
+[/code]
+
+==== Install pip ====
+Install pip on debian/ubuntu:
+[code style=bash]
+	sudo apt-get install pip
+[/code]
+
+Install pip on ARCH-linux:
+[code style=bash]
+	sudo pacman -S pip
+[/code]
+
+Install pip on MacOs:
+[code style=bash]
+	sudo easy_install pip
+[/code]
+
+==== Install from sources ====
+
+[code style=bash]
+	git clone http://github.com/HeeroYui/lutin.git
+	cd lutin
+	sudo ./setup.py install
+[/code]
+
+=== License (APACHE v2.0) ===
+
+Copyright lutin Edouard DUPIN
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+=== History: ===
+
+I work with some builder, Every one have theire own adventages, and their problems.
+The main point I see, is that the polimorphisme of the worktree is really hard.
+The second point is the generation on different platforms is hard too.
+
+Some other problem example:
+:** Makefile is too slow on windows mingw;
+:** Cmake does not create end point package;
+:** none is really simple to write.
+
+Then I create a simple interface that manage all I need. and written in python to permit to be faster on every platform.
+
+[tutorial[000_Build | Tutorials]]

lutin/__init__.py

@@ -21,7 +21,7 @@ is_init = False
 
 if is_init == False:
 	debug.verbose("Use Make as a make stadard")
-	sys.path.append(tools.get_run_folder())
+	sys.path.append(tools.get_run_path())
 	builder.import_path(tools.get_current_path(__file__))
 	module.import_path(tools.get_current_path(__file__))
 	system.import_path(tools.get_current_path(__file__))
@@ -29,16 +29,16 @@ if is_init == False:
 	
 	debug.debug("missing file lutinBase.py ==> loading subPath...");
 	# Import all sub path without out and archive
-	for folder in os.listdir("."):
-		if os.path.isdir(folder)==True:
-			if     folder.lower()!="android" \
-			   and folder.lower()!="archive" \
-			   and folder.lower()!="out" :
-				debug.debug("Automatic load path: '" + folder + "'")
-				builder.import_path(folder)
-				module.import_path(folder)
-				system.import_path(folder)
-				target.import_path(folder)
+	for path in os.listdir("."):
+		if os.path.isdir(path)==True:
+			if     path.lower()!="android" \
+			   and path.lower()!="archive" \
+			   and path.lower()!="out" :
+				debug.debug("Automatic load path: '" + path + "'")
+				builder.import_path(path)
+				module.import_path(path)
+				system.import_path(path)
+				target.import_path(path)
 	
 	builder.init()
 	

lutin/debug.py

@@ -46,7 +46,7 @@ def enable_color():
 	global color_yellow
 	color_yellow = "\033[33m"
 	global color_blue
-	color_blue   = "\033[34m"
+	color_blue   = "\033[01;34m"
 	global color_purple
 	color_purple = "\033[35m"
 	global color_cyan

lutin/depend.py

@@ -11,12 +11,49 @@ import os
 from . import debug
 from . import env
 
-def need_re_build(dst, src, dependFile=None, file_cmd="", cmdLine=""):
-	debug.extreme_verbose("Resuest check of dependency of :")
+def _create_directory_of_file(file):
+	path = os.path.dirname(file)
+	try:
+		os.stat(path)
+	except:
+		os.makedirs(path)
+
+def _file_write_data(path, data):
+	file = open(path, "w")
+	file.write(data)
+	file.close()
+
+def _file_size(path):
+	if not os.path.isfile(path):
+		return 0
+	statinfo = os.stat(path)
+	return statinfo.st_size
+
+def _file_read_data(path, binary=False):
+	if not os.path.isfile(path):
+		return ""
+	if binary == True:
+		file = open(path, "rb")
+	else:
+		file = open(path, "r")
+	data_file = file.read()
+	file.close()
+	return data_file
+
+def create_dependency_file(depend_file, list_files):
+	data = ""
+	for elem in list_files:
+		data += elem + "\n"
+	_create_directory_of_file(depend_file)
+	_file_write_data(depend_file, data)
+
+def need_re_build(dst, src, depend_file=None, file_cmd="", cmd_line="", force_identical=False):
+	debug.extreme_verbose("Request check of dependency of :")
 	debug.extreme_verbose("		dst='" + str(dst) + "'")
-	debug.extreme_verbose("		str='" + str(src) + "'")
-	debug.extreme_verbose("		dept='" + str(dependFile) + "'")
+	debug.extreme_verbose("		src='" + str(src) + "'")
+	debug.extreme_verbose("		dept='" + str(depend_file) + "'")
 	debug.extreme_verbose("		cmd='" + str(file_cmd) + "'")
+	debug.extreme_verbose("		force_identical='" + str(force_identical) + "'")
 	# if force mode selected ==> just force rebuild ...
 	if env.get_force_mode():
 		debug.extreme_verbose("			==> must rebuild (force mode)")
@@ -28,21 +65,23 @@ def need_re_build(dst, src, dependFile=None, file_cmd="", cmdLine=""):
 	   and os.path.exists(dst) == False:
 		debug.extreme_verbose("			==> must rebuild (dst does not exist)")
 		return True
-	if     dst != "" \
-	   and dst != None \
+	if     src != "" \
+	   and src != None \
 	   and os.path.exists(src) == False:
 		debug.warning("			==> unexistant file :'" + src + "'")
 		return True
-	# chek the basic date if the 2 files
+	# Check the basic date if the 2 files
 	if     dst != "" \
 	   and dst != None \
+	   and src != "" \
+	   and src != None \
 	   and os.path.getmtime(src) > os.path.getmtime(dst):
 		debug.extreme_verbose("			==> must rebuild (source time greater)")
 		return True
 	
-	if     dependFile != "" \
-	   and dependFile != None \
-	   and os.path.exists(dependFile) == False:
+	if     depend_file != "" \
+	   and depend_file != None \
+	   and os.path.exists(depend_file) == False:
 		debug.extreme_verbose("			==> must rebuild (no depending file)")
 		return True
 	
@@ -51,69 +90,95 @@ def need_re_build(dst, src, dependFile=None, file_cmd="", cmdLine=""):
 		if os.path.exists(file_cmd) == False:
 			debug.extreme_verbose("			==> must rebuild (no commandLine file)")
 			return True
-		# check if the 2 cmdline are similar :
+		# check if the 2 cmd_line are similar :
 		file2 = open(file_cmd, "r")
-		firstAndUniqueLine = file2.read()
-		if firstAndUniqueLine != cmdLine:
-			debug.extreme_verbose("			==> must rebuild (cmdLines are not identical)")
-			debug.extreme_verbose("				==> '" + cmdLine + "'")
-			debug.extreme_verbose("				==> '" + firstAndUniqueLine + "'")
+		first_and_unique_line = file2.read()
+		if first_and_unique_line != cmd_line:
+			debug.extreme_verbose("			==> must rebuild (cmd_lines are not identical)")
+			debug.extreme_verbose("				==> '" + cmd_line + "'")
+			debug.extreme_verbose("				==> '" + first_and_unique_line + "'")
 			file2.close()
 			return True
 		# the cmdfile is correct ...
 		file2.close()
 	
-	if     dependFile != "" \
-	   and dependFile != None:
-		debug.extreme_verbose("			start parsing dependency file : '" + dependFile + "'")
-		file = open(dependFile, "r")
-		for curLine in file.readlines():
+	if     depend_file != "" \
+	   and depend_file != None:
+		debug.extreme_verbose("			start parsing dependency file : '" + depend_file + "'")
+		file = open(depend_file, "r")
+		for cur_line in file.readlines():
 			# normal file : end with : ": \\n"
-			curLine = curLine[:len(curLine)-1]
+			cur_line = cur_line[:len(cur_line)-1]
 			# removing last \ ...
-			if curLine[len(curLine)-1:] == '\\' :
-				curLine = curLine[:len(curLine)-1]
+			if cur_line[len(cur_line)-1:] == '\\' :
+				cur_line = cur_line[:len(cur_line)-1]
 			# remove white space : 
-			#debug.verbose("				Line (read) : '" + curLine + "'");
-			curLine = curLine.strip()
-			#debug.verbose("				Line (strip) : '" + curLine + "'");
+			#debug.verbose("				Line (read) : '" + cur_line + "'");
+			cur_line = cur_line.strip()
+			#debug.verbose("				Line (strip) : '" + cur_line + "'");
 			
-			testFile=""
-			if curLine[len(curLine)-1:] == ':':
-				debug.extreme_verbose("				Line (no check (already done) : '" + curLine + "'");
-			elif    len(curLine) == 0 \
-			     or curLine == '\\':
-				debug.extreme_verbose("				Line (Not parsed) : '" + curLine + "'");
+			test_file=""
+			if cur_line[len(cur_line)-1:] == ':':
+				debug.extreme_verbose("				Line (no check (already done) : '" + cur_line + "'");
+			elif    len(cur_line) == 0 \
+			     or cur_line == '\\':
+				debug.extreme_verbose("				Line (Not parsed) : '" + cur_line + "'");
 			else:
-				testFile = curLine
-				debug.extreme_verbose("				Line (might check) : '" + testFile + "'");
+				test_file = cur_line
+				debug.extreme_verbose("				Line (might check) : '" + test_file + "'");
 			# really check files:
-			if testFile!="":
+			if test_file != "":
 				debug.extreme_verbose("					==> test");
-				if False==os.path.exists(testFile):
+				if False==os.path.exists(test_file):
 					debug.extreme_verbose("			==> must rebuild (a dependency file does not exist)")
 					file.close()
 					return True
-				if os.path.getmtime(testFile) > os.path.getmtime(dst):
+				if os.path.getmtime(test_file) > os.path.getmtime(dst):
 					debug.extreme_verbose("			==> must rebuild (a dependency file time is newer)")
 					file.close()
 					return True
 		# close the current file :
 		file.close()
+	# check the 2 files are identical:
+	if force_identical == True:
+		# check if the 2 cmd_line are similar :
+		size_src = _file_size(src)
+		size_dst = _file_size(dst)
+		if size_src != size_dst:
+			debug.extreme_verbose("			Force Rewrite not the same size     size_src=" + str(size_src) + " != size_dest=" + str(size_dst))
+			return True
+		data_src = _file_read_data(src, binary=True)
+		data_dst = _file_read_data(dst, binary=True)
+		if data_src != data_dst:
+			debug.extreme_verbose("			Force Rewrite not the same data")
+			return True
 	
 	debug.extreme_verbose("			==> Not rebuild (all dependency is OK)")
 	return False
 
 
 
-def need_re_package(dst, srcList, mustHaveSrc, file_cmd="", cmdLine=""):
-	debug.extreme_verbose("Resuest check of dependency of :")
-	debug.extreme_verbose("		dst='" + dst + "'")
-	debug.extreme_verbose("		src()=")
-	for src in srcList:
-		debug.verbose("			'" + src + "'")
+def need_re_package(dst, src_list, must_have_src, file_cmd="", cmd_line=""):
+	debug.extreme_verbose("Request check of dependency of :")
+	debug.extreme_verbose("		dst='" + str(dst) + "'")
+	compleate_list = []
+	debug.extreme_verbose("		src:")
+	if type(src_list) == str:
+		compleate_list.append(src_list)
+		debug.extreme_verbose("			'" + src_list + "'")
+	elif type(src_list) == list:
+		for src in src_list:
+			compleate_list.append(src)
+			debug.extreme_verbose("			'" + str(src) + "'")
+	elif type(src_list) == dict:
+		for key in src_list:
+			debug.extreme_verbose("			'" + str(key) + "'")
+			for src in src_list[key]:
+				compleate_list.append(src)
+				debug.extreme_verbose("				'" + str(src) + "'")
 	
-	if mustHaveSrc==False and len(srcList)==0:
+	if     must_have_src == False \
+	   and len(compleate_list) == 0:
 		return False
 	
 	# if force mode selected ==> just force rebuild ...
@@ -122,14 +187,14 @@ def need_re_package(dst, srcList, mustHaveSrc, file_cmd="", cmdLine=""):
 		return True
 	
 	# check if the destination existed:
-	if False==os.path.exists(dst):
+	if os.path.exists(dst) == False:
 		debug.extreme_verbose("			==> must re-package (dst does not exist)")
 		return True
 	# chek the basic date if the 2 files
-	if len(srcList)==0:
+	if len(compleate_list) == 0:
 		debug.extreme_verbose("			==> must re-package (no source ???)")
 		return True
-	for src in srcList:
+	for src in compleate_list:
 		if os.path.getmtime(src) > os.path.getmtime(dst):
 			debug.extreme_verbose("			==> must re-package (source time greater) : '" + src + "'")
 			return True
@@ -138,13 +203,13 @@ def need_re_package(dst, srcList, mustHaveSrc, file_cmd="", cmdLine=""):
 		if False==os.path.exists(file_cmd):
 			debug.extreme_verbose("			==> must rebuild (no commandLine file)")
 			return True
-		# check if the 2 cmdline are similar :
+		# check if the 2 cmd_line are similar :
 		file2 = open(file_cmd, "r")
-		firstAndUniqueLine = file2.read()
-		if firstAndUniqueLine != cmdLine:
-			debug.extreme_verbose("			==> must rebuild (cmdLines are not identical)")
-			debug.extreme_verbose("				==> '" + cmdLine + "'")
-			debug.extreme_verbose("				==> '" + firstAndUniqueLine + "'")
+		first_and_unique_line = file2.read()
+		if first_and_unique_line != cmd_line:
+			debug.extreme_verbose("			==> must rebuild (cmd_lines are not identical)")
+			debug.extreme_verbose("				==> '" + cmd_line + "'")
+			debug.extreme_verbose("				==> '" + first_and_unique_line + "'")
 			file2.close()
 			return True
 		# the cmdfile is correct ...

lutin/heritage.py

@@ -12,26 +12,28 @@ import copy
 from . import debug
 
 
-def append_to_list(listout, list):
-	if type(list) == type(str()):
-		if list not in listout:
-			listout.append(list)
+def append_to_list(list_out, elem):
+	if type(elem) == str:
+		if elem not in list_out:
+			list_out.append(elem)
 	else:
 		# mulyiple imput in the list ...
-		for elem in list:
-			if elem not in listout:
-				listout.append(elem)
+		for element in elem:
+			if element not in list_out:
+				list_out.append(element)
 
 
 
 class HeritageList:
 	def __init__(self, heritage = None):
-		self.flags={}
+		self.flags = {}
 		# sources list:
-		self.src=[]
-		self.path={}
-		
-		self.list_heritage=[]
+		self.src = { 'src':[],
+		             'dynamic':[],
+		             'static':[]
+		           }
+		self.path = {}
+		self.list_heritage = []
 		if heritage != None:
 			self.add_heritage(heritage)
 	
@@ -58,10 +60,13 @@ class HeritageList:
 		self.regenerate_tree()
 	
 	def regenerate_tree(self):
-		self.flags={}
+		self.flags = {}
 		# sources list:
-		self.src=[]
-		self.path={}
+		self.src = { 'src':[],
+		             'dynamic':[],
+		             'static':[]
+		           }
+		self.path = {}
 		# reorder heritage list :
 		listHeritage = self.list_heritage
 		self.list_heritage = []
@@ -105,7 +110,9 @@ class HeritageList:
 					self.path[ppp] = value
 				else:
 					append_to_list(self.path[ppp], value)
-			append_to_list(self.src, element.src)
+			append_to_list(self.src['src'], element.src['src'])
+			append_to_list(self.src['dynamic'], element.src['dynamic'])
+			append_to_list(self.src['static'], element.src['static'])
 			if "c-version" in element.flags:
 				ver = element.flags["c-version"]
 				if "c-version" in self.flags:
@@ -121,15 +128,19 @@ class HeritageList:
 
 
 class heritage:
-	def __init__(self, module):
-		self.name=""
-		self.depends=[]
+	def __init__(self, module, target):
+		self.name = ""
+		self.depends = []
 		## Remove all variable to prevent error of multiple definition
 		# all the parameter that the upper classe need when build
-		self.flags={}
+		self.flags = {}
 		# sources list:
-		self.src=[]
-		self.path={}
+		self.src = { 'src':[],
+		             'dynamic':[],
+		             'static':[]
+		           }
+		self.path = {}
+		self.include = ""
 		# update is set at true when data are newly created ==> force upper element to update
 		self.hasBeenUpdated=False
 		
@@ -140,17 +151,44 @@ class heritage:
 			# keep reference because the flags can change in time
 			self.flags = module.flags["export"]
 			self.path = module.path["export"]
+			# if the user install some header ==> they will ba autoamaticaly exported ...
+			if target != None:
+				if len(module.header) > 0:
+					self.include = target.get_build_path_include(module.name)
 	
-	def add_depends(self, depend):
-		self.depends.append(depend)
+	def add_depends(self, elements):
+		self.depends.append(elements)
 	
 	def add_import_path(self, list):
 		append_to_list(self.path, list)
 	
-	def add_sources(self, list):
-		if type(list) == type(None):
+	def add_sources(self, elements):
+		if type(elements) == type(None):
 			debug.error("try add element none in a list ...")
-		append_to_list(self.src, list)
+		append_to_list(self.src['src'], elements)
+	
+	def add_lib_static(self, elements):
+		if type(elements) == type(None):
+			debug.error("try add element none in a list ...")
+		append_to_list(self.src['static'], elements)
+	
+	def add_lib_dynamic(self, elements):
+		if type(elements) == type(None):
+			debug.error("try add element none in a list ...")
+		append_to_list(self.src['dynamic'], elements)
+	
+	def add_lib_interpreted(self, type_interpretation, elements):
+		# TODO : Think at a better methodologie ...
+		if type(elements) == type(None):
+			debug.error("try add element none in a list ...")
+		append_to_list(self.src['src'], elements)
+	
+	def auto_add_build_header(self):
+		if self.include != "":
+			# TODO :Set it better :
+			if 'c' not in self.path:
+				self.path['c'] = []
+			self.path['c'].append(self.include)
 	
 	def need_update(self, list):
 		self.hasBeenUpdated=True

lutin/image.py

@@ -14,14 +14,14 @@ from . import tools
 from . import multiprocess
 from . import depend
 
-enableResizeImage = True
+enable_resize_image = True
 try:
 	if platform.system() == "Darwin":
 		import CoreGraphics
 	else:
 		from PIL import Image
 except:
-	enableResizeImage = False
+	enable_resize_image = False
 	debug.warning("Missing python tools : CoreGraphics (MacOs) or PIL") 
 
 def get_pow_2_multiple(size):
@@ -34,31 +34,31 @@ def get_pow_2_multiple(size):
 #        check if force requested
 #        check if time change
 #        check if command line change
-def resize(srcFile, destFile, x, y, cmd_file=None):
-	if enableResizeImage == False:
+def resize(src_file, dest_file, x, y, cmd_file=None):
+	if enable_resize_image == False:
 		return
-	if os.path.exists(srcFile) == False:
-		debug.error("Request a resize an image that does not existed : '" + srcFile + "'")
-	cmd_line = "resize Image : " + srcFile + " ==> " + destFile + " newSize=(" + str(x) + "x" + str(y) + ")"
-	if False==depend.need_re_build(destFile, srcFile, file_cmd=cmd_file , cmdLine=cmd_line):
+	if os.path.exists(src_file) == False:
+		debug.error("Request a resize an image that does not existed : '" + src_file + "'")
+	cmd_line = "resize Image : " + src_file + " ==> " + dest_file + " newSize=(" + str(x) + "x" + str(y) + ")"
+	if False==depend.need_re_build(dest_file, src_file, file_cmd=cmd_file , cmd_line=cmd_line):
 		return
 	# add cmdLine ...
 	x = get_pow_2_multiple(x)
-	extension = destFile[destFile.rfind('.'):]
+	extension = dest_file[dest_file.rfind('.'):]
 	if platform.system() == "Darwin":
-		source_image = CoreGraphics.CGImageImport(CoreGraphics.CGDataProviderCreateWithFilename(srcFile))
+		source_image = CoreGraphics.CGImageImport(CoreGraphics.CGDataProviderCreateWithFilename(src_file))
 		source_width = source_image.getWidth()
 		source_height = source_image.getHeight()
 		if source_width <= x:
 			# for small image just copy:
-			tools.copy_file(srcFile, destFile)
+			tools.copy_file(src_file, dest_file)
 		else:
 			if y <= 0:
 				# keep ratio :
 				y = int(float(x) * float(source_height) / float(source_width))
 			y = get_pow_2_multiple(y)
-			debug.print_element("resize Image (" + str(x) + "x" + str(y) + ")", srcFile, "==>", destFile)
-			debug.debug("Resize image: " + srcFile + " size=(" + str(source_width) + "x" + str(source_height) + ") -> (" + str(x) + "x" + str(y) + ")")
+			debug.print_element("resize Image (" + str(x) + "x" + str(y) + ")", src_file, "==>", dest_file)
+			debug.debug("Resize image: " + src_file + " size=(" + str(source_width) + "x" + str(source_height) + ") -> (" + str(x) + "x" + str(y) + ")")
 			source_image_rect = CoreGraphics.CGRectMake(0, 0, source_width, source_height)
 			new_image = source_image.createWithImageInRect(source_image_rect)
 			colors_space = CoreGraphics.CGColorSpaceCreateDeviceRGB()
@@ -67,27 +67,27 @@ def resize(srcFile, destFile, x, y, cmd_file=None):
 			context.setInterpolationQuality(CoreGraphics.kCGInterpolationHigh)
 			new_image_rect = CoreGraphics.CGRectMake(0, 0, x, y)
 			context.drawImage(new_image_rect, new_image)
-			tools.create_directory_of_file(destFile)
+			tools.create_directory_of_file(dest_file)
 			if extension == ".jpeg":
-				context.writeToFile(destFile, CoreGraphics.kCGImageFormatJPEG)
+				context.writeToFile(dest_file, CoreGraphics.kCGImageFormatJPEG)
 			elif extension == ".png":
-				context.writeToFile(destFile, CoreGraphics.kCGImageFormatPNG)
+				context.writeToFile(dest_file, CoreGraphics.kCGImageFormatPNG)
 			else:
-				debug.error(" can not manage extention ... : " + destFile)
+				debug.error(" can not manage extention ... : " + dest_file)
 	else:
-		# open an image file (.bmp,.jpg,.png,.gif) you have in the working folder
-		im1 = Image.open(srcFile)
+		# open an image file (.bmp,.jpg,.png,.gif) you have in the working path
+		im1 = Image.open(src_file)
 		if im1.size[0] <= x:
 			# for small image just copy:
-			tools.copy_file(srcFile, destFile)
+			tools.copy_file(src_file, dest_file)
 		else:
 			if y <= 0:
 				# keep ratio :
 				y = int(float(x) * float(im1.size[1]) / float(im1.size[0]))
 			y = get_pow_2_multiple(y)
-			debug.print_element("resize Image (" + str(x) + "x" + str(y) + ")", srcFile, "==>", destFile)
+			debug.print_element("resize Image (" + str(x) + "x" + str(y) + ")", src_file, "==>", dest_file)
 			# use one of these filter options to resize the image
 			tmpImage = im1.resize((x, y), Image.ANTIALIAS)
-			tools.create_directory_of_file(destFile)
-			tmpImage.save(destFile)
-	multiprocess.store_command(cmd_line, cmd_file)
+			tools.create_directory_of_file(dest_file)
+			tmpImage.save(dest_file)
+	tools.store_command(cmd_line, cmd_file)

lutin/license.py

@@ -0,0 +1,100 @@
+#!/usr/bin/python
+##
+## @author Edouard DUPIN
+##
+## @copyright 2012, Edouard DUPIN, all right reserved
+##
+## @license APACHE v2.0 (see license file)
+##
+
+license_base = {
+	"APACHE-2": {
+		"generic":True,
+		"contaminate-static":False,
+		"contaminate-dynamic":False,
+		"redistribute-source":False,
+		"title":"APACHE v2.0 license",
+		"licence-file":"licence/apache-2.txt"
+		},
+	"GPL-2": {
+		"generic":True,
+		"contaminate-static":True,
+		"contaminate-dynamic":True,
+		"redistribute-source":True,
+		"title":"GPL: Gnu Public Licence v2.0",
+		"licence-file":"licence/GPL-2.txt"
+		},
+	"GPL-3": {
+		"generic":True,
+		"contaminate-static":True,
+		"contaminate-dynamic":True,
+		"redistribute-source":True,
+		"title":"GPL: GNU General Public License v3.0",
+		"licence-file":"licence/GPL-3.txt"
+		},
+	"LGPL-2": {
+		"generic":True,
+		"contaminate-static":False,
+		"contaminate-dynamic":False,
+		"redistribute-source":True,
+		"title":"LGPL: GNU Lesser General Public License v2.0",
+		"licence-file":"licence/LGPL-2.txt"
+		},
+	"LGPL-3": {
+		"generic":True,
+		"contaminate-static":True,
+		"contaminate-dynamic":False,
+		"redistribute-source":True,
+		"title":"LGPL: GNU Lesser General Public License v3.0",
+		"licence-file":"licence/LGPL-3.txt"
+		},
+	"MIT": {
+		"generic":True,
+		"contaminate-static":False,
+		"contaminate-dynamic":False,
+		"redistribute-source":False,
+		"title":"MIT: Massachusetts Institute of Technology License",
+		"licence-file":"licence/MIT.txt"
+		},
+	"BSD-2": {
+		"generic":True,
+		"contaminate-static":False,
+		"contaminate-dynamic":False,
+		"redistribute-source":False,
+		"title":"BSD 2-clauses: Berkeley Software Distribution License",
+		"licence-file":"licence/BSD-2.txt"
+		},
+	"BSD-3": {
+		"generic":True,
+		"contaminate-static":False,
+		"contaminate-dynamic":False,
+		"redistribute-source":False,
+		"title":"BSD 3-clauses: Berkeley Software Distribution License",
+		"licence-file":"licence/BSD-3.txt"
+		},
+	"BSD-4": {
+		"generic":True,
+		"contaminate-static":False,
+		"contaminate-dynamic":False,
+		"redistribute-source":False,
+		"title":"BSD 4-clauses: Berkeley Software Distribution License",
+		"licence-file":"licence/BSD-4.txt"
+		},
+	"PNG": {
+		"generic":True,
+		"contaminate-static":False,
+		"contaminate-dynamic":False,
+		"redistribute-source":False,
+		"title":"PNG License",
+		"licence-file":"licence/png.txt"
+		}
+}
+
+def get_basic_list():
+	global license_base
+	out = []
+	for name in license_base:
+		out.append(name)
+	return out
+
+

lutin/multiprocess.py

@@ -20,8 +20,9 @@ import subprocess
 import shlex
 # Local import
 from . import debug
-import tools
+from . import tools
 from . import env
+from . import depend
 
 queueLock = threading.Lock()
 workQueue = queue.Queue()
@@ -42,44 +43,6 @@ isinit = False # the thread are initialized
 errorOccured = False # a thread have an error
 processorAvaillable = 1 # number of CPU core availlable
 
-def store_command(cmd_line, file):
-	# write cmd line only after to prevent errors ...
-	if    file != "" \
-	   or file != None:
-		return;
-	debug.verbose("create cmd file: " + file)
-	# Create directory:
-	tools.create_directory_of_file(file)
-	# Store the command Line:
-	file2 = open(file, "w")
-	file2.write(cmd_line)
-	file2.flush()
-	file2.close()
-
-def store_warning(file, output, err):
-	# write warning line only after to prevent errors ...
-	if    file == "" \
-	   or file == None:
-		return;
-	if env.get_warning_mode() == False:
-		debug.verbose("remove warning file: " + file)
-		# remove file if exist...
-		tools.remove_file(file);
-		return;
-	debug.verbose("create warning file: " + file)
-	# Create directory:
-	tools.create_directory_of_file(file)
-	# Store the command Line:
-	file2 = open(file, "w")
-	file2.write("===== output =====\n")
-	file2.write(output)
-	file2.write("\n\n")
-	file2.write("===== error =====\n")
-	file2.write(err)
-	file2.write("\n\n")
-	file2.flush()
-	file2.close()
-
 ##
 ## @brief Execute the command and ruturn generate data
 ##
@@ -108,7 +71,7 @@ def run_command_direct(cmd_line):
 		return False
 
 
-def run_command(cmd_line, store_cmd_line="", build_id=-1, file="", store_output_file=""):
+def run_command(cmd_line, store_cmd_line="", build_id=-1, file="", store_output_file="", depend_data=None):
 	global errorOccured
 	global exitFlag
 	global currentIdExecution
@@ -128,11 +91,13 @@ def run_command(cmd_line, store_cmd_line="", build_id=-1, file="", store_output_
 		output = output.decode("utf-8")
 		err = err.decode("utf-8")
 	# store error if needed:
-	store_warning(store_output_file, output, err)
+	tools.store_warning(store_output_file, output, err)
 	# Check error :
 	if p.returncode == 0:
 		debug.debug(env.print_pretty(cmd_line))
 		queueLock.acquire()
+		if depend_data != None:
+			depend.create_dependency_file(depend_data['file'], depend_data['data'])
 		# TODO : Print the output all the time .... ==> to show warnings ...
 		if build_id >= 0 and (output != "" or err != ""):
 			debug.warning("output in subprocess compiling: '" + file + "'")
@@ -171,7 +136,7 @@ def run_command(cmd_line, store_cmd_line="", build_id=-1, file="", store_output_
 		return
 	debug.verbose("done 3")
 	# write cmd line only after to prevent errors ...
-	store_command(cmd_line, store_cmd_line)
+	tools.store_command(cmd_line, store_cmd_line)
 
 
 
@@ -201,7 +166,7 @@ class myThread(threading.Thread):
 					cmdLine = data[1]
 					cmdStoreFile = data[3]
 					debug.print_element( "[" + str(data[4]) + "][" + str(self.thread_id) + "] " + comment[0], comment[1], comment[2], comment[3])
-					run_command(cmdLine, cmdStoreFile, build_id=data[4], file=comment[3], store_output_file=data[5])
+					run_command(cmdLine, cmdStoreFile, build_id=data[4], file=comment[3], store_output_file=data[5], depend_data=data[6])
 				else:
 					debug.warning("unknow request command : " + data[0])
 			else:
@@ -256,18 +221,18 @@ def un_init():
 
 
 
-def run_in_pool(cmd_line, comment, store_cmd_line="", store_output_file=""):
+def run_in_pool(cmd_line, comment, store_cmd_line="", store_output_file="", depend_data=None):
 	global currentIdExecution
 	if processorAvaillable <= 1:
 		debug.print_element(comment[0], comment[1], comment[2], comment[3])
-		run_command(cmd_line, store_cmd_line, file=comment[3], store_output_file=store_output_file)
+		run_command(cmd_line, store_cmd_line, file=comment[3], store_output_file=store_output_file, depend_data=depend_data)
 		return
 	# multithreaded mode
 	init()
 	# Fill the queue
 	queueLock.acquire()
 	debug.verbose("add : in pool cmdLine")
-	workQueue.put(["cmdLine", cmd_line, comment, store_cmd_line, currentIdExecution, store_output_file])
+	workQueue.put(["cmdLine", cmd_line, comment, store_cmd_line, currentIdExecution, store_output_file, depend_data])
 	currentIdExecution +=1;
 	queueLock.release()
 	

lutin/system.py

@@ -41,7 +41,7 @@ class System:
 		if True==order:
 			listout.sort()
 	
-	def append_to_internalList(self, listout, list, order=False):
+	def append_to_internal_list(self, listout, list, order=False):
 		if type(list) == type(str()):
 			self.append_and_check(listout, list, order)
 		else:
@@ -50,22 +50,22 @@ class System:
 				self.append_and_check(listout, elem, order)
 	
 	def add_export_flag_LD(self, list):
-		self.append_to_internalList(self.export_flags_ld, list)
+		self.append_to_internal_list(self.export_flags_ld, list)
 	
 	def add_export_flag_CC(self, list):
-		self.append_to_internalList(self.export_flags_cc, list)
+		self.append_to_internal_list(self.export_flags_cc, list)
 	
 	def add_export_flag_XX(self, list):
-		self.append_to_internalList(self.export_flags_xx, list)
+		self.append_to_internal_list(self.export_flags_xx, list)
 	
 	def add_export_flag_M(self, list):
-		self.append_to_internalList(self.export_flags_m, list)
+		self.append_to_internal_list(self.export_flags_m, list)
 	
 	def add_export_flag_MM(self, list):
-		self.append_to_internalList(self.export_flags_mm, list)
+		self.append_to_internal_list(self.export_flags_mm, list)
 	
 	def add_export_SRC(self, list):
-		self.append_to_internalList(self.export_src, list)
+		self.append_to_internal_list(self.export_src, list)
 	
 	def add_action(self, name_of_state="PACKAGE", level=5, name="no-name", action=None):
 		if name_of_state not in self.action_on_state:
@@ -158,7 +158,7 @@ def exist(lib_name, target_name, target) :
 					data["system"] = theSystem.System(target)
 					data["exist"] = data["system"].valid
 				except:
-					debug.debug("Not find: '" + data["name"] + "'")
+					debug.warning("Not find: '" + data["name"] + "' ==> get exception")
 			return data["exist"]
 	return False
 

lutin/target.py

@@ -18,7 +18,6 @@ from . import heritage
 from . import tools
 from . import module
 from . import system
-from . import image
 from . import multiprocess
 
 class Target:
@@ -43,7 +42,7 @@ class Target:
 		
 		# todo : remove this :
 		self.sumulator = config["simulation"]
-		self.name=name
+		self.name = name
 		self.end_generate_package = config["generate-package"]
 		debug.info("=================================");
 		debug.info("== Target='" + self.name + "' " + config["bus-size"] + " bits for arch '" + config["arch"] + "'");
@@ -78,13 +77,14 @@ class Target:
 		self.suffix_warning='.warning'
 		self.suffix_dependence='.d'
 		self.suffix_obj='.o'
+		self.prefix_lib='lib'
 		self.suffix_lib_static='.a'
 		self.suffix_lib_dynamic='.so'
 		self.suffix_binary=''
 		self.suffix_package='.deb'
 		
-		self.folder_generate_code="/generate_header"
-		self.folder_arch="/" + self.name
+		self.path_generate_code="/generate_header"
+		self.path_arch="/" + self.name
 		
 		if "debug" == self.config["mode"]:
 			self.global_flags_cc.append("-g")
@@ -101,11 +101,21 @@ class Target:
 			self.global_flags_ld.append("-fprofile-arcs")
 			self.global_flags_ld.append("-ftest-coverage")
 		
-		self.update_folder_tree()
-		self.folder_bin="/usr/bin"
-		self.folder_lib="/usr/lib"
-		self.folder_data="/usr/share"
-		self.folder_doc="/usr/share/doc"
+		self.update_path_tree()
+		"""
+		self.path_bin="usr/bin"
+		self.path_lib="usr/lib"
+		self.path_data="usr/share"
+		self.path_doc="usr/share/doc"
+		"""
+		self.path_bin="bin"
+		self.path_lib="lib"
+		self.path_data="share"
+		self.path_doc="doc"
+		self.path_include="include"
+		self.path_object="obj"
+		
+		
 		self.build_done=[]
 		self.build_tree_done=[]
 		self.module_list=[]
@@ -115,12 +125,21 @@ class Target:
 		self.sysroot=""
 		
 		self.action_on_state={}
+		
+		# set some default package path
+		self.pkg_path_version_file = "version.txt"
+		self.pkg_path_maintainer_file = "maintainer.txt"
+		self.pkg_path_application_name_file = "appl_name.txt"
+		self.pkg_path_application_description_file = "appl_description.txt"
+		self.pkg_path_readme_file = "readme.txt"
+		self.pkg_path_change_log_file = "changelog.txt"
+		
 	
-	def update_folder_tree(self):
-		self.folder_out="/out/" + self.name + "_" + self.config["arch"] + "_" + self.config["bus-size"] + "/" + self.config["mode"]
-		self.folder_final="/final/" + self.config["compilator"]
-		self.folder_staging="/staging/" + self.config["compilator"]
-		self.folder_build="/build/" + self.config["compilator"]
+	def update_path_tree(self):
+		self.path_out = os.path.join("out", self.name + "_" + self.config["arch"] + "_" + self.config["bus-size"], self.config["mode"])
+		self.path_final = os.path.join("final", self.config["compilator"])
+		self.path_staging = os.path.join("staging", self.config["compilator"])
+		self.path_build = os.path.join("build", self.config["compilator"])
 	
 	def create_number_from_version_string(self, data):
 		list = data.split(".")
@@ -149,7 +168,7 @@ class Target:
 		if self.config["compilator"] == "clang":
 			self.cc = self.cross + "clang"
 			self.xx = self.cross + "clang++"
-			self.ar=self.cross + "llvm-ar"
+			#self.ar=self.cross + "llvm-ar"
 			self.ranlib=""
 		else:
 			self.cc = self.cross + "gcc"
@@ -171,67 +190,31 @@ class Target:
 		self.nm = self.cross + "nm"
 		self.strip = self.cross + "strip"
 		self.dlltool = self.cross + "dlltool"
-		self.update_folder_tree()
+		self.update_path_tree()
 	
 	def get_build_mode(self):
 		return self.config["mode"]
 	
-	def add_image_staging(self, inputFile, outputFile, sizeX, sizeY, cmdFile=None):
-		for source, dst, x, y, cmdFile2 in self.list_final_file:
-			if dst == outputFile :
-				debug.verbose("already added : " + outputFile)
-				return
-		debug.verbose("add file : '" + inputFile + "' ==> '" + outputFile + "'")
-		self.list_final_file.append([inputFile,outputFile, sizeX, sizeY, cmdFile])
-	
-	def add_file_staging(self, inputFile, outputFile, cmdFile=None):
-		for source, dst, x, y, cmdFile2 in self.list_final_file:
-			if dst == outputFile :
-				debug.verbose("already added : " + outputFile)
-				return
-		debug.verbose("add file : '" + inputFile + "' ==> '" + outputFile + "'");
-		self.list_final_file.append([inputFile, outputFile, -1, -1, cmdFile])
-	
-	def copy_to_staging(self, binaryName):
-		baseFolder = self.get_staging_folder_data(binaryName)
-		for source, dst, x, y, cmdFile in self.list_final_file:
-			if     cmdFile != None \
-			   and cmdFile != "":
-				debug.verbose("cmd file " + cmdFile)
-			if x == -1:
-				debug.verbose("must copy file : '" + source + "' ==> '" + dst + "'");
-				tools.copy_file(source, baseFolder+"/"+dst, cmdFile)
-			else:
-				debug.verbose("resize image : '" + source + "' ==> '" + dst + "' size=(" + str(x) + "," + str(y) + ")");
-				image.resize(source, baseFolder+"/"+dst, x, y, cmdFile)
-	
-	
 	def clean_module_tree(self):
 		self.build_tree_done = []
 		self.list_final_file = []
 	
-	
-	# TODO : Remove this hack ... ==> really bad ... but usefull
-	def set_ewol_folder(self, folder):
-		self.folder_ewol = folder
-	
-	
 	def get_full_name_source(self, basePath, file):
 		if file[0] == '/':
 			if tools.os.path.isfile(file):
 				return file
 		return basePath + "/" + file
 	
-	def get_full_name_cmd(self, moduleName, basePath, file):
+	def get_full_name_cmd(self, module_name, basePath, file):
 		if file[0] == '/':
 			if tools.os.path.isfile(file):
 				return file + self.suffix_cmd_line
-		return self.get_build_folder(moduleName) + "/" + file + self.suffix_cmd_line
+		return self.get_build_path_object(module_name) + "/" + file + self.suffix_cmd_line
 	
-	def get_full_name_warning(self, moduleName, basePath, file):
-		return self.get_build_folder(moduleName) + "/" + file + self.suffix_warning;
+	def get_full_name_warning(self, module_name, basePath, file):
+		return self.get_build_path_object(module_name) + "/" + file + self.suffix_warning;
 	
-	def get_full_name_destination(self, moduleName, basePath, file, suffix, remove_suffix=False):
+	def get_full_name_destination(self, module_name, basePath, file, suffix, remove_suffix=False):
 		# special patch for java file:
 		if file[-4:] == "java":
 			for elem in ["org/", "com/"]:
@@ -246,10 +229,10 @@ class Target:
 			suffix = suffix[0]
 		else:
 			suffix = ""
-		return self.get_build_folder(moduleName) + "/" + file + suffix
+		return self.get_build_path_object(module_name) + "/" + file + suffix
 	
-	def get_full_dependency(self, moduleName, basePath, file):
-		return self.get_build_folder(moduleName) + "/" + file + self.suffix_dependence
+	def get_full_dependency(self, module_name, basePath, file):
+		return self.get_build_path_object(module_name) + "/" + file + self.suffix_dependence
 	
 	"""
 		return a list of 3 elements :
@@ -257,52 +240,110 @@ class Target:
 			1 : destination file
 			2 : dependence files module (*.d)
 	"""
-	def generate_file(self,binaryName,moduleName,basePath,file,type):
+	# TODO : Remove this it is urgent ...
+	def generate_file(self,
+	                  binary_name,
+	                  module_name,
+	                  basePath,
+	                  file,
+	                  type):
+		#debug.warning("genrate_file(" + str(binary_name) + "," + str(module_name) + "," + str(basePath) + "," + str(file) + "," + str(type) + ")")
 		list=[]
 		if (type=="bin"):
 			list.append(file)
-			list.append(self.get_staging_folder(binaryName) + "/" + self.folder_bin + "/" + moduleName + self.suffix_binary)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + self.suffix_dependence)
-			list.append(self.get_build_folder(binaryName) + "/" + self.folder_bin + "/" + moduleName + self.suffix_binary + self.suffix_cmd_line)
-			list.append(self.get_build_folder(binaryName) + "/" + self.folder_bin + "/" + moduleName + self.suffix_binary + self.suffix_warning)
+			list.append(self.get_build_file_bin(binary_name))
+			list.append(os.path.join(self.get_build_path(module_name), module_name + self.suffix_dependence))
+			list.append(self.get_build_file_bin(binary_name) + self.suffix_cmd_line)
+			list.append(self.get_build_file_bin(binary_name) + self.suffix_warning)
 		elif (type=="lib-shared"):
 			list.append(file)
-			list.append(self.get_staging_folder(binaryName) + "/" + self.folder_lib + "/" + moduleName + self.suffix_lib_dynamic)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + self.suffix_dependence)
-			list.append(self.get_build_folder(binaryName) + "/" + self.folder_lib + "/" + moduleName + self.suffix_lib_dynamic + self.suffix_cmd_line)
-			list.append(self.get_build_folder(binaryName) + "/" + self.folder_lib + "/" + moduleName + self.suffix_lib_dynamic + self.suffix_warning)
+			list.append(self.get_build_file_dynamic(module_name))
+			list.append(os.path.join(self.get_build_path(module_name), self.path_lib, module_name + self.suffix_dependence))
+			list.append(self.get_build_file_dynamic(module_name) + self.suffix_cmd_line)
+			list.append(self.get_build_file_dynamic(module_name) + self.suffix_warning)
 		elif (type=="lib-static"):
 			list.append(file)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + self.suffix_lib_static)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + self.suffix_dependence)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + self.suffix_lib_static + self.suffix_cmd_line)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + self.suffix_lib_static + self.suffix_warning)
+			list.append(self.get_build_file_static(module_name))
+			list.append(os.path.join(self.get_build_path(module_name), self.path_lib, module_name + self.suffix_dependence))
+			list.append(self.get_build_file_static(module_name) + self.suffix_cmd_line)
+			list.append(self.get_build_file_static(module_name) + self.suffix_warning)
 		elif (type=="jar"):
 			list.append(file)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + ".jar")
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + ".jar" + self.suffix_dependence)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + ".jar" + self.suffix_cmd_line)
-			list.append(self.get_build_folder(moduleName) + "/" + moduleName + ".jar" + self.suffix_warning)
+			list.append(os.path.join(self.get_build_path(module_name), module_name + ".jar"))
+			list.append(os.path.join(self.get_build_path(module_name), module_name + ".jar" + self.suffix_dependence))
+			list.append(os.path.join(self.get_build_path(module_name), module_name + ".jar" + self.suffix_cmd_line))
+			list.append(os.path.join(self.get_build_path(module_name), module_name + ".jar" + self.suffix_warning))
 		elif (type=="image"):
-			list.append(self.get_build_folder(binaryName) + "/data/" + file + self.suffix_cmd_line)
+			list.append(os.path.join(self.get_build_path(binary_name), "data", file + self.suffix_cmd_line))
 		else:
 			debug.error("unknow type : " + type)
 		return list
 	
-	def get_final_folder(self):
-		return tools.get_run_folder() + self.folder_out + self.folder_final
+	##
+	## @brief Get the fianal path ==> contain all the generated packages
+	## @return The path of the pa
+	##
+	def get_final_path(self):
+		return os.path.join(tools.get_run_path(), self.path_out, self.path_final)
 	
-	def get_staging_folder(self, binaryName):
-		return tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + binaryName
+	def get_staging_path(self, binary_name):
+		return os.path.join(tools.get_run_path(), self.path_out, self.path_staging, binary_name)
 	
-	def get_staging_folder_data(self, binaryName):
-		return self.get_staging_folder(binaryName) + self.folder_data + "/" + binaryName
+	def get_build_path(self, module_name):
+		#debug.warning("A=" + str(tools.get_run_path()) + " " + str(self.path_out) + " " + str(self.path_build) + " " + str(module_name))
+		return os.path.join(tools.get_run_path(), self.path_out, self.path_build, module_name)
 	
-	def get_build_folder(self, moduleName):
-		return tools.get_run_folder() + self.folder_out + self.folder_build + "/" + moduleName
 	
-	def get_doc_folder(self, moduleName):
-		return tools.get_run_folder() + self.folder_out + self.folder_doc + "/" + moduleName
+	def get_build_path_object(self, binary_name):
+		return os.path.join(self.get_build_path(binary_name), self.path_object)
+	
+	def get_build_path_bin(self, binary_name):
+		return os.path.join(self.get_build_path(binary_name), self.path_bin)
+	
+	def get_build_path_lib(self, binary_name):
+		return os.path.join(self.get_build_path(binary_name), self.path_lib)
+	
+	def get_build_path_data(self, binary_name):
+		return os.path.join(self.get_build_path(binary_name), self.path_data, binary_name)
+	
+	def get_build_path_include(self, binary_name):
+		return os.path.join(self.get_build_path(binary_name), self.path_include)
+	
+	
+	def get_build_file_bin(self, binary_name):
+		return os.path.join(self.get_build_path_bin(binary_name), binary_name + self.suffix_binary)
+	
+	def get_build_file_static(self, binary_name):
+		return os.path.join(self.get_build_path_lib(binary_name), self.prefix_lib + binary_name + self.suffix_lib_static)
+	
+	def get_build_file_dynamic(self, binary_name):
+		return os.path.join(self.get_build_path_lib(binary_name), self.prefix_lib + binary_name + self.suffix_lib_dynamic)
+	
+	
+	
+	
+	def get_staging_path_bin(self, package_name):
+		return os.path.join(self.get_staging_path(package_name), self.path_bin)
+	
+	def get_staging_path_lib(self, package_name):
+		return os.path.join(self.get_staging_path(package_name), self.path_lib, package_name)
+	
+	def get_staging_path_data(self, package_name):
+		return os.path.join(self.get_staging_path(package_name), self.path_data, package_name)
+	
+	def get_staging_path_include(self, package_name):
+		return os.path.join(self.get_staging_path(package_name), self.path_include)
+	
+	"""
+	def get_staging_file_bin(self, package_name, binary_name):
+		return os.path.join(self.get_staging_path_bin(package_name), binary_name + self.suffix_binary)
+	"""
+	
+	
+	
+	def get_doc_path(self, module_name):
+		return os.path.join(tools.get_run_path(), self.path_out, self.path_doc, module_name)
+	
 	
 	def is_module_build(self, my_module):
 		for mod in self.build_done:
@@ -323,7 +364,7 @@ class Target:
 		self.module_list.append(newModule)
 	
 	def get_module(self, name):
-		for mod in self.build_done:
+		for mod in self.module_list:
 			if mod.name == name:
 				return mod
 		debug.error("the module '" + str(name) + "'does not exist/already build")
@@ -409,8 +450,9 @@ class Target:
 				mod.clean(self)
 		else:
 			# get the action an the module ....
-			gettedElement = name.split("?")
-			moduleName = gettedElement[0]
+			name2 = name.replace("@", "?")
+			gettedElement = name2.split("?")
+			module_name = gettedElement[0]
 			if len(gettedElement)>=3:
 				sub_action_name = gettedElement[2]
 			else:
@@ -419,41 +461,41 @@ class Target:
 				actionName = gettedElement[1]
 			else :
 				actionName = "build"
-			debug.verbose("requested : " + moduleName + "?" + actionName)
+			debug.verbose("requested : " + module_name + "?" + actionName)
 			if actionName == "install":
-				self.build(moduleName + "?build")
-				self.install_package(moduleName)
+				self.build(module_name + "?build")
+				self.install_package(module_name)
 			elif actionName == "uninstall":
-				self.un_install_package(moduleName)
+				self.un_install_package(module_name)
 			elif actionName == "log":
-				self.Log(moduleName)
+				self.Log(module_name)
 			else:
-				present = self.load_if_needed(moduleName, optionnal=optionnal)
+				present = self.load_if_needed(module_name, optionnal=optionnal)
 				if     present == False \
 				   and optionnal == True:
 					return [heritage.HeritageList(), False]
 				# clean requested
 				for mod in self.module_list:
-					if mod.name == moduleName:
+					if mod.name == module_name:
 						if actionName == "dump":
-							debug.info("dump module '" + moduleName + "'")
+							debug.info("dump module '" + module_name + "'")
 							return mod.display(self)
 						elif actionName == "clean":
-							debug.info("clean module '" + moduleName + "'")
+							debug.info("clean module '" + module_name + "'")
 							return mod.clean(self)
 						elif actionName == "gcov":
-							debug.debug("gcov on module '" + moduleName + "'")
+							debug.debug("gcov on module '" + module_name + "'")
 							if sub_action_name == "output":
 								return mod.gcov(self, generate_output=True)
 							return mod.gcov(self, generate_output=False)
 						elif actionName == "build":
-							debug.debug("build module '" + moduleName + "'")
+							debug.debug("build module '" + module_name + "'")
 							if optionnal == True:
 								return [mod.build(self, None), True]
 							return mod.build(self, None)
 				if optionnal == True:
 					return [heritage.HeritageList(), False]
-				debug.error("not know module name : '" + moduleName + "' to '" + actionName + "' it")
+				debug.error("not know module name : '" + module_name + "' to '" + actionName + "' it")
 	
 	def add_action(self, name_of_state="PACKAGE", level=5, name="no-name", action=None):
 		debug.verbose("add action : " + name)
@@ -461,59 +503,265 @@ class Target:
 			self.action_on_state[name_of_state] = [[level, name, action]]
 		else:
 			self.action_on_state[name_of_state].append([level, name, action])
+	
+	##
+	## @brief Create a package/bundle for the platform.
+	## @param[in] pkg_name Package Name (generic name)
+	## @param[in] pkg_properties Property of the package
+	## @param[in] base_pkg_path Base path of the package
+	## @param[in] heritage_list List of dependency of the package
+	## @param[in] static The package is build in static mode
+	##
+	def make_package(self, pkg_name, pkg_properties, base_pkg_path, heritage_list):
+		#The package generated depend of the type of the element:
+		end_point_module_name = heritage_list.list_heritage[-1].name
+		module = self.get_module(end_point_module_name)
+		if module == None:
+			debug.error("can not create package ... ");
+		if module.get_type() == 'PREBUILD':
+			#nothing to do ...
+			return
+		if    module.get_type() == 'LIBRARY' \
+		   or module.get_type() == 'LIBRARY_DYNAMIC' \
+		   or module.get_type() == 'LIBRARY_STATIC':
+			debug.info("Can not create package for library");
+			return
+		if    module.get_type() == 'BINARY' \
+		   or module.get_type() == 'BINARY_STAND_ALONE':
+			self.make_package_generic_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = True)
+		if module.get_type() == 'BINARY_SHARED':
+			self.make_package_generic_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = False)
+		if module.get_type() == 'PACKAGE':
+			debug.info("Can not create package for package");
+			return
+		return
+	
+	##
+	## @brief Create a generic tree of the shared data for each platform
+	## @param[in] path_package Path of the basic install folder of the application
+	## @param[in] pkg_name Package Name (generic name)
+	## @param[in] heritage_list List of dependency of the package
+	## @param[in] static The package is build in static mode
+	##
+	def make_package_binary_data(self, path_package, pkg_name, base_pkg_path, heritage_list, static):
+		target_shared_path = os.path.join(path_package, self.pkg_path_data)
+		if static == True:
+			path_package_data = os.path.join(target_shared_path, pkg_name)
+		else:
+			path_package_data = target_shared_path
+		tools.create_directory_of_file(path_package_data)
+		# prepare list of copy files
+		copy_list={}
+		debug.debug("heritage for " + str(pkg_name) + ":")
+		for heritage in heritage_list.list_heritage:
+			debug.debug("sub elements: " + str(heritage.name))
+			path_src = self.get_build_path_data(heritage.name)
+			debug.verbose("      has directory: " + path_src)
+			if os.path.isdir(path_src):
+				if static == True:
+					debug.debug("      need copy: " + path_src + " to " + path_package_data)
+					#copy all data:
+					tools.copy_anything(path_src,
+					                    path_package_data,
+					                    recursive=True,
+					                    force_identical=True,
+					                    in_list=copy_list)
+				else:
+					debug.debug("      need copy: " + os.path.dirname(path_src) + " to " + path_package_data)
+					#copy all data:
+					tools.copy_anything(os.path.dirname(path_src),
+					                    path_package_data,
+					                    recursive=True,
+					                    force_identical=True,
+					                    in_list=copy_list)
+		#real copy files
+		tools.copy_list(copy_list)
+		# remove unneded files (NOT folder ...)
+		tools.clean_directory(target_shared_path, copy_list)
+	
+	##
+	## @brief Create a generic tree of the binary folder
+	## @param[in] path_package Path of the basic install folder of the application
+	## @param[in] pkg_name Package Name (generic name)
+	## @param[in] heritage_list List of dependency of the package
+	## @param[in] static The package is build in static mode
+	##
+	def make_package_binary_bin(self, path_package, pkg_name, base_pkg_path, heritage_list, static):
+		copy_list={}
+		path_package_bin = os.path.join(path_package, self.pkg_path_bin)
+		tools.create_directory_of_file(path_package_bin)
+		path_src = self.get_build_file_bin(pkg_name)
+		path_dst = os.path.join(path_package_bin, pkg_name + self.suffix_binary)
+		debug.verbose("path_dst: " + str(path_dst))
+		tools.copy_file(path_src,
+		                path_dst,
+		                in_list=copy_list)
+		#real copy files
+		tools.copy_list(copy_list)
+		if self.pkg_path_bin != "":
+			# remove unneded files (NOT folder ...)
+			tools.clean_directory(path_package_bin, copy_list)
+	
+	##
+	## @brief Create a generic tree of the library folder
+	## @param[in] path_package Path of the basic install folder of the application
+	## @param[in] pkg_name Package Name (generic name)
+	## @param[in] heritage_list List of dependency of the package
+	## @param[in] static The package is build in static mode
+	##
+	def make_package_binary_lib(self, path_package, pkg_name, base_pkg_path, heritage_list, static):
+		copy_list={}
+		path_package_lib = os.path.join(path_package, self.pkg_path_lib)
+		if static == False:
+			#copy all shred libs...
+			tools.create_directory_of_file(path_package_lib)
+			debug.verbose("libs for " + str(pkg_name) + ":")
+			for heritage in heritage_list.list_heritage:
+				debug.debug("sub elements: " + str(heritage.name))
+				file_src = self.get_build_file_dynamic(heritage.name)
+				debug.verbose("      has directory: " + file_src)
+				if os.path.isfile(file_src):
+					debug.debug("      need copy: " + file_src + " to " + path_package_lib)
+					#copy all data:
+					# TODO : We can have a problem when writing over library files ...
+					tools.copy_file(file_src,
+					                os.path.join(path_package_lib, os.path.basename(file_src)),
+					                in_list=copy_list)
+		#real copy files
+		tools.copy_list(copy_list)
+		if self.pkg_path_lib != "":
+			# remove unneded files (NOT folder ...)
+			tools.clean_directory(path_package_lib, copy_list)
+	
+	
+	def make_package_generic_files(self, path_package, pkg_properties, pkg_name, base_pkg_path, heritage_list, static):
+		## Create version file:
+		tools.file_write_data(os.path.join(path_package, self.pkg_path_version_file),
+		                      tools.version_to_string(pkg_properties["VERSION"]),
+		                      only_if_new=True)
+		
+		## Create maintainer file:
+		tools.file_write_data(os.path.join(path_package, self.pkg_path_maintainer_file),
+		                      self.generate_list_separate_coma(pkg_properties["MAINTAINER"]),
+		                      only_if_new=True)
+		
+		## Create appl_name file:
+		tools.file_write_data(os.path.join(path_package, self.pkg_path_application_name_file),
+		                      "en_EN:" + pkg_properties["NAME"],
+		                      only_if_new=True)
+		
+		## Create appl_description file:
+		tools.file_write_data(os.path.join(path_package, self.pkg_path_application_description_file),
+		                      "en_EN:" + pkg_properties["DESCRIPTION"],
+		                      only_if_new=True)
+		
+		## Create Readme file:
+		readme_file_dest = os.path.join(path_package, self.pkg_path_readme_file)
+		if os.path.exists(os.path.join(base_pkg_path, "os-Linux/README"))==True:
+			tools.copy_file(os.path.join(base_pkg_path, "os-Linux/README"), readme_file_dest)
+		elif os.path.exists(os.path.join(base_pkg_path, "README"))==True:
+			tools.copy_file(os.path.join(base_pkg_path, "README"), readme_file_dest)
+		elif os.path.exists(os.path.join(base_pkg_path, "README.md"))==True:
+			tools.copy_file(os.path.join(base_pkg_path, "README.md"), readme_file_dest)
+		else:
+			debug.debug("no file 'README', 'README.md' or 'os-Linux/README' ==> generate an empty one")
+			tools.file_write_data(readme_file_dest,
+			                      "No documentation for " + pkg_name + "\n",
+			                      only_if_new=True)
+		
+		## Create licence file:
+		"""
+		# TODO ...
+		license_file_dest = os.path.join(path_package, self.pkg_path_license, pkg_name + ".txt")
+		tools.create_directory_of_file(license_file_dest)
+		if os.path.exists(base_pkg_path + "/license.txt")==True:
+			tools.copy_file(base_pkg_path + "/license.txt", license_file_dest)
+		else:
+			debug.info("no file 'license.txt' ==> generate an empty one")
+			tmpFile = open(license_file_dest, 'w')
+			tools.file_write_data(license_file_dest,
+			                      "No license define by the developper for " + pkg_name + "\n",
+			                      only_if_new=True)
+		"""
+		
+		## Create changeLog file:
+		change_log_file_dest = os.path.join(path_package, self.pkg_path_change_log_file)
+		if os.path.exists(os.path.join(base_pkg_path, "changelog")) == True:
+			tools.copy_file(os.path.join(base_pkg_path, "changelog"), change_log_file_dest)
+		else:
+			debug.debug("no file 'changelog' ==> generate an empty one")
+			tools.file_write_data(change_log_file_dest,
+			                      "No changelog data " + pkg_name + "\n",
+			                      only_if_new=True)
+	
+	##
+	## @brief convert a s list of string in a string separated by a ","
+	## @param[in] list List of element to transform
+	## @return The requested string
+	##
+	def generate_list_separate_coma(self, list):
+		result = ""
+		fistTime = True
+		for elem in list:
+			if fistTime == True:
+				fistTime = False
+			else:
+				result += ","
+			result += elem
+		return result
 
 
-targetList=[]
-__startTargetName="lutinTarget_"
+target_list=[]
+__start_target_name="lutinTarget_"
 
 
 def import_path(path):
-	global targetList
+	global target_list
 	matches = []
 	debug.debug('TARGET: Start find sub File : "%s"' %path)
 	for root, dirnames, filenames in os.walk(path):
-		tmpList = fnmatch.filter(filenames, __startTargetName + "*.py")
+		tmpList = fnmatch.filter(filenames, __start_target_name + "*.py")
 		# Import the module :
 		for filename in tmpList:
 			debug.debug('TARGET:     Find a file : "%s"' %os.path.join(root, filename))
 			#matches.append(os.path.join(root, filename))
 			sys.path.append(os.path.dirname(os.path.join(root, filename)) )
 			targetName = filename.replace('.py', '')
-			targetName = targetName.replace(__startTargetName, '')
+			targetName = targetName.replace(__start_target_name, '')
 			debug.debug("TARGET:     integrate module: '" + targetName + "' from '" + os.path.join(root, filename) + "'")
-			targetList.append([targetName,os.path.join(root, filename)])
+			target_list.append([targetName,os.path.join(root, filename)])
 
 
 def load_target(name, config):
-	global targetList
+	global target_list
 	debug.debug("load target: " + name)
-	if len(targetList) == 0:
+	if len(target_list) == 0:
 		debug.error("No target to compile !!!")
-	debug.debug("list target: " + str(targetList))
-	for mod in targetList:
+	debug.debug("list target: " + str(target_list))
+	for mod in target_list:
 		if mod[0] == name:
 			debug.verbose("add to path: '" + os.path.dirname(mod[1]) + "'")
 			sys.path.append(os.path.dirname(mod[1]))
-			debug.verbose("import target : '" + __startTargetName + name + "'")
-			theTarget = __import__(__startTargetName + name)
+			debug.verbose("import target : '" + __start_target_name + name + "'")
+			theTarget = __import__(__start_target_name + name)
 			#create the target
 			tmpTarget = theTarget.Target(config)
 			return tmpTarget
 	raise KeyError("No entry for : " + name)
 
 def list_all_target():
-	global targetList
+	global target_list
 	tmpListName = []
-	for mod in targetList:
+	for mod in target_list:
 		tmpListName.append(mod[0])
 	return tmpListName
 
 def list_all_target_with_desc():
-	global targetList
+	global target_list
 	tmpList = []
-	for mod in targetList:
+	for mod in target_list:
 		sys.path.append(os.path.dirname(mod[1]))
-		theTarget = __import__(__startTargetName + mod[0])
+		theTarget = __import__(__start_target_name + mod[0])
 		try:
 			tmpdesc = theTarget.get_desc()
 			tmpList.append([mod[0], tmpdesc])

lutin/tools.py

@@ -11,15 +11,16 @@ import os
 import shutil
 import errno
 import fnmatch
+import stat
 # Local import
 from . import debug
 from . import depend
-import multiprocess
+from . import env
 
 """
 	
 """
-def get_run_folder():
+def get_run_path():
 	return os.getcwd()
 
 """
@@ -29,21 +30,21 @@ def get_current_path(file):
 	return os.path.dirname(os.path.realpath(file))
 
 def create_directory_of_file(file):
-	folder = os.path.dirname(file)
+	path = os.path.dirname(file)
 	try:
-		os.stat(folder)
+		os.stat(path)
 	except:
-		os.makedirs(folder)
+		os.makedirs(path)
 
-def get_list_sub_folder(path):
+def get_list_sub_path(path):
 	# TODO : os.listdir(path)
 	for dirname, dirnames, filenames in os.walk(path):
 		return dirnames
 	return []
 
-def remove_folder_and_sub_folder(path):
+def remove_path_and_sub_path(path):
 	if os.path.isdir(path):
-		debug.verbose("remove folder : '" + path + "'")
+		debug.verbose("remove path : '" + path + "'")
 		shutil.rmtree(path)
 
 def remove_file(path):
@@ -67,7 +68,29 @@ def file_read_data(path, binary=False):
 	file.close()
 	return data_file
 
-def file_write_data(path, data):
+def version_to_string(version):
+	version_ID = ""
+	for id in version:
+		if len(version_ID) != 0:
+			if type(id) == str:
+				version_ID += "-"
+			else:
+				version_ID += "."
+		version_ID += str(id)
+	return version_ID
+
+##
+## @brief Write data in a specific path.
+## @param[in] path Path of the data might be written.
+## @param[in] data Data To write in the file.
+## @param[in] only_if_new (default: False) Write data only if data is different.
+##
+def file_write_data(path, data, only_if_new=False):
+	if only_if_new == True:
+		old_data = file_read_data(path)
+		if old_data == data:
+			return
+	#real write of data:
 	file = open(path, "w")
 	file.write(data)
 	file.close()
@@ -96,55 +119,114 @@ def add_prefix(prefix,list):
 				result.append(prefix+elem)
 			return result
 
-def copy_file(src, dst, cmd_file=None, force=False):
+##
+## @brief Copy a specific file in a specific directory
+## @param[in] src Input file path
+## @param[in] dst Output file path
+## @param[in] cmd_file (default None) Path of file to store the command line used
+## @param[in] force (default False) Force copy of the file
+## @param[in] force_identical (default False) Force file to be identical (read it in binary)
+## @param[in,out] in_list (default None) Not real copy: set the request copy in the input list
+##
+def copy_file(src, dst, cmd_file=None, force=False, force_identical=False, in_list=None):
 	if os.path.exists(src) == False:
 		debug.error("Request a copy a file that does not existed : '" + src + "'")
 	cmd_line = "copy \"" + src + "\" \"" + dst + "\""
 	if     force == False \
-	   and depend.need_re_build(dst, src, file_cmd=cmd_file , cmdLine=cmd_line) == False:
+	   and depend.need_re_build(dst, src, file_cmd=cmd_file , cmd_line=cmd_line, force_identical=force_identical) == False:
+		debug.verbose ("no need to copy ...")
+		if in_list != None:
+			if dst in in_list:
+				debug.verbose("replace copy file " + os.path.relpath(src) + " ==> " + os.path.relpath(dst))
+			else:
+				debug.verbose("append copy file " + os.path.relpath(src) + " ==> " + os.path.relpath(dst))
+			# update element in dictionnary:
+			in_list[dst] = {"src":src,
+			                "cmd_file":cmd_file,
+			                "need_copy":False}
 		return
-	debug.print_element("copy file", src, "==>", dst)
-	create_directory_of_file(dst)
-	shutil.copyfile(src, dst)
-	multiprocess.store_command(cmd_line, cmd_file)
+	if in_list == None:
+		debug.print_element("copy file ", os.path.relpath(src), "==>", os.path.relpath(dst))
+		create_directory_of_file(dst)
+		shutil.copyfile(src, dst)
+		# copy property of the permition of the file ... 
+		stat_info = os.stat(src)
+		os.chmod(dst, stat_info.st_mode)
+		store_command(cmd_line, cmd_file)
+	else:
+		debug.verbose("append copy file " + os.path.relpath(src) + " ==> " + os.path.relpath(dst))
+		# update element in dictionnary:
+		in_list[dst] = {"src":src,
+		                "cmd_file":cmd_file,
+		                "need_copy":True}
 
-
-def copy_anything(src, dst):
-	tmpPath = os.path.dirname(os.path.realpath(src))
-	tmpRule = os.path.basename(src)
-	for root, dirnames, filenames in os.walk(tmpPath):
-		debug.verbose(" root='" + str(root) + "' dir='" + str(dirnames) + "' filenames=" + str(filenames))
+##
+## @brief Copy a compleate directory in a specific folder
+## @param[in] src Input folder path
+## @param[in] dst Output folder path
+## @param[in] recursive (default False) Copy folder with all his dependency
+## @param[in] force (default False) Force copy of the file
+## @param[in,out] in_list (default None) Not real copy: set the request copy in the input list
+##
+def copy_anything(src, dst, recursive = False, force_identical=False, in_list=None):
+	debug.verbose(" copy anything : '" + str(src) + "'")
+	debug.verbose("            to : '" + str(dst) + "'")
+	if os.path.isdir(os.path.realpath(src)):
+		tmp_path = os.path.realpath(src)
+		tmp_rule = ""
+	else:
+		tmp_path = os.path.dirname(os.path.realpath(src))
+		tmp_rule = os.path.basename(src)
+	
+	debug.verbose("    " + str(tmp_path) + ":")
+	for root, dirnames, filenames in os.walk(tmp_path):
+		deltaRoot = root[len(tmp_path):]
+		while     len(deltaRoot) > 0 \
+		      and (    deltaRoot[0] == '/' \
+		            or deltaRoot[0] == '\\' ):
+			deltaRoot = deltaRoot[1:]
+		if     recursive == False \
+		   and deltaRoot != "":
+			return
+		debug.verbose("     root='" + str(deltaRoot) + "'")
+		debug.verbose("         files=" + str(filenames))
 		tmpList = filenames
-		if len(tmpRule)>0:
-			tmpList = fnmatch.filter(filenames, tmpRule)
+		if len(tmp_rule) > 0:
+			tmpList = fnmatch.filter(filenames, tmp_rule)
 		# Import the module :
 		for cycleFile in tmpList:
 			#for cycleFile in filenames:
-			debug.verbose("Might copy : '" + tmpPath+cycleFile + "' ==> '" + dst + "'")
-			copy_file(tmpPath+"/"+cycleFile, dst+"/"+cycleFile)
+			debug.verbose("        '" + cycleFile + "'")
+			debug.extreme_verbose("Might copy : '" + tmp_path + "  " + deltaRoot + "  " + cycleFile + "' ==> '" + dst + "'")
+			copy_file(os.path.join(tmp_path, deltaRoot, cycleFile),
+			          os.path.join(dst, deltaRoot, cycleFile),
+			          force_identical=force_identical,
+			          in_list=in_list)
 
+##
+## @brief real copy of files in a specific dictionnary list
+## @param[in] in_list Dictionnary of file to copy
+##
+def copy_list(in_list):
+	for dst in in_list:
+		if in_list[dst]["need_copy"] == False:
+			continue
+		# note we force the copy to disable the check of needed of copy (already done)
+		copy_file(in_list[dst]["src"], dst, cmd_file=in_list[dst]["cmd_file"], force=True)
 
-def copy_anything_target(target, src, dst):
-	tmpPath = os.path.dirname(os.path.realpath(src))
-	tmpRule = os.path.basename(src)
-	for root, dirnames, filenames in os.walk(tmpPath):
-		debug.verbose(" root='" + str(root) + "' dir='" + str(dirnames) + "' filenames=" + str(filenames))
-		tmpList = filenames
-		if len(tmpRule)>0:
-			tmpList = fnmatch.filter(filenames, tmpRule)
-		# Import the module :
-		for cycleFile in tmpList:
-			#for cycleFile in filenames:
-			newDst = dst
-			if len(newDst) != 0 and newDst[-1] != "/":
-				newDst += "/"
-			if root[len(src)-1:] != "":
-				newDst += root[len(src)-1:]
-				if len(newDst) != 0 and newDst[-1] != "/":
-					newDst += "/"
-			debug.verbose("Might copy : '" + root+"/"+cycleFile + "' ==> '" + newDst+cycleFile + "'" )
-			target.add_file_staging(root+"/"+cycleFile, newDst+cycleFile)
-
+##
+## @brief Clean a path from all un-needed element in a directory
+## @param[in] path Path to clean
+## @param[in] normal_list List of all files/path in the path
+##
+def clean_directory(path, normal_list):
+	# get a list of all element in the path:
+	for root, dirnames, filenames in os.walk(path):
+		for file in filenames:
+			file_name = os.path.join(root, file)
+			if file_name not in normal_list:
+				debug.print_element("remove file ", os.path.relpath(file_name), "==>", "---")
+				os.remove(file_name)
 
 def filter_extention(list_files, extentions, invert=False):
 	out = []
@@ -176,5 +258,42 @@ def move_if_needed(src, dst):
 	file_write_data(dst, src_data)
 	remove_file(src)
 
+def store_command(cmd_line, file):
+	# write cmd line only after to prevent errors ...
+	if    file == "" \
+	   or file == None:
+		return;
+	debug.verbose("create cmd file: " + file)
+	# Create directory:
+	create_directory_of_file(file)
+	# Store the command Line:
+	file2 = open(file, "w")
+	file2.write(cmd_line)
+	file2.flush()
+	file2.close()
+
+def store_warning(file, output, err):
+	# write warning line only after to prevent errors ...
+	if    file == "" \
+	   or file == None:
+		return;
+	if env.get_warning_mode() == False:
+		debug.verbose("remove warning file: " + file)
+		# remove file if exist...
+		remove_file(file);
+		return;
+	debug.verbose("create warning file: " + file)
+	# Create directory:
+	create_directory_of_file(file)
+	# Store the command Line:
+	file2 = open(file, "w")
+	file2.write("===== output =====\n")
+	file2.write(output)
+	file2.write("\n\n")
+	file2.write("===== error =====\n")
+	file2.write(err)
+	file2.write("\n\n")
+	file2.flush()
+	file2.close()
 
 

lutin/z_builder/lutinBuilder_binary.py

@@ -40,9 +40,28 @@ def get_output_type():
 ##
 ## @brief Commands for running gcc to link an executable.
 ##
-def link(file, binary, target, depancy, name, basic_folder):
-	file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_folder, file, "bin")
-	#create comdLine :
+def link(file, binary, target, depancy, name, basic_path, static = False):
+	file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_path, file, "bin")
+	debug.extreme_verbose("list files = " + str(depancy.src))
+	list_static = []
+	list_dynamic = []
+	if static == True:
+		#get all parent static libs
+		list_static = depancy.src['static']
+		# get only parent shared that is not static
+		for elem in depancy.src['dynamic']:
+			lib_name = elem[:-len(target.suffix_lib_dynamic)] + target.suffix_lib_static
+			if lib_name not in depancy.src['static']:
+				list_dynamic.append(elem)
+	else:
+		#get all parent dynamic libs
+		list_dynamic = depancy.src['dynamic']
+		# get only parent shared that is not static
+		for elem in depancy.src['static']:
+			lib_name = elem[:-len(target.suffix_lib_static)] + target.suffix_lib_dynamic
+			if lib_name not in depancy.src['dynamic']:
+				list_static.append(elem)
+	#create comand line:
 	cmd = [
 		target.xx
 		]
@@ -67,7 +86,22 @@ def link(file, binary, target, depancy, name, basic_folder):
 	except:
 		pass
 	try:
-		cmd.append(depancy.src)
+		cmd.append(depancy.src['src'])
+	except:
+		pass
+	try:
+		cmd.append(list_static)
+	except:
+		pass
+	try:
+		for elem in list_dynamic:
+			lib_path = os.path.dirname(elem)
+			lib_name = elem[len(lib_path)+len(target.prefix_lib)+1:-len(target.suffix_lib_dynamic)]
+			cmd.append("-L" + lib_path)
+			cmd.append("-l" + lib_name)
+		if len(list_dynamic) > 0:
+			cmd.append("-Wl,-R$ORIGIN/../lib/")
+			pass
 	except:
 		pass
 	try:
@@ -82,27 +116,27 @@ def link(file, binary, target, depancy, name, basic_folder):
 		cmd.append(target.global_flags_ld)
 	except:
 		pass
-	cmdLine=tools.list_to_str(cmd)
+	cmd_line = tools.list_to_str(cmd)
 	# check the dependency for this file :
-	if     depend.need_re_package(file_dst, file_src, True, file_cmd, cmdLine) == False \
-	   and depend.need_re_package(file_dst, depancy.src, False, file_cmd, cmdLine) == False:
+	if     depend.need_re_package(file_dst, file_src, True, file_cmd=file_cmd, cmd_line=cmd_line) == False \
+	   and depend.need_re_package(file_dst, depancy.src, False, file_cmd=file_cmd, cmd_line=cmd_line) == False:
 		return file_dst
 	tools.create_directory_of_file(file_dst)
-	debug.print_element("Executable", name, "==>", file_dst)
+	debug.print_element("Executable", name, "==>", os.path.relpath(file_dst))
 	
-	multiprocess.run_command(cmdLine, store_output_file=file_warning)
+	multiprocess.run_command(cmd_line, store_output_file=file_warning)
 	if    target.config["mode"] == "release"\
 	   or env.get_force_strip_mode() == True:
 		# get the file size of the non strip file
 		originSize = tools.file_size(file_dst);
 		debug.print_element("Executable(strip)", name, "", "")
-		cmdLineStrip=tools.list_to_str([
+		cmd_lineStrip=tools.list_to_str([
 			target.strip,
 			file_dst])
-		multiprocess.run_command(cmdLineStrip, store_output_file=file_warning)
+		multiprocess.run_command(cmd_lineStrip, store_output_file=file_warning)
 		# get the stip size of the binary
-		stripSize = tools.file_size(file_dst)
-		debug.debug("file reduce size : " + str(originSize/1024) + "ko ==> " + str(stripSize/1024) + "ko")
+		strip_size = tools.file_size(file_dst)
+		debug.debug("file reduce size : " + str(originSize/1024) + "ko ==> " + str(strip_size/1024) + "ko")
 	# write cmd line only after to prevent errors ...
-	multiprocess.store_command(cmdLine, file_cmd)
-	
+	tools.store_command(cmd_line, file_cmd)
+	

lutin/z_builder/lutinBuilder_c.py

@@ -40,12 +40,12 @@ def get_output_type():
 ##
 ## @brief Commands for running gcc to compile a C file in object file.
 ##
-def compile(file, binary, target, depancy, flags, path, name, basic_folder):
-	file_src = target.get_full_name_source(basic_folder, file)
-	file_cmd = target.get_full_name_cmd(name, basic_folder, file)
-	file_dst = target.get_full_name_destination(name, basic_folder, file, get_output_type())
-	file_depend = target.get_full_dependency(name, basic_folder, file)
-	file_warning = target.get_full_name_warning(name, basic_folder, file)
+def compile(file, binary, target, depancy, flags, path, name, basic_path, module_src):
+	file_src = target.get_full_name_source(basic_path, file)
+	file_cmd = target.get_full_name_cmd(name, basic_path, file)
+	file_dst = target.get_full_name_destination(name, basic_path, file, get_output_type())
+	file_depend = target.get_full_dependency(name, basic_path, file)
+	file_warning = target.get_full_name_warning(name, basic_path, file)
 	
 	# create the command line befor requesting start:
 	cmd = [

lutin/z_builder/lutinBuilder_cpp.py

@@ -39,12 +39,12 @@ def get_output_type():
 ##
 ## @brief Commands for running gcc to compile a C++ file in object file.
 ##
-def compile(file, binary, target, depancy, flags, path, name, basic_folder):
-	file_src = target.get_full_name_source(basic_folder, file)
-	file_cmd = target.get_full_name_cmd(name, basic_folder, file)
-	file_dst = target.get_full_name_destination(name, basic_folder, file, get_output_type())
-	file_depend = target.get_full_dependency(name, basic_folder, file)
-	file_warning = target.get_full_name_warning(name, basic_folder, file)
+def compile(file, binary, target, depancy, flags, path, name, basic_path, module_src):
+	file_src = target.get_full_name_source(basic_path, file)
+	file_cmd = target.get_full_name_cmd(name, basic_path, file)
+	file_dst = target.get_full_name_destination(name, basic_path, file, get_output_type())
+	file_depend = target.get_full_dependency(name, basic_path, file)
+	file_warning = target.get_full_name_warning(name, basic_path, file)
 	# create the command line befor requesting start:
 	cmd = [
 		target.xx,
@@ -115,8 +115,13 @@ def get_version_compilation_flags(flags, dependency_flags):
 		is_gnu = default_version_gnu
 	
 	version = max(version_local, dependency_version)
+	if version == 2017:
+		debug.error("not supported flags for X17 ...");
+		if is_gnu == True:
+			out = ["-std=gnu++17", "-D__CPP_VERSION__=2017"]
+		else:
+			out = ["-std=c++17", "-D__CPP_VERSION__=2017"]
 	if version == 2014:
-		debug.error("not supported flags for X14 ...");
 		if is_gnu == True:
 			out = ["-std=gnu++14", "-D__CPP_VERSION__=2014"]
 		else:

lutin/z_builder/lutinBuilder_jar.py

@@ -38,8 +38,8 @@ def get_output_type():
 ##
 ## @brief Commands for running gcc to link a shared library.
 ##
-def link(file, binary, target, depancy, name, basic_folder):
-	file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_folder, file, "jar")
+def link(file, binary, target, depancy, name, basic_path):
+	file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_path, file, "jar")
 	#create command Line
 	cmd = [
 		target.jar,
@@ -65,7 +65,7 @@ def link(file, binary, target, depancy, name, basic_folder):
 	debug.print_element("jar", name, "==>", file_dst)
 	multiprocess.run_command(cmdLine, store_output_file=file_warning)
 	# write cmd line only after to prevent errors ...
-	multiprocess.store_command(cmdLine, file_cmd)
+	tools.store_command(cmdLine, file_cmd)
 	#debug.print_element("SharedLib", self.name, "==>", tmpList[1])
 	return file_dst
 

lutin/z_builder/lutinBuilder_java.py

@@ -33,19 +33,44 @@ def get_input_type():
 def get_output_type():
 	return ["class"]
 
+def create_dependency_files(target, src, heritage_src, basic_path):
+	depend = []
+	for elem in src:
+		extention = elem.split('.')[-1]
+		if    extention == 'jar' \
+		   or extention == 'java':
+			debug.extreme_verbose("add java depedence ... " + elem)
+			depend.append(target.get_full_name_source(basic_path, elem))
+	
+	for elem in heritage_src:
+		extention = elem.split('.')[-1]
+		if    extention == 'jar' \
+		   or extention == 'java':
+			debug.extreme_verbose("add java depedence ... " + elem)
+			depend.append(elem)
+	return depend
+
 ##
 ## @brief Commands for running gcc to compile a C++ file in object file.
 ##
-def compile(file, binary, target, depancy, flags, path, name, basic_folder):
-	file_src = target.get_full_name_source(basic_folder, file)
-	file_cmd = target.get_full_name_cmd(name, basic_folder, file)
-	file_dst = target.get_full_name_destination(name, basic_folder, file, get_output_type(), remove_suffix=True)
-	file_depend = target.get_full_dependency(name, basic_folder, file)
-	file_warning = target.get_full_name_warning(name, basic_folder, file)
+def compile(file, binary, target, depancy, flags, path, name, basic_path, module_src):
+	file_src = target.get_full_name_source(basic_path, file)
+	file_cmd = target.get_full_name_cmd(name, basic_path, file)
+	file_dst = target.get_full_name_destination(name, basic_path, file, get_output_type(), remove_suffix=True)
+	file_depend = target.get_full_dependency(name, basic_path, file)
+	file_warning = target.get_full_name_warning(name, basic_path, file)
+	depend_files = create_dependency_files(target, module_src, depancy.src['src'], basic_path)
+	"""
+	debug.warning("file_src     = " + file_src)
+	debug.warning("file_cmd     = " + file_cmd)
+	debug.warning("file_dst     = " + file_dst)
+	debug.warning("file_depend  = " + file_depend)
+	debug.warning("file_warning = " + file_warning)
+	"""
 	# create the command line befor requesting start:
 	cmd = [
 		target.java,
-		"-d", target.get_build_folder(name)
+		"-d", target.get_build_path_object(name)
 		]
 	# add source dependency:
 	list_sources_path = []
@@ -65,7 +90,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_folder):
 			out += elem
 		cmd.append(out)
 	class_extern = []
-	upper_jar = tools.filter_extention(depancy.src, ["jar"])
+	upper_jar = tools.filter_extention(depancy.src['src'], ["jar"])
 	#debug.warning("ploppppp = " + str(upper_jar))
 	for elem in upper_jar:
 		class_extern.append(elem)
@@ -88,6 +113,11 @@ def compile(file, binary, target, depancy, flags, path, name, basic_folder):
 	tools.create_directory_of_file(file_dst)
 	comment = ["java", name, "<==", file]
 	#process element
-	multiprocess.run_in_pool(cmdLine, comment, file_cmd, store_output_file=file_warning)
+	multiprocess.run_in_pool(cmdLine,
+	                         comment,
+	                         file_cmd,
+	                         store_output_file = file_warning,
+	                         depend_data = {"file":file_depend,
+	                                        "data":depend_files})
 	return {"action":"add", "file":file_dst}
 

lutin/z_builder/lutinBuilder_javah.py

@@ -33,40 +33,63 @@ def get_input_type():
 def get_output_type():
 	return ["h"]
 
+def create_dependency_files(target, src, heritage_src, basic_path):
+	depend = []
+	for elem in src:
+		extention = elem.split('.')[-1]
+		if    extention == 'jar' \
+		   or extention == 'java':
+			debug.extreme_verbose("add java depedence ... " + elem)
+			depend.append(target.get_full_name_source(basic_path, elem))
+	
+	for elem in heritage_src:
+		extention = elem.split('.')[-1]
+		if    extention == 'jar' \
+		   or extention == 'java':
+			debug.extreme_verbose("add java depedence ... " + elem)
+			depend.append(elem)
+	return depend
+
 ##
 ## @brief Commands for running gcc to compile a C++ file in object file.
 ##
-def compile(file, binary, target, depancy, flags, path, name, basic_folder):
-	# file_src = target.get_full_name_source(basic_folder, file)
-	file_cmd = target.get_full_name_cmd(name, basic_folder, file)
-	# file_dst = target.get_full_name_destination(name, basic_folder, file, get_output_type())
-	file_depend = target.get_full_dependency(name, basic_folder, file)
-	file_warning = target.get_full_name_warning(name, basic_folder, file)
+def compile(file, binary, target, depancy, flags, path, name, basic_path, module_src):
+	# file_src = target.get_full_name_source(basic_path, file)
+	file_cmd = target.get_full_name_cmd(name, basic_path, file)
+	# file_dst = target.get_full_name_destination(name, basic_path, file, get_output_type())
+	file_depend = target.get_full_dependency(name, basic_path, file)
+	file_warning = target.get_full_name_warning(name, basic_path, file)
+	depend_files = create_dependency_files(target, module_src, depancy.src['src'], basic_path)
 	# create the command line befor requesting start:
 	cmd = [
 		target.javah,
-		"-d", target.get_build_folder(name) + target.folder_generate_code
+		"-d", target.get_build_path(name) + target.path_generate_code
 		]
 	
 	if debug.get_level() >= 5:
 		cmd.append("-verbose")
 	
 	cmd.append("-classpath")
-	cmd.append(target.get_build_folder(name))
+	cmd.append(target.get_build_path_object(name))
 	class_to_build = file[:-6]
 	cmd.append(class_to_build)
 	# Create cmd line
-	cmdLine=tools.list_to_str(cmd)
+	cmd_line = tools.list_to_str(cmd)
 	
-	file_dst = target.get_build_folder(name) + "/tmp_header/" + class_to_build.replace(".", "_") + ".h"
+	file_dst = target.get_build_path(name) + "/generate_header/" + class_to_build.replace(".", "_") + ".h"
 	# check the dependency for this file :
-	#if depend.need_re_build(file_dst, file_src, file_depend, file_cmd, cmdLine) == False:
-	#	return file_dst
+	if depend.need_re_build(file_dst, None, file_depend, file_cmd, cmd_line) == False:
+		return {"action":"path", "path":target.get_build_path(name) + target.path_generate_code}
 	#tools.create_directory_of_file(file_dst)
 	comment = ["javah", class_to_build.replace(".", "_") + ".h", "<==", class_to_build]
 	#process element
-	multiprocess.run_in_pool(cmdLine, comment, file_cmd, store_output_file=file_warning)
+	multiprocess.run_in_pool(cmd_line,
+	                         comment,
+	                         file_cmd,
+	                         store_output_file = file_warning,
+	                         depend_data = {"file":file_depend,
+	                                        "data":depend_files})
 	debug.verbose("file= " + file_dst)
 	#return file_dst
-	return {"action":"path", "path":target.get_build_folder(name) + target.folder_generate_code}
+	return {"action":"path", "path":target.get_build_path(name) + target.path_generate_code}
 

lutin/z_builder/lutinBuilder_libraryDynamic.py

@@ -38,8 +38,26 @@ def get_output_type():
 ##
 ## @brief Commands for running gcc to link a shared library.
 ##
-def link(file, binary, target, depancy, name, basic_folder):
-	file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_folder, file, "lib-shared")
+def link(file, binary, target, depancy, name, basic_path, static=False):
+	file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_path, file, "lib-shared")
+	list_static = []
+	list_dynamic = []
+	if static == True:
+		#get all parent static libs
+		list_static = depancy.src['static']
+		# get only parent shared that is not static
+		for elem in depancy.src['dynamic']:
+			lib_name = elem[:-len(target.suffix_lib_dynamic)] + target.suffix_lib_static
+			if lib_name not in depancy.src['static']:
+				list_dynamic.append(elem)
+	else:
+		#get all parent dynamic libs
+		list_dynamic = depancy.src['dynamic']
+		# get only parent shared that is not static
+		for elem in depancy.src['static']:
+			lib_name = elem[:-len(target.suffix_lib_static)] + target.suffix_lib_dynamic
+			if lib_name not in depancy.src['dynamic']:
+				list_static.append(elem)
 	#create command Line
 	cmd = [
 		target.xx,
@@ -60,7 +78,23 @@ def link(file, binary, target, depancy, name, basic_folder):
 		pass
 	try:
 		# keep only compilated files ...
-		cmd.append(tools.filter_extention(depancy.src, get_input_type()))
+		cmd.append(tools.filter_extention(depancy.src['src'], get_input_type()))
+	except:
+		pass
+	try:
+		cmd.append(list_static)
+	except:
+		pass
+	try:
+		for elem in list_dynamic:
+			lib_path = os.path.dirname(elem)
+			lib_name = elem[len(lib_path)+len(target.prefix_lib)+1:-len(target.suffix_lib_dynamic)]
+			cmd.append("-L" + lib_path)
+			cmd.append("-l" + lib_name)
+		if     target != "MacOs" \
+		   and target.name != "Android":
+			if len(list_dynamic) > 0:
+				cmd.append("-Wl,-R$ORIGIN/../lib/")
 	except:
 		pass
 	try:
@@ -79,9 +113,9 @@ def link(file, binary, target, depancy, name, basic_folder):
 	# check the dependency for this file :
 	if     depend.need_re_package(file_dst, file_src, True, file_cmd, cmdLine) == False \
 	   and depend.need_re_package(file_dst, depancy.src, False, file_cmd, cmdLine) == False:
-		return tmpList[1]
+		return file_dst
 	tools.create_directory_of_file(file_dst)
-	debug.print_element("SharedLib", name, "==>", file_dst)
+	debug.print_element("SharedLib", name, "==>", os.path.relpath(file_dst))
 	multiprocess.run_command(cmdLine, store_output_file=file_warning)
 	# strip the output file:
 	if    target.config["mode"] == "release" \
@@ -97,6 +131,6 @@ def link(file, binary, target, depancy, name, basic_folder):
 		stripSize = tools.file_size(file_dst)
 		debug.debug("file reduce size : " + str(originSize/1024) + "ko ==> " + str(stripSize/1024) + "ko")
 	# write cmd line only after to prevent errors ...
-	multiprocess.store_command(cmdLine, file_cmd)
+	tools.store_command(cmdLine, file_cmd)
 	#debug.print_element("SharedLib", self.name, "==>", tmpList[1])
 	return file_dst

lutin/z_builder/lutinBuilder_libraryStatic.py

@@ -38,8 +38,8 @@ def get_output_type():
 ##
 ## @brief Commands for running ar.
 ##
-def link(file, binary, target, depancy, name, basic_folder):
-	file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_folder, file, "lib-static")
+def link(file, binary, target, depancy, name, basic_path):
+	file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_path, file, "lib-static")
 	#$(Q)$(TARGET_AR) $(TARGET_GLOBAL_ARFLAGS) $(PRIVATE_ARFLAGS) $@ $(PRIVATE_ALL_OBJECTS)
 	cmd = [
 		target.ar
@@ -65,8 +65,9 @@ def link(file, binary, target, depancy, name, basic_folder):
 	if     depend.need_re_package(file_dst, file_src, True, file_cmd, cmdLine) == False \
 	   and depend.need_re_package(file_dst, depancy.src, False, file_cmd, cmdLine) == False:
 		return file_dst
+	
 	tools.create_directory_of_file(file_dst)
-	debug.print_element("StaticLib", name, "==>", file_dst)
+	debug.print_element("StaticLib", name, "==>", os.path.relpath(file_dst))
 	# explicitly remove the destination to prevent error ...
 	if os.path.exists(file_dst) and os.path.isfile(file_dst):
 		os.remove(file_dst)
@@ -78,5 +79,5 @@ def link(file, binary, target, depancy, name, basic_folder):
 			file_dst ])
 		multiprocess.run_command(cmdLineRanLib, store_output_file=file_warning)
 	# write cmd line only after to prevent errors ...
-	multiprocess.store_command(cmdLine, file_cmd)
+	tools.store_command(cmdLine, file_cmd)
 	return file_dst

lutin/z_builder/lutinBuilder_m.py

@@ -41,12 +41,12 @@ def get_output_type():
 ##
 ## @brief Commands for running gcc to compile a m file in object file.
 ##
-def compile(file, binary, target, depancy, flags, path, name, basic_folder):
-	file_src = target.get_full_name_source(basic_folder, file)
-	file_cmd = target.get_full_name_cmd(name, basic_folder, file)
-	file_dst = target.get_full_name_destination(name, basic_folder, file, get_output_type())
-	file_depend = target.get_full_dependency(name, basic_folder, file)
-	file_warning = target.get_full_name_warning(name, basic_folder, file)
+def compile(file, binary, target, depancy, flags, path, name, basic_path, module_src):
+	file_src = target.get_full_name_source(basic_path, file)
+	file_cmd = target.get_full_name_cmd(name, basic_path, file)
+	file_dst = target.get_full_name_destination(name, basic_path, file, get_output_type())
+	file_depend = target.get_full_dependency(name, basic_path, file)
+	file_warning = target.get_full_name_warning(name, basic_path, file)
 	# create the command line befor requesting start:
 	cmd = [
 		target.cc,

lutin/z_builder/lutinBuilder_mm.py

@@ -41,12 +41,12 @@ def get_output_type():
 ##
 ## @brief Commands for running gcc to compile a m++ file in object file.
 ##
-def compile(file, binary, target, depancy, flags, path, name, basic_folder):
-	file_src = target.get_full_name_source(basic_folder, file)
-	file_cmd = target.get_full_name_cmd(name, basic_folder, file)
-	file_dst = target.get_full_name_destination(name, basic_folder, file, get_output_type())
-	file_depend = target.get_full_dependency(name, basic_folder, file)
-	file_warning = target.get_full_name_warning(name, basic_folder, file)
+def compile(file, binary, target, depancy, flags, path, name, basic_path, module_src):
+	file_src = target.get_full_name_source(basic_path, file)
+	file_cmd = target.get_full_name_cmd(name, basic_path, file)
+	file_dst = target.get_full_name_destination(name, basic_path, file, get_output_type())
+	file_depend = target.get_full_dependency(name, basic_path, file)
+	file_warning = target.get_full_name_warning(name, basic_path, file)
 	# create the command line befor requesting start:
 	cmd = [
 		target.xx,

lutin/z_system/lutinSystem_Android_ADMOD.py

@@ -20,7 +20,7 @@ class System(system.System):
 		# todo : Check if present ...
 		self.valid = True
 		# todo : create a searcher of the presence of the library:
-		self.add_export_SRC(target.folder_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar")
+		self.add_export_SRC(target.path_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar")
 		self.add_action("PACKAGE", 10, "admod-auto-wrapper", tool_generate_main_java_class)
 
 

lutin/z_system/lutinSystem_Android_SDK.py

@@ -20,7 +20,7 @@ class System(system.System):
 		# TODO : Check if the android sdk android.jar is present ...
 		self.valid = True
 		# todo : create a searcher of the presence of the library:
-		self.add_export_SRC(target.folder_sdk + "/platforms/android-" + str(target.boardId) + "/android.jar")
+		self.add_export_SRC(target.path_sdk + "/platforms/android-" + str(target.boardId) + "/android.jar")
 		self.add_export_flag_LD("-ldl")
 		self.add_export_flag_LD("-llog")
 		self.add_export_flag_LD("-landroid")

lutin/z_target/lutinTarget_Android.py

@@ -33,28 +33,28 @@ class Target(target.Target):
 		else:
 			arch="arm64"
 		
-		self.folder_ndk = os.getenv('PROJECT_NDK', "AUTO")
-		self.folder_sdk = os.getenv('PROJECT_SDK', "AUTO")
+		self.path_ndk = os.getenv('PROJECT_NDK', "AUTO")
+		self.path_sdk = os.getenv('PROJECT_SDK', "AUTO")
 		# auto search NDK
-		if self.folder_ndk == "AUTO":
-			for folder in os.listdir("."):
-				if os.path.isdir(folder)==True:
-					if folder=="android":
-						self.folder_ndk = folder + "/ndk"
-			if self.folder_ndk == "AUTO":
-				self.folder_ndk = tools.get_run_folder() + "/../android/ndk"
+		if self.path_ndk == "AUTO":
+			for path in os.listdir("."):
+				if os.path.isdir(path)==True:
+					if path=="android":
+						self.path_ndk = path + "/ndk"
+			if self.path_ndk == "AUTO":
+				self.path_ndk = tools.get_run_path() + "/../android/ndk"
 		# auto search SDK
-		if self.folder_sdk == "AUTO":
-			for folder in os.listdir("."):
-				if os.path.isdir(folder)==True:
-					if folder=="android":
-						self.folder_sdk = folder + "/sdk"
-			if self.folder_sdk == "AUTO":
-				self.folder_sdk = tools.get_run_folder() + "/../android/sdk"
+		if self.path_sdk == "AUTO":
+			for path in os.listdir("."):
+				if os.path.isdir(path)==True:
+					if path=="android":
+						self.path_sdk = path + "/sdk"
+			if self.path_sdk == "AUTO":
+				self.path_sdk = tools.get_run_path() + "/../android/sdk"
 		
-		if not os.path.isdir(self.folder_ndk):
+		if not os.path.isdir(self.path_ndk):
 			debug.error("NDK path not set !!! set env : PROJECT_NDK on the NDK path")
-		if not os.path.isdir(self.folder_sdk):
+		if not os.path.isdir(self.path_sdk):
 			debug.error("SDK path not set !!! set env : PROJECT_SDK on the SDK path")
 		
 		
@@ -63,34 +63,39 @@ class Target(target.Target):
 		if host.BUS_SIZE==64:
 			tmpOsVal = "_64"
 		if self.config["compilator"] == "clang":
-			self.set_cross_base(self.folder_ndk + "/toolchains/llvm-3.6/prebuilt/linux-x86" + tmpOsVal + "/bin/")
+			self.set_cross_base(self.path_ndk + "/toolchains/llvm-3.6/prebuilt/linux-x86" + tmpOsVal + "/bin/")
 		else:
-			baseFolderArm = self.folder_ndk + "/toolchains/arm-linux-androideabi-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
-			baseFolderMips = self.folder_ndk + "/toolchains/mipsel-linux-android-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
-			baseFolderX86 = self.folder_ndk + "/toolchains/x86-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
-			self.set_cross_base(baseFolderArm + "arm-linux-androideabi-")
-			if not os.path.isdir(baseFolderArm):
+			basepathArm = self.path_ndk + "/toolchains/arm-linux-androideabi-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
+			basepathMips = self.path_ndk + "/toolchains/mipsel-linux-android-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
+			basepathX86 = self.path_ndk + "/toolchains/x86-" + gccVersion + "/prebuilt/linux-x86" + tmpOsVal + "/bin/"
+			self.set_cross_base(basepathArm + "arm-linux-androideabi-")
+			if not os.path.isdir(basepathArm):
 				debug.error("Gcc Arm path does not exist !!!")
-			if not os.path.isdir(baseFolderMips):
+			if not os.path.isdir(basepathMips):
 				debug.info("Gcc Mips path does not exist !!!")
-			if not os.path.isdir(baseFolderX86):
+			if not os.path.isdir(basepathX86):
 				debug.info("Gcc x86 path does not exist !!!")
 		
-		self.folder_bin="/mustNotCreateBinary"
-		self.folder_lib="/data/lib/armeabi"
-		self.folder_data="/data/assets"
-		self.folder_doc="/doc"
-		self.suffix_package='.pkg'
+		# TODO : Set it back in the package only ...
+		#self.path_bin="mustNotCreateBinary"
+		#self.path_lib="data/lib/armeabi"
+		#self.path_data="data/assets"
+		#self.path_doc="doc"
+		#self.suffix_package='.pkg'
+		self.pkg_path_data = "data/assets"
+		self.pkg_path_bin = "mustNotCreateBinary"
+		self.pkg_path_lib = "data/lib/armeabi"
+		self.pkg_path_license = "license"
 		
-		# board id at 14 is for android 4.0 and more ...
-		self.boardId = 14
+		# board id at 15 is for android 4.0.3 and more ... (note: API 14 has been removed ...)
+		self.boardId = 15
 		self.global_flags_cc.append("-D__ANDROID_BOARD_ID__=" + str(self.boardId))
 		if arch == "armv5" or arch == "armv7":
-			self.global_include_cc.append("-I" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm/usr/include/")
+			self.global_include_cc.append("-I" + self.path_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm/usr/include/")
 		elif arch == "mips":
-			self.global_include_cc.append("-I" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-mips/usr/include/")
+			self.global_include_cc.append("-I" + self.path_ndk +"/platforms/android-" + str(self.boardId) + "/arch-mips/usr/include/")
 		elif arch == "x86":
-			self.global_include_cc.append("-I" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-x86/usr/include/")
+			self.global_include_cc.append("-I" + self.path_ndk +"/platforms/android-" + str(self.boardId) + "/arch-x86/usr/include/")
 		
 		if True:
 			if self.config["compilator"] == "clang":
@@ -98,11 +103,11 @@ class Target(target.Target):
 					debug.error("Clang work only with the board wersion >= 21 : android 5.x.x")
 				self.global_flags_cc.append("-D__STDCPP_LLVM__")
 				# llvm-libc++ : BSD | MIT
-				self.global_include_cc.append("-gcc-toolchain " + self.folder_ndk +"/sources/android/support/include")
-				self.global_include_cc.append("-I" + self.folder_ndk +"/sources/android/support/include")
-				self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/include/")
+				self.global_include_cc.append("-gcc-toolchain " + self.path_ndk +"/sources/android/support/include")
+				self.global_include_cc.append("-I" + self.path_ndk +"/sources/android/support/include")
+				self.global_include_cc.append("-I" + self.path_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/include/")
 				if arch == "armv5":
-					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/libs/armeabi/"
+					stdCppBasePath = self.path_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/libs/armeabi/"
 					self.global_include_cc.append("-I" + stdCppBasePath + "include/")
 					self.global_flags_ld.append(         stdCppBasePath + "libc++_static.a")
 				elif arch == "armv7":
@@ -111,51 +116,51 @@ class Target(target.Target):
 					self.global_flags_cc.append("-march=armv7-a")
 					self.global_flags_cc.append("-mfpu=vfpv3-d16")
 					self.global_flags_cc.append("-mhard-float")
-					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/"
+					stdCppBasePath = self.path_ndk +"/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a/"
 					self.global_flags_ld.append(         stdCppBasePath + "thumb/libc++_static.a")
 					self.global_flags_ld.append("-target armv7-none-linux-androideabi")
 					self.global_flags_ld.append("-Wl,--fix-cortex-a8")
 					self.global_flags_ld.append("-Wl,--no-warn-mismatch")
 					self.global_flags_ld.append("-lm_hard")
 				elif arch == "mips":
-					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/libs/mips/"
+					stdCppBasePath = self.path_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/libs/mips/"
 					self.global_include_cc.append("-I" + stdCppBasePath + "include/")
 					self.global_flags_ld.append(         stdCppBasePath + "libc++_static.a")
 				elif arch == "x86":
-					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/libs/x86/"
+					stdCppBasePath = self.path_ndk +"/sources/cxx-stl/llvm-libc++/libcxx/libs/x86/"
 					self.global_include_cc.append("-I" + stdCppBasePath + "include/")
 					self.global_flags_ld.append(         stdCppBasePath + "libc++_static.a")
 			else:
 				self.global_flags_cc.append("-D__STDCPP_GNU__")
 				# GPL v3 (+ exception link for gcc compilator)
-				self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/include/")
-				self.global_include_cc.append("-I" + self.folder_ndk +"/sources/android/support/include/")
+				self.global_include_cc.append("-I" + self.path_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/include/")
+				self.global_include_cc.append("-I" + self.path_ndk +"/sources/android/support/include/")
 				if arch == "armv5":
-					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/armeabi/"
+					stdCppBasePath = self.path_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/armeabi/"
 					self.global_include_cc.append("-I" + stdCppBasePath + "include/")
 					self.global_flags_ld.append(         stdCppBasePath + "thumb/libgnustl_static.a")
 					self.global_flags_ld.append(         stdCppBasePath + "thumb/libsupc++.a")
 				elif arch == "armv7":
-					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/armeabi-v7a/"
+					stdCppBasePath = self.path_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/armeabi-v7a/"
 					self.global_include_cc.append("-I" + stdCppBasePath + "include/")
 					self.global_flags_ld.append(         stdCppBasePath + "thumb/libgnustl_static.a")
 					self.global_flags_ld.append(         stdCppBasePath + "thumb/libsupc++.a")
 				elif arch == "mips":
-					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/mips/"
+					stdCppBasePath = self.path_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/mips/"
 					self.global_include_cc.append("-I" + stdCppBasePath + "include/")
 					self.global_flags_ld.append(         stdCppBasePath + "libgnustl_static.a")
 					self.global_flags_ld.append(         stdCppBasePath + "libsupc++.a")
 				elif arch == "x86":
-					stdCppBasePath = self.folder_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/x86/"
+					stdCppBasePath = self.path_ndk +"/sources/cxx-stl/gnu-libstdc++/" + gccVersion + "/libs/x86/"
 					self.global_include_cc.append("-I" + stdCppBasePath + "include/")
 					self.global_flags_ld.append(         stdCppBasePath + "libgnustl_static.a")
 					self.global_flags_ld.append(         stdCppBasePath + "libsupc++.a")
 		else :
-			self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/system/include/")
-			self.global_include_cc.append("-I" + self.folder_ndk +"/sources/cxx-stl/stlport/stlport/")
-			self.global_flags_ld.append(self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm/usr/lib/libstdc++.a")
+			self.global_include_cc.append("-I" + self.path_ndk +"/sources/cxx-stl/system/include/")
+			self.global_include_cc.append("-I" + self.path_ndk +"/sources/cxx-stl/stlport/stlport/")
+			self.global_flags_ld.append(self.path_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm/usr/lib/libstdc++.a")
 		
-		self.global_sysroot = "--sysroot=" + self.folder_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm"
+		self.global_sysroot = "--sysroot=" + self.path_ndk +"/platforms/android-" + str(self.boardId) + "/arch-arm"
 		
 		self.global_flags_cc.append("-D__ARM_ARCH_5__")
 		self.global_flags_cc.append("-D__ARM_ARCH_5T__")
@@ -197,129 +202,176 @@ class Target(target.Target):
 		self.global_flags_cc.append("-fexceptions")
 		self.global_flags_xx.append("-Wa,--noexecstack")
 	
-	def check_right_package(self, pkgProperties, value):
-		for val in pkgProperties["RIGHT"]:
+	def check_right_package(self, pkg_properties, value):
+		for val in pkg_properties["RIGHT"]:
 			if value == val:
 				return True
 		return False
 	
-	def get_staging_folder_data(self, binaryName):
-		return self.get_staging_folder(binaryName) + self.folder_data
+	"""
+	def get_staging_path_data(self, binary_name):
+		return self.get_staging_path(binary_name) + self.path_data
+	"""
 	
-	def make_package(self, pkgName, pkgProperties, basePkgPath, heritage):
-		# http://alp.developpez.com/tutoriels/debian/creer-paquet/
+	def make_package_generic_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Generate package '" + pkgName + "'")
+		debug.info("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"]))
 		debug.debug("------------------------------------------------------------------------")
-		pkgNameApplicationName = pkgName
+		#output path
+		target_outpath = self.get_staging_path(pkg_name)
+		tools.create_directory_of_file(target_outpath)
+		
+		## Create share datas:
+		self.make_package_binary_data(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## copy binary files
+		# in Android Package we have no binary element, only shared object ... (and java start file)
+		
+		## Create libraries (special case of Android...)
+		copy_list={}
+		target_outpath_lib = os.path.join(target_outpath, self.pkg_path_lib)
+		tools.create_directory_of_file(target_outpath_lib)
+		# copy application lib: (needed to lunch ...)
+		file_src = self.get_build_file_dynamic(pkg_name)
+		if os.path.isfile(file_src):
+			debug.debug("      need copy: " + file_src + " to " + target_outpath_lib)
+			tools.copy_file(file_src,
+			                os.path.join(target_outpath_lib, os.path.basename(file_src)),
+			                in_list=copy_list)
+		# copy other if needed:
+		if static == False:
+			#copy all shared libsh...
+			debug.verbose("libs for " + str(pkg_name) + ":")
+			for heritage in heritage_list.list_heritage:
+				debug.debug("sub elements: " + str(heritage.name))
+				file_src = self.get_build_file_dynamic(heritage.name)
+				debug.verbose("      has directory: " + file_src)
+				if os.path.isfile(file_src):
+					debug.debug("      need copy: " + file_src + " to " + target_outpath_lib)
+					#copy all data:
+					# TODO : We can have a problem when writing over library files ...
+					tools.copy_file(file_src,
+					                os.path.join(target_outpath_lib, os.path.basename(file_src)),
+					                in_list=copy_list)
+		#real copy files
+		tools.copy_list(copy_list)
+		if self.pkg_path_lib != "":
+			# remove unneded files (NOT folder ...)
+			tools.clean_directory(target_outpath_lib, copy_list)
+		
+		## Create generic files:
+		self.make_package_generic_files(target_outpath, pkg_properties, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## create specific android project (local)
+		pkg_name_application_name = pkg_name
 		if self.config["mode"] == "debug":
-			pkgNameApplicationName += "debug"
-		# FINAL_FOLDER_JAVA_PROJECT
-		self.folder_javaProject=   self.get_staging_folder(pkgName) \
-		                         + "/src/" \
-		                         + pkgProperties["COMPAGNY_TYPE"] \
-		                         + "/" + pkgProperties["COMPAGNY_NAME2"] \
-		                         + "/" + pkgNameApplicationName + "/"
+			pkg_name_application_name += "debug"
+		# FINAL_path_JAVA_PROJECT
+		self.path_java_project = os.path.join(target_outpath,
+		                                      "src",
+		                                      pkg_properties["COMPAGNY_TYPE"],
+		                                      pkg_properties["COMPAGNY_NAME2"],
+		                                      pkg_name_application_name)
 		#FINAL_FILE_ABSTRACTION
-		self.file_finalAbstraction = self.folder_javaProject + "/" + pkgNameApplicationName + ".java"
+		self.file_final_abstraction = os.path.join(self.path_java_project, pkg_name_application_name + ".java")
 		
-		compleatePackageName = pkgProperties["COMPAGNY_TYPE"]+"."+pkgProperties["COMPAGNY_NAME2"]+"." + pkgNameApplicationName
+		compleatePackageName = pkg_properties["COMPAGNY_TYPE"]+"."+pkg_properties["COMPAGNY_NAME2"]+"." + pkg_name_application_name
 		
-		if "ADMOD_ID" in pkgProperties:
-			pkgProperties["RIGHT"].append("INTERNET")
-			pkgProperties["RIGHT"].append("ACCESS_NETWORK_STATE")
+		if "ADMOD_ID" in pkg_properties:
+			pkg_properties["RIGHT"].append("INTERNET")
+			pkg_properties["RIGHT"].append("ACCESS_NETWORK_STATE")
 		
 		
 		debug.print_element("pkg", "absractionFile", "<==", "dynamic file")
-		# Create folder :
-		tools.create_directory_of_file(self.file_finalAbstraction)
+		# Create path :
+		tools.create_directory_of_file(self.file_final_abstraction)
 		# Create file :
 		# java ==> done by ewol wrapper ... (and compiled in the normal compilation system ==> must be find in the dependency list of jar ...
 		
-		tools.create_directory_of_file(self.get_staging_folder(pkgName) + "/res/drawable/icon.png");
-		if     "ICON" in pkgProperties.keys() \
-		   and pkgProperties["ICON"] != "":
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/res/drawable/icon.png", 256, 256)
+		tools.create_directory_of_file(target_outpath + "/res/drawable/icon.png");
+		if     "ICON" in pkg_properties.keys() \
+		   and pkg_properties["ICON"] != "":
+			image.resize(pkg_properties["ICON"], target_outpath + "/res/drawable/icon.png", 256, 256)
 		else:
 			# to be sure that we have all time a resource ...
-			tmpFile = open(self.get_staging_folder(pkgName) + "/res/drawable/plop.txt", 'w')
+			tmpFile = open(target_outpath + "/res/drawable/plop.txt", 'w')
 			tmpFile.write('plop\n')
 			tmpFile.flush()
 			tmpFile.close()
 		
-		if pkgProperties["ANDROID_MANIFEST"]!="":
-			debug.print_element("pkg", "AndroidManifest.xml", "<==", pkgProperties["ANDROID_MANIFEST"])
-			tools.copy_file(pkgProperties["ANDROID_MANIFEST"], self.get_staging_folder(pkgName) + "/AndroidManifest.xml", force=True)
+		if pkg_properties["ANDROID_MANIFEST"]!="":
+			debug.print_element("pkg", "AndroidManifest.xml", "<==", pkg_properties["ANDROID_MANIFEST"])
+			tools.copy_file(pkg_properties["ANDROID_MANIFEST"], target_outpath + "/AndroidManifest.xml", force=True)
 		else:
 			debug.error("missing parameter 'ANDROID_MANIFEST' in the properties ... ")
 		
-		#add properties on wallpaper : 
+		#add properties on wallpaper :
 		# myModule.pkg_add("ANDROID_WALLPAPER_PROPERTIES", ["list", key, title, summary, [["key","value display"],["key2","value display 2"]])
 		# myModule.pkg_add("ANDROID_WALLPAPER_PROPERTIES", ["list", "testpattern", "Select test pattern", "Choose which test pattern to display", [["key","value display"],["key2","value display 2"]]])
 		# myModule.pkg_add("ANDROID_WALLPAPER_PROPERTIES", ["bool", key, title, summary, ["enable string", "disable String"])
 		# myModule.pkg_add("ANDROID_WALLPAPER_PROPERTIES", ["bool", "movement", "Motion", "Apply movement to test pattern", ["Moving test pattern", "Still test pattern"]
 		#copy needed resources :
-		for res_source, res_dest in pkgProperties["ANDROID_RESOURCES"]:
+		for res_source, res_dest in pkg_properties["ANDROID_RESOURCES"]:
 			if res_source == "":
 				continue
-			tools.copy_file(res_source , self.get_staging_folder(pkgName) + "/res/" + res_dest + "/" + os.path.basename(res_source), force=True)
+			tools.copy_file(res_source , target_outpath + "/res/" + res_dest + "/" + os.path.basename(res_source), force=True)
 		
 		
 		# Doc :
 		# http://asantoso.wordpress.com/2009/09/15/how-to-build-android-application-package-apk-from-the-command-line-using-the-sdk-tools-continuously-integrated-using-cruisecontrol/
 		debug.print_element("pkg", "R.java", "<==", "Resources files")
-		tools.create_directory_of_file(self.get_staging_folder(pkgName) + "/src/noFile")
-		androidToolPath = self.folder_sdk + "/build-tools/"
+		tools.create_directory_of_file(target_outpath + "/src/noFile")
+		androidToolPath = self.path_sdk + "/build-tools/"
 		# find android tool version
-		dirnames = tools.get_list_sub_folder(androidToolPath)
+		dirnames = tools.get_list_sub_path(androidToolPath)
 		if len(dirnames) != 1:
 			debug.error("an error occured when getting the tools for android")
 		androidToolPath += dirnames[0] + "/"
 		
 		# this is to create resource file for android ... (we did not use aset in jar with ewol ...
-		adModResouceFolder = ""
-		if "ADMOD_ID" in pkgProperties:
-			adModResouceFolder = " -S " + self.folder_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/res/ "
+		adModResoucepath = ""
+		if "ADMOD_ID" in pkg_properties:
+			adModResoucepath = " -S " + self.path_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/res/ "
 		cmdLine = androidToolPath + "aapt p -f " \
-		          + "-M " + self.get_staging_folder(pkgName) + "/AndroidManifest.xml " \
-		          + "-F " + self.get_staging_folder(pkgName) + "/resources.res " \
-		          + "-I " + self.folder_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar "\
-		          + "-S " + self.get_staging_folder(pkgName) + "/res/ " \
-		          + adModResouceFolder \
-		          + "-J " + self.get_staging_folder(pkgName) + "/src/ "
+		          + "-M " + target_outpath + "/AndroidManifest.xml " \
+		          + "-F " + target_outpath + "/resources.res " \
+		          + "-I " + self.path_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar "\
+		          + "-S " + target_outpath + "/res/ " \
+		          + adModResoucepath \
+		          + "-J " + target_outpath + "/src/ "
 		multiprocess.run_command(cmdLine)
 		
-		tools.create_directory_of_file(self.get_staging_folder(pkgName) + "/build/classes/noFile")
+		tools.create_directory_of_file(target_outpath + "/build/classes/noFile")
 		debug.print_element("pkg", "*.class", "<==", "*.java")
 		#generate android java files:
 		filesString=""
 		
 		"""
 		old : 
-		if "ADMOD_ID" in pkgProperties:
+		if "ADMOD_ID" in pkg_properties:
 			# TODO : check this I do not think it is really usefull ... ==> write for IDE only ...
-			filesString += self.folder_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/src/android/UnusedStub.java "
-		if len(pkgProperties["ANDROID_WALLPAPER_PROPERTIES"])!=0:
-			filesString += self.folder_javaProject + pkgNameApplicationName + "Settings.java "
+			filesString += self.path_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/src/android/UnusedStub.java "
+		if len(pkg_properties["ANDROID_WALLPAPER_PROPERTIES"])!=0:
+			filesString += self.path_java_project + pkg_name_application_name + "Settings.java "
 		
 		adModJarFile = ""
-		if "ADMOD_ID" in pkgProperties:
-			adModJarFile = ":" + self.folder_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
+		if "ADMOD_ID" in pkg_properties:
+			adModJarFile = ":" + self.path_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar"
 		
 		cmdLine = "javac " \
-		          + "-d " + self.get_staging_folder(pkgName) + "/build/classes " \
-		          + "-classpath " + self.folder_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar" \
+		          + "-d " + self.get_staging_path(pkg_name) + "/build/classes " \
+		          + "-classpath " + self.path_sdk + "/platforms/android-" + str(self.boardId) + "/android.jar" \
 		          + adModJarFile + " " \
 		          + filesString \
-		          + self.file_finalAbstraction + " "  \
-		          + self.get_staging_folder(pkgName) + "/src/R.java "
+		          + self.file_final_abstraction + " "  \
+		          + self.get_staging_path(pkg_name) + "/src/R.java "
 		multiprocess.run_command(cmdLine)
 		"""
-		debug.verbose("heritage .so=" + str(tools.filter_extention(heritage.src, ["so"])))
-		debug.verbose("heritage .jar=" + str(tools.filter_extention(heritage.src, ["jar"])))
+		debug.verbose("heritage .so=" + str(tools.filter_extention(heritage_list.src['dynamic'], ["so"])))
+		debug.verbose("heritage .jar=" + str(tools.filter_extention(heritage_list.src['src'], ["jar"])))
 		
 		class_extern = ""
-		upper_jar = tools.filter_extention(heritage.src, ["jar"])
+		upper_jar = tools.filter_extention(heritage_list.src['src'], ["jar"])
 		#debug.warning("ploppppp = " + str(upper_jar))
 		for elem in upper_jar:
 			if len(class_extern) > 0:
@@ -327,19 +379,19 @@ class Target(target.Target):
 			class_extern += elem
 		# create enpoint element :
 		cmdLine = "javac " \
-		          + "-d " + self.get_staging_folder(pkgName) + "/build/classes " \
+		          + "-d " + target_outpath + "/build/classes " \
 		          + "-classpath " + class_extern + " " \
-		          + self.get_staging_folder(pkgName) + "/src/R.java "
+		          + target_outpath + "/src/R.java "
 		multiprocess.run_command(cmdLine)
 		
 		debug.print_element("pkg", ".dex", "<==", "*.class")
 		cmdLine = androidToolPath + "dx " \
 		          + "--dex --no-strict " \
-		          + "--output=" + self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + ".dex " \
-		          + self.get_staging_folder(pkgName) + "/build/classes/ "
+		          + "--output=" + target_outpath + "/build/" + pkg_name_application_name + ".dex " \
+		          + target_outpath + "/build/classes/ "
 		
-		if "ADMOD_ID" in pkgProperties:
-			cmdLine += self.folder_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar "
+		if "ADMOD_ID" in pkg_properties:
+			cmdLine += self.path_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar "
 		# add element to dexification:
 		for elem in upper_jar:
 			# remove android sdk:
@@ -352,16 +404,16 @@ class Target(target.Target):
 		#builderDebug="-agentlib:jdwp=transport=dt_socket,server=y,address=8050,suspend=y "
 		builderDebug=""
 		# note : set -u not signed application...
-		#+ ":" + self.folder_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar "
+		#+ ":" + self.path_sdk + "/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar "
 		cmdLine =   "java -Xmx128M " \
-		          + " -classpath " + self.folder_sdk + "/tools/lib/sdklib.jar " \
+		          + " -classpath " + self.path_sdk + "/tools/lib/sdklib.jar " \
 		          + builderDebug \
 		          + " com.android.sdklib.build.ApkBuilderMain " \
-		          + self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + "-unalligned.apk " \
+		          + target_outpath + "/build/" + pkg_name_application_name + "-unalligned.apk " \
 		          + " -u " \
-		          + " -z " + self.get_staging_folder(pkgName) + "/resources.res " \
-		          + " -f " + self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + ".dex " \
-		          + " -rf " + self.get_staging_folder(pkgName) + "/data "
+		          + " -z " + target_outpath + "/resources.res " \
+		          + " -f " + target_outpath + "/build/" + pkg_name_application_name + ".dex " \
+		          + " -rf " + target_outpath + "/data "
 		multiprocess.run_command(cmdLine)
 		
 		# doc :
@@ -379,7 +431,7 @@ class Target(target.Target):
 			    + " -sigalg SHA1withRSA -digestalg SHA1 " \
 			    + " -storepass Pass__AndroidDebugKey " \
 			    + " -keypass PassKey__AndroidDebugKey " \
-			    + self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + "-unalligned.apk " \
+			    + target_outpath + "/build/" + pkg_name_application_name + "-unalligned.apk " \
 			    + " alias__AndroidDebugKey"
 			multiprocess.run_command(cmdLine)
 			tmpFile = open("tmpPass.boo", 'w')
@@ -390,57 +442,57 @@ class Target(target.Target):
 			print("On release mode we need the file :  and key an pasword to sign the application ...")
 			debug.print_element("pkg", ".apk(signed debug)", "<==", ".apk (not signed)")
 			cmdLine = "jarsigner " \
-			    + " -keystore " + basePkgPath + "/AndroidKey.jks " \
+			    + " -keystore " + base_pkg_path + "/AndroidKey.jks " \
 			    + " -sigalg SHA1withRSA -digestalg SHA1 " \
-			    + self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + "-unalligned.apk " \
-			    + " " + pkgNameApplicationName
+			    + target_outpath + "/build/" + pkg_name_application_name + "-unalligned.apk " \
+			    + " " + pkg_name_application_name
 			multiprocess.run_command(cmdLine)
 			cmdLine = "jarsigner " \
 			    + " -verify -verbose -certs " \
 			    + " -sigalg SHA1withRSA -digestalg SHA1 " \
-			    + self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + "-unalligned.apk "
+			    + target_outpath + "/build/" + pkg_name_application_name + "-unalligned.apk "
 			multiprocess.run_command(cmdLine)
 		
 		debug.print_element("pkg", ".apk(aligned)", "<==", ".apk (not aligned)")
-		tools.remove_file(self.get_staging_folder(pkgName) + "/" + pkgNameApplicationName + ".apk")
+		tools.remove_file(target_outpath + "/" + pkg_name_application_name + ".apk")
 		# verbose mode : -v
 		cmdLine = androidToolPath + "zipalign 4 " \
-		          + self.get_staging_folder(pkgName) + "/build/" + pkgNameApplicationName + "-unalligned.apk " \
-		          + self.get_staging_folder(pkgName) + "/" + pkgNameApplicationName + ".apk "
+		          + target_outpath + "/build/" + pkg_name_application_name + "-unalligned.apk " \
+		          + target_outpath + "/" + pkg_name_application_name + ".apk "
 		multiprocess.run_command(cmdLine)
 		
 		# copy file in the final stage :
-		tools.copy_file(self.get_staging_folder(pkgName) + "/" + pkgNameApplicationName + ".apk",
-		                self.get_final_folder() + "/" + pkgNameApplicationName + ".apk",
+		tools.copy_file(target_outpath + "/" + pkg_name_application_name + ".apk",
+		                self.get_final_path() + "/" + pkg_name_application_name + ".apk",
 		                force=True)
 	
-	def install_package(self, pkgName):
+	def install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Install package '" + pkgName + "'")
+		debug.info("Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
-		pkgNameApplicationName = pkgName
+		pkg_name_application_name = pkg_name
 		if self.config["mode"] == "debug":
-			pkgNameApplicationName += "debug"
-		cmdLine = self.folder_sdk + "/platform-tools/adb install -r " \
-		          + self.get_staging_folder(pkgName) + "/" + pkgNameApplicationName + ".apk "
+			pkg_name_application_name += "debug"
+		cmdLine = self.path_sdk + "/platform-tools/adb install -r " \
+		          + self.get_staging_path(pkg_name) + "/" + pkg_name_application_name + ".apk "
 		multiprocess.run_command(cmdLine)
 	
-	def un_install_package(self, pkgName):
+	def un_install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Un-Install package '" + pkgName + "'")
+		debug.info("Un-Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
-		pkgNameApplicationName = pkgName
+		pkg_name_application_name = pkg_name
 		if self.config["mode"] == "debug":
-			pkgNameApplicationName += "debug"
-		cmdLine = self.folder_sdk + "/platform-tools/adb uninstall " + pkgNameApplicationName
+			pkg_name_application_name += "debug"
+		cmdLine = self.path_sdk + "/platform-tools/adb uninstall " + pkg_name_application_name
 		Rmultiprocess.run_command(cmdLine)
 	
-	def Log(self, pkgName):
+	def Log(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
 		debug.info("logcat of android board")
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("cmd: " + self.folder_sdk + "/platform-tools/adb shell logcat ")
-		cmdLine = self.folder_sdk + "/platform-tools/adb shell logcat "
+		debug.info("cmd: " + self.path_sdk + "/platform-tools/adb shell logcat ")
+		cmdLine = self.path_sdk + "/platform-tools/adb shell logcat "
 		multiprocess.run_command(cmdLine)
 
 

lutin/z_target/lutinTarget_IOs.py

@@ -45,20 +45,21 @@ class Target(target.Target):
 		
 		# remove unneeded ranlib ...
 		self.ranlib=""
-		self.folder_bin=""
-		self.folder_data="/share"
-		self.folder_doc="/doc"
+		#self.path_bin=""
+		#self.path_data="share"
+		#self.path_doc="doc"
 		
 		self.suffix_lib_static='.a'
 		self.suffix_lib_dynamic='.dylib'
-		self.suffix_binary=''
-		self.suffix_package=''
+		#self.suffix_binary=''
+		#self.suffix_package=''
+		
 		if self.sumulator == True:
-			self.sysroot = "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator8.3.sdk"
+			self.sysroot = "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
 			self.global_flags_ld.append("-mios-simulator-version-min=8.0")
 			self.global_flags_cc.append("-mios-simulator-version-min=8.0")
 		else:
-			self.sysroot = "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.3.sdk"
+			self.sysroot = "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk"
 			self.global_flags_ld.append("-miphoneos-version-min=8.0")
 			self.global_flags_cc.append("-miphoneos-version-min=8.0")
 		
@@ -75,159 +76,171 @@ class Target(target.Target):
 		
 		self.global_flags_m.append("-fobjc-arc")
 		#self.global_flags_m.append("-fmodules")
-	
-	def get_staging_folder(self, binaryName):
-		return tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + binaryName + ".app/"
-	
-	def get_staging_folder_data(self, binaryName):
-		return self.get_staging_folder(binaryName) + self.folder_data + "/"
-	
-	def make_package(self, pkgName, pkgProperties, basePkgPath):
-		debug.debug("------------------------------------------------------------------------")
-		debug.info("Generate package '" + pkgName + "'")
-		debug.debug("------------------------------------------------------------------------")
 		
-		if    "ICON" in pkgProperties.keys() \
-		   and pkgProperties["ICON"] != "":
+		self.pkg_path_data = "share"
+		self.pkg_path_bin = ""
+		self.pkg_path_lib = "lib"
+		self.pkg_path_license = "license"
+		
+	
+	def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
+		debug.debug("------------------------------------------------------------------------")
+		debug.info("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"]))
+		debug.debug("------------------------------------------------------------------------")
+		#output path
+		target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app")
+		tools.create_directory_of_file(target_outpath)
+		
+		## Create share datas:
+		self.make_package_binary_data(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## copy binary files:
+		self.make_package_binary_bin(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create libraries:
+		self.make_package_binary_lib(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create generic files:
+		self.make_package_generic_files(target_outpath, pkg_properties, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create icon:
+		if    "ICON" in pkg_properties.keys() \
+		   and pkg_properties["ICON"] != "":
 			# Resize all icon needed for Ios ...
 			# TODO : Do not regenerate if source resource is not availlable
 			# TODO : Add a colored background ...
-			debug.print_element("pkg", "iTunesArtwork.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/iTunesArtwork.png", 512, 512)
-			debug.print_element("pkg", "iTunesArtwork@2x.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/iTunesArtwork@2x.png", 1024, 1024)
-			debug.print_element("pkg", "Icon-60@2x.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/Icon-60@2x.png", 120, 120)
-			debug.print_element("pkg", "Icon-76.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/Icon-76.png", 76, 76)
-			debug.print_element("pkg", "Icon-76@2x.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/Icon-76@2x.png", 152, 152)
-			debug.print_element("pkg", "Icon-Small-40.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/Icon-Small-40.png", 40, 40)
-			debug.print_element("pkg", "Icon-Small-40@2x.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/Icon-Small-40@2x.png", 80, 80)
-			debug.print_element("pkg", "Icon-Small.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/Icon-Small.png", 29, 29)
-			debug.print_element("pkg", "Icon-Small@2x.png", "<==", pkgProperties["ICON"])
-			image.resize(pkgProperties["ICON"], self.get_staging_folder(pkgName) + "/Icon-Small@2x.png", 58, 58)
+			debug.print_element("pkg", "iTunesArtwork.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "iTunesArtwork.png"), 512, 512)
+			debug.print_element("pkg", "iTunesArtwork@2x.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "iTunesArtwork@2x.png"), 1024, 1024)
+			debug.print_element("pkg", "Icon-60@2x.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "Icon-60@2x.png"), 120, 120)
+			debug.print_element("pkg", "Icon-76.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "Icon-76.png"), 76, 76)
+			debug.print_element("pkg", "Icon-76@2x.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "Icon-76@2x.png"), 152, 152)
+			debug.print_element("pkg", "Icon-Small-40.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "Icon-Small-40.png"), 40, 40)
+			debug.print_element("pkg", "Icon-Small-40@2x.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "Icon-Small-40@2x.png"), 80, 80)
+			debug.print_element("pkg", "Icon-Small.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "Icon-Small.png"), 29, 29)
+			debug.print_element("pkg", "Icon-Small@2x.png", "<==", pkg_properties["ICON"])
+			image.resize(pkg_properties["ICON"], os.path.join(target_outpath, "Icon-Small@2x.png"), 58, 58)
 		
+		## Create the info file:
 		debug.print_element("pkg", "PkgInfo", "<==", "APPL????")
-		infoFile = self.get_staging_folder(pkgName) + "/PkgInfo"
-		# Create the info file
-		tmpFile = open(infoFile, 'w')
-		tmpFile.write("APPL????")
-		tmpFile.flush()
-		tmpFile.close()
+		tools.file_write_data(os.path.join(target_outpath, "PkgInfo"),
+		                      "APPL????",
+		                      only_if_new=True)
 		
+		## Create Info.plist (in XML mode)
 		debug.print_element("pkg", "Info.plist", "<==", "Package properties")
 		# http://www.sandroid.org/imcross/#Deployment
-		dataFile  = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-		dataFile += "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-		dataFile += "<plist version=\"1.0\">\n"
-		dataFile += "		<dict>\n"
-		dataFile += "			<key>CFBundleDevelopmentRegion</key>\n"
-		dataFile += "			<string>en</string>\n"
-		dataFile += "			<key>CFBundleDisplayName</key>\n"
-		dataFile += "			<string>" + pkgProperties["NAME"] + "</string>\n"
-		dataFile += "			<key>CFBundleExecutable</key>\n"
-		dataFile += "			<string>" + pkgName + "</string>\n"
-		dataFile += "			<key>CFBundleIdentifier</key>\n"
-		dataFile += "			<string>com." + pkgProperties["COMPAGNY_NAME2"] + "." + pkgName + "</string>\n"
+		data_file  = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		data_file += "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+		data_file += "<plist version=\"1.0\">\n"
+		data_file += "		<dict>\n"
+		data_file += "			<key>CFBundleDevelopmentRegion</key>\n"
+		data_file += "			<string>en</string>\n"
+		data_file += "			<key>CFBundleDisplayName</key>\n"
+		data_file += "			<string>" + pkg_properties["NAME"] + "</string>\n"
+		data_file += "			<key>CFBundleExecutable</key>\n"
+		data_file += "			<string>" + pkg_name + "</string>\n"
+		data_file += "			<key>CFBundleIdentifier</key>\n"
+		data_file += "			<string>com." + pkg_properties["COMPAGNY_NAME2"] + "." + pkg_name + "</string>\n"
 		
-		dataFile += "			<key>CFBundleIconFiles</key>\n"
-		dataFile += "			<array>\n"
-		dataFile += "				<string>Icon-60@2x.png</string>\n"
-		dataFile += "				<string>Icon-76.png</string>\n"
-		dataFile += "				<string>Icon-76@2x.png</string>\n"
-		dataFile += "				<string>Icon-Small-40.png</string>\n"
-		dataFile += "				<string>Icon-Small-40@2x.png</string>\n"
-		dataFile += "				<string>Icon-Small.png</string>\n"
-		dataFile += "				<string>Icon-Small@2x.png</string>\n"
-		dataFile += "				<string>iTunesArtwork.png</string>\n"
-		dataFile += "				<string>iTunesArtwork@2x.png</string>\n"
-		dataFile += "			</array>\n"
+		data_file += "			<key>CFBundleIconFiles</key>\n"
+		data_file += "			<array>\n"
+		data_file += "				<string>Icon-60@2x.png</string>\n"
+		data_file += "				<string>Icon-76.png</string>\n"
+		data_file += "				<string>Icon-76@2x.png</string>\n"
+		data_file += "				<string>Icon-Small-40.png</string>\n"
+		data_file += "				<string>Icon-Small-40@2x.png</string>\n"
+		data_file += "				<string>Icon-Small.png</string>\n"
+		data_file += "				<string>Icon-Small@2x.png</string>\n"
+		data_file += "				<string>iTunesArtwork.png</string>\n"
+		data_file += "				<string>iTunesArtwork@2x.png</string>\n"
+		data_file += "			</array>\n"
 		
-		dataFile += "			<key>CFBundleInfoDictionaryVersion</key>\n"
-		dataFile += "			<string>6.0</string>\n"
-		dataFile += "			<key>CFBundleName</key>\n"
-		dataFile += "			<string>" + pkgName + "</string>\n"
-		dataFile += "			<key>CFBundlePackageType</key>\n"
-		dataFile += "			<string>APPL</string>\n"
-		dataFile += "			<key>CFBundleSignature</key>\n"
-		dataFile += "			<string>????</string>\n"
-		dataFile += "			<key>CFBundleSupportedPlatforms</key>\n"
-		dataFile += "			<array>\n"
-		dataFile += "				<string>iPhoneSimulator</string>\n"
-		dataFile += "			</array>\n"
-		dataFile += "			\n"
-		dataFile += "			<key>CFBundleShortVersionString</key>\n"
-		dataFile += "			<string>"+pkgProperties["VERSION"]+"</string>\n"
-		dataFile += "			<key>CFBundleVersion</key>\n"
-		dataFile += "			<string>"+pkgProperties["VERSION_CODE"]+"</string>\n"
-		dataFile += "			\n"
-		dataFile += "			<key>CFBundleResourceSpecification</key>\n"
-		dataFile += "			<string>ResourceRules.plist</string>\n"
+		data_file += "			<key>CFBundleInfoDictionaryVersion</key>\n"
+		data_file += "			<string>6.0</string>\n"
+		data_file += "			<key>CFBundleName</key>\n"
+		data_file += "			<string>" + pkg_name + "</string>\n"
+		data_file += "			<key>CFBundlePackageType</key>\n"
+		data_file += "			<string>APPL</string>\n"
+		data_file += "			<key>CFBundleSignature</key>\n"
+		data_file += "			<string>????</string>\n"
+		data_file += "			<key>CFBundleSupportedPlatforms</key>\n"
+		data_file += "			<array>\n"
+		data_file += "				<string>iPhoneSimulator</string>\n"
+		data_file += "			</array>\n"
+		data_file += "			\n"
+		data_file += "			<key>CFBundleShortVersionString</key>\n"
+		data_file += "			<string>"+pkg_properties["VERSION"]+"</string>\n"
+		data_file += "			<key>CFBundleVersion</key>\n"
+		data_file += "			<string>"+pkg_properties["VERSION_CODE"]+"</string>\n"
+		data_file += "			\n"
+		data_file += "			<key>CFBundleResourceSpecification</key>\n"
+		data_file += "			<string>ResourceRules.plist</string>\n"
 		if self.sumulator == False:
-			dataFile += "			<key>LSRequiresIPhoneOS</key>\n"
-			dataFile += "			<true/>\n"
+			data_file += "			<key>LSRequiresIPhoneOS</key>\n"
+			data_file += "			<true/>\n"
 		else:
-			dataFile += "			<key>DTPlatformName</key>\n"
-			dataFile += "			<string>iphonesimulator</string>\n"
-			dataFile += "			<key>DTSDKName</key>\n"
-			dataFile += "			<string>iphonesimulator7.0</string>\n"
-		dataFile += "			\n"
-		dataFile += "			<key>UIDeviceFamily</key>\n"
-		dataFile += "			<array>\n"
-		dataFile += "				<integer>1</integer>\n"
-		dataFile += "				<integer>2</integer>\n"
-		dataFile += "			</array>\n"
-		dataFile += "			<key>UIRequiredDeviceCapabilities</key>\n"
-		dataFile += "			<array>\n"
-		dataFile += "				<string>armv7</string>\n"
-		dataFile += "			</array>\n"
-		dataFile += "			<key>UIStatusBarHidden</key>\n"
-		dataFile += "			<true/>\n"
-		dataFile += "			<key>UISupportedInterfaceOrientations</key>\n"
-		dataFile += "			<array>\n"
-		dataFile += "				<string>UIInterfaceOrientationPortrait</string>\n"
-		dataFile += "				<string>UIInterfaceOrientationPortraitUpsideDown</string>\n"
-		dataFile += "				<string>UIInterfaceOrientationLandscapeLeft</string>\n"
-		dataFile += "				<string>UIInterfaceOrientationLandscapeRight</string>\n"
-		dataFile += "			</array>\n"
-		dataFile += "			<key>UISupportedInterfaceOrientations~ipad</key>\n"
-		dataFile += "			<array>\n"
-		dataFile += "				<string>UIInterfaceOrientationPortrait</string>\n"
-		dataFile += "				<string>UIInterfaceOrientationPortraitUpsideDown</string>\n"
-		dataFile += "				<string>UIInterfaceOrientationLandscapeLeft</string>\n"
-		dataFile += "				<string>UIInterfaceOrientationLandscapeRight</string>\n"
-		dataFile += "			</array>\n"
-		dataFile += "    </dict>\n"
-		dataFile += "</plist>\n"
-		dataFile += "\n\n"
+			data_file += "			<key>DTPlatformName</key>\n"
+			data_file += "			<string>iphonesimulator</string>\n"
+			data_file += "			<key>DTSDKName</key>\n"
+			data_file += "			<string>iphonesimulator7.0</string>\n"
+		data_file += "			\n"
+		data_file += "			<key>UIDeviceFamily</key>\n"
+		data_file += "			<array>\n"
+		data_file += "				<integer>1</integer>\n"
+		data_file += "				<integer>2</integer>\n"
+		data_file += "			</array>\n"
+		data_file += "			<key>UIRequiredDeviceCapabilities</key>\n"
+		data_file += "			<array>\n"
+		data_file += "				<string>armv7</string>\n"
+		data_file += "			</array>\n"
+		data_file += "			<key>UIStatusBarHidden</key>\n"
+		data_file += "			<true/>\n"
+		data_file += "			<key>UISupportedInterfaceOrientations</key>\n"
+		data_file += "			<array>\n"
+		data_file += "				<string>UIInterfaceOrientationPortrait</string>\n"
+		data_file += "				<string>UIInterfaceOrientationPortraitUpsideDown</string>\n"
+		data_file += "				<string>UIInterfaceOrientationLandscapeLeft</string>\n"
+		data_file += "				<string>UIInterfaceOrientationLandscapeRight</string>\n"
+		data_file += "			</array>\n"
+		data_file += "			<key>UISupportedInterfaceOrientations~ipad</key>\n"
+		data_file += "			<array>\n"
+		data_file += "				<string>UIInterfaceOrientationPortrait</string>\n"
+		data_file += "				<string>UIInterfaceOrientationPortraitUpsideDown</string>\n"
+		data_file += "				<string>UIInterfaceOrientationLandscapeLeft</string>\n"
+		data_file += "				<string>UIInterfaceOrientationLandscapeRight</string>\n"
+		data_file += "			</array>\n"
+		data_file += "    </dict>\n"
+		data_file += "</plist>\n"
+		data_file += "\n\n"
+		tools.file_write_data(os.path.join(target_outpath, "Info.plist"),
+		                      data_file,
+		                      only_if_new=True)
 		
-		infoFile = self.get_staging_folder(pkgName) + "/Info.plist"
-		# Create the info file
-		tmpFile = open(infoFile, 'w')
-		tmpFile.write(dataFile)
-		tmpFile.flush()
-		tmpFile.close()
 		"""
-		infoFile = self.get_staging_folder(pkgName) + "/" + pkgName + "-Info.plist"
+		infoFile = self.get_staging_path(pkg_name) + "/" + pkg_name + "-Info.plist"
 		# Create the info file
 		tmpFile = open(infoFile, 'w')
-		tmpFile.write(dataFile)
+		tmpFile.write(data_file)
 		tmpFile.flush()
 		tmpFile.close()
 		cmdLine  = "builtin-infoPlistUtility "
-		cmdLine += " " + self.get_staging_folder(pkgName) + "/" + pkgName + "-Info.plist "
-		cmdLine += " -genpkginfo " + self.get_staging_folder(pkgName) + "/PkgInfo"
+		cmdLine += " " + self.get_staging_path(pkg_name) + "/" + pkg_name + "-Info.plist "
+		cmdLine += " -genpkginfo " + self.get_staging_path(pkg_name) + "/PkgInfo"
 		cmdLine += " -expandbuildsettings "
 		cmdLine += " -format binary "
 		if self.sumulator == False:
 			cmdLine += " -platform iphonesimulator "
 		else:
 			cmdLine += " -platform iphoneos "
-		cmdLine += " -o " + self.get_staging_folder(pkgName) + "/" + "Info.plist"
+		cmdLine += " -o " + self.get_staging_path(pkg_name) + "/" + "Info.plist"
 		multiprocess.run_command(cmdLine)
 		"""
 		"""
@@ -246,59 +259,51 @@ class Target(target.Target):
 		#/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/dsymutil /Users/edouarddupin/Library/Developer/Xcode/DerivedData/projectName-gwycnyyzohokcmalgodeucqppxro/Build/Products/Debug-iphonesimulator/projectName.app/projectName -o /Users/edouarddupin/Library/Developer/Xcode/DerivedData/projectName-gwycnyyzohokcmalgodeucqppxro/Build/Products/Debug-iphonesimulator/projectName.app.dSYM
 			
 		debug.print_element("pkg", "ResourceRules.plist", "<==", "Resources autorisation")
-		dataFile  = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-		dataFile += "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-		dataFile += "<plist version=\"1.0\">\n"
-		dataFile += "	<dict>\n"
-		dataFile += "		<key>rules</key>\n"
-		dataFile += "		<dict>\n"
-		dataFile += "			<key>.*</key>\n"
-		dataFile += "			<true/>\n"
-		dataFile += "			<key>Info.plist</key>\n"
-		dataFile += "			<dict>\n"
-		dataFile += "				<key>omit</key>\n"
-		dataFile += "				<true/>\n"
-		dataFile += "				<key>weight</key>\n"
-		dataFile += "				<real>10</real>\n"
-		dataFile += "			</dict>\n"
-		dataFile += "			<key>ResourceRules.plist</key>\n"
-		dataFile += "			<dict>\n"
-		dataFile += "				<key>omit</key>\n"
-		dataFile += "				<true/>\n"
-		dataFile += "				<key>weight</key>\n"
-		dataFile += "				<real>100</real>\n"
-		dataFile += "			</dict>\n"
-		dataFile += "		</dict>\n"
-		dataFile += "	</dict>\n"
-		dataFile += "</plist>\n"
-		dataFile += "\n\n"
-
-		infoFile = self.get_staging_folder(pkgName) + "/ResourceRules.plist"
-		# Create the info file
-		tmpFile = open(infoFile, 'w')
-		tmpFile.write(dataFile)
-		tmpFile.flush()
-		tmpFile.close()
+		data_file  = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		data_file += "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+		data_file += "<plist version=\"1.0\">\n"
+		data_file += "	<dict>\n"
+		data_file += "		<key>rules</key>\n"
+		data_file += "		<dict>\n"
+		data_file += "			<key>.*</key>\n"
+		data_file += "			<true/>\n"
+		data_file += "			<key>Info.plist</key>\n"
+		data_file += "			<dict>\n"
+		data_file += "				<key>omit</key>\n"
+		data_file += "				<true/>\n"
+		data_file += "				<key>weight</key>\n"
+		data_file += "				<real>10</real>\n"
+		data_file += "			</dict>\n"
+		data_file += "			<key>ResourceRules.plist</key>\n"
+		data_file += "			<dict>\n"
+		data_file += "				<key>omit</key>\n"
+		data_file += "				<true/>\n"
+		data_file += "				<key>weight</key>\n"
+		data_file += "				<real>100</real>\n"
+		data_file += "			</dict>\n"
+		data_file += "		</dict>\n"
+		data_file += "	</dict>\n"
+		data_file += "</plist>\n"
+		data_file += "\n\n"
+		tools.file_write_data(os.path.join(target_outpath, "ResourceRules.plist"),
+		                      data_file,
+		                      only_if_new=True)
 
 		debug.print_element("pkg", "Entitlements.plist", "<==", "application mode")
-		dataFile  = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-		dataFile += "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
-		dataFile += "<plist version=\"1.0\">\n"
-		dataFile += "	<dict>\n"
-		dataFile += "		<key>get-task-allow</key>\n"
-		dataFile += "		<true/>\n"
-		dataFile += "    </dict>\n"
-		dataFile += "</plist>\n"
-		dataFile += "\n\n"
+		data_file  = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		data_file += "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+		data_file += "<plist version=\"1.0\">\n"
+		data_file += "	<dict>\n"
+		data_file += "		<key>get-task-allow</key>\n"
+		data_file += "		<true/>\n"
+		data_file += "    </dict>\n"
+		data_file += "</plist>\n"
+		data_file += "\n\n"
+		tools.file_write_data(os.path.join(target_outpath, "Entitlements.plist"),
+		                      data_file,
+		                      only_if_new=True)
 
-		infoFile = self.get_staging_folder(pkgName) + "/Entitlements.plist"
-		# Create the info file
-		tmpFile = open(infoFile, 'w')
-		tmpFile.write(dataFile)
-		tmpFile.flush()
-		tmpFile.close()
-
-		# Simulateur folder :
+		# Simulateur path :
 		#~/Library/Application\ Support/iPhone\ Simulator/7.0.3/Applications/
 		# must have a 'uuidgen' UID generate value with this elemennt ...
 		# get the bundle path : ==> maybe usefull in MocOS ...
@@ -310,21 +315,21 @@ class Target(target.Target):
 		
 		if self.sumulator == False:
 			# Create the info file
-			tmpFile = open(self.get_build_folder(pkgName) + "/worddown.xcent", 'w')
+			tmpFile = open(os.path.join(target_outpath, pkg_name + ".xcent"), 'w')
 			tmpFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
 			tmpFile.write("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n")
 			tmpFile.write("<plist version=\"1.0\">\n")
 			tmpFile.write("    <dict>\n")
 			tmpFile.write("        <key>application-identifier</key>\n")
 			try:
-				tmpFile.write("        <string>" + pkgProperties["APPLE_APPLICATION_IOS_ID"] + "." + pkgProperties["COMPAGNY_TYPE"] + "." + pkgProperties["COMPAGNY_NAME2"] + "." + pkgName + "</string>\n")
+				tmpFile.write("        <string>" + pkg_properties["APPLE_APPLICATION_IOS_ID"] + "." + pkg_properties["COMPAGNY_TYPE"] + "." + pkg_properties["COMPAGNY_NAME2"] + "." + pkg_name + "</string>\n")
 			except:
 				debug.error("Missing package property : APPLE_APPLICATION_IOS_ID")
 			tmpFile.write("        <key>get-task-allow</key>\n")
 			tmpFile.write("        <true/>\n")
 			tmpFile.write("        <key>keychain-access-groups</key>\n")
 			tmpFile.write("        <array>\n")
-			tmpFile.write("            <string>" + pkgProperties["APPLE_APPLICATION_IOS_ID"] + ".atriasoft.worddown</string>\n")
+			tmpFile.write("            <string>" + pkg_properties["APPLE_APPLICATION_IOS_ID"] + ".atriasoft.worddown</string>\n")
 			tmpFile.write("        </array>\n")
 			tmpFile.write("    </dict>\n")
 			tmpFile.write("</plist>\n")
@@ -340,8 +345,8 @@ class Target(target.Target):
 			cmdLine  = 'codesign  --force --sign '
 			# to get this key ;    certtool y | grep "Developer"
 			cmdLine += ' "' + signatureKey + '" '
-			cmdLine += ' --entitlements ' + self.get_build_folder(pkgName) + '/worddown.xcent'
-			cmdLine += ' ' + self.get_staging_folder(pkgName)
+			cmdLine += ' --entitlements ' + self.get_build_path(pkg_name) + '/worddown.xcent'
+			cmdLine += ' ' + self.get_staging_path(pkg_name)
 			multiprocess.run_command(cmdLine)
 			
 			# --force --sign "iPhone Developer: Edouard DUPIN (SDFGSDFGSDFG)"
@@ -356,9 +361,9 @@ class Target(target.Target):
 			out += random.choice(["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"])
 		return out
 	
-	def install_package(self, pkgName):
+	def install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Install package '" + pkgName + "'")
+		debug.info("Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
 		if self.sumulator == False:
 			if tools.file_size("ewol/ios-deploy/ios-deploy") == 0:
@@ -368,10 +373,10 @@ class Target(target.Target):
 			if tools.file_size("ewol/ios-deploy/ios-deploy") == 0:
 				debug.error("Can not create ios-deploy external software ...")
 			debug.print_element("deploy", "iphone/ipad", "<==", "aplication")
-			cmdLine = './ewol/ios-deploy/ios-deploy --bundle ' + self.get_staging_folder(pkgName)
+			cmdLine = './ewol/ios-deploy/ios-deploy --bundle ' + self.get_staging_path(pkg_name)
 			multiprocess.run_command(cmdLine)
 		else:
-			simulatorIdFile = ".iosSimutatorId_" + pkgName + ".txt"
+			simulatorIdFile = ".iosSimutatorId_" + pkg_name + ".txt"
 			if tools.file_size(simulatorIdFile) < 10:
 				#create the file:
 				tmpFile = open(simulatorIdFile, 'w')
@@ -388,32 +393,32 @@ class Target(target.Target):
 				tmpFile.close()
 			simulatorId = tools.file_read_data(simulatorIdFile)
 			home = os.path.expanduser("~")
-			destinationFolderBase = home + "/Library/Application\\ Support/iPhone\\ Simulator/7.1/Applications/" + simulatorId
-			destinationFolder = home + "/Library/Application Support/iPhone Simulator/7.1/Applications/" + simulatorId + "/" + pkgName + ".app"
-			destinationFolder2 = home + "/Library/Application\\ Support/iPhone\\ Simulator/7.1/Applications/" + simulatorId + "/" + pkgName + ".app"
-			debug.info("install in simulator : " + destinationFolder)
-			tools.create_directory_of_file(destinationFolder + "/plop.txt")
-			cmdLine = "cp -rf " + self.get_staging_folder(pkgName) + " " + destinationFolder2
+			destinationpathBase = home + "/Library/Application\\ Support/iPhone\\ Simulator/7.1/Applications/" + simulatorId
+			destinationpath = home + "/Library/Application Support/iPhone Simulator/7.1/Applications/" + simulatorId + "/" + pkg_name + ".app"
+			destinationpath2 = home + "/Library/Application\\ Support/iPhone\\ Simulator/7.1/Applications/" + simulatorId + "/" + pkg_name + ".app"
+			debug.info("install in simulator : " + destinationpath)
+			tools.create_directory_of_file(destinationpath + "/plop.txt")
+			cmdLine = "cp -rf " + self.get_staging_path(pkg_name) + " " + destinationpath2
 			multiprocess.run_command(cmdLine)
-			cmdLine = "touch " + destinationFolderBase
+			cmdLine = "touch " + destinationpathBase
 			multiprocess.run_command(cmdLine)
 			
 		#sudo dpkg -i $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package
 	
-	def un_install_package(self, pkgName):
+	def un_install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Un-Install package '" + pkgName + "'")
+		debug.info("Un-Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
 		if self.sumulator == False:
 			debug.warning("not implemented")
 		else:
-			simulatorIdFile = ".iosSimutatorId_" + pkgName + ".txt"
+			simulatorIdFile = ".iosSimutatorId_" + pkg_name + ".txt"
 			if tools.file_size(simulatorIdFile) < 10:
 				debug.warning("Can not get simulation O_ID : " + simulatorIdFile)
 		
 		#sudo dpkg -r $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package
 		
-	def Log(self, pkgName):
+	def Log(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
 		debug.info("log of iOs board")
 		debug.debug("------------------------------------------------------------------------")
@@ -425,7 +430,7 @@ class Target(target.Target):
 			if tools.file_size("ewol/ios-deploy/ios-deploy") == 0:
 				debug.error("Can not create ios-deploy external software ...")
 			debug.print_element("deploy", "iphone/ipad", "<==", "aplication")
-			cmdLine = './ewol/ios-deploy/ios-deploy --debug --bundle ' + self.get_staging_folder(pkgName)
+			cmdLine = './ewol/ios-deploy/ios-deploy --debug --bundle ' + self.get_staging_path(pkg_name)
 			multiprocess.run_command(cmdLine)
 		else:
 			cmdLine = "tail -f ~/Library/Logs/iOS\ Simulator/7.1/system.log"

lutin/z_target/lutinTarget_Linux.py

@@ -14,6 +14,7 @@ import os
 import stat
 import re
 from lutin import host
+from lutin import multiprocess
 
 class Target(target.Target):
 	def __init__(self, config):
@@ -33,109 +34,281 @@ class Target(target.Target):
 			if host.BUS_SIZE != 32:
 				self.global_flags_cc.append("-m32")
 		
+		self.global_flags_cc.append("-fpic")
 		self.global_flags_cc.append("-D__STDCPP_GNU__")
+		
+		
+		self.pkg_path_data = "share"
+		self.pkg_path_bin = "bin"
+		self.pkg_path_lib = "lib"
+		self.pkg_path_license = "license"
 	
-	def generate_list_separate_coma(self, list):
-		result = ""
-		fistTime = True
-		for elem in list:
-			if fistTime == True:
-				fistTime = False
-			else:
-				result += ","
-			result += elem
-		return result
+	"""
+	.local/application
+	    *--> applName -> applName.app/bin/applName
+	    *--> applName.app
+	        *--> appl_description.txt
+	        *--> appl_name.txt
+	        *--> changelog.txt
+	        *--> copyright.txt
+	        *--> readme.txt
+	        *--> version.txt
+	        *--> website.txt
+	        *--> icon.png
+	        *--> bin
+	        *    *--> applName
+	        *--> doc
+	        *    *--> applName
+	        *--> lib
+	        *    *--> XX.so
+	        *    *--> YY.so
+	        *--> license
+	        *    *--> applName.txt
+	        *    *--> libXX.txt
+	        *    *--> libYY.txt
+	        *--> man
+	        *--> share
+	        *    *--> applName
+	        *    *--> XX
+	        *    *--> YY
+	        *--> sources
+	"""
+	def make_package_generic_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
+		debug.debug("------------------------------------------------------------------------")
+		debug.info("Generate generic '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"]))
+		debug.debug("------------------------------------------------------------------------")
+		#output path
+		target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app")
+		tools.create_directory_of_file(target_outpath)
+		
+		## Create share datas:
+		self.make_package_binary_data(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## copy binary files:
+		self.make_package_binary_bin(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create libraries:
+		self.make_package_binary_lib(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create generic files:
+		self.make_package_generic_files(target_outpath, pkg_properties, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## create the package:
+		debug.debug("package : " + self.get_staging_path(pkg_name) + "/" + pkg_name + ".app.pkg")
+		os.system("cd " + self.get_staging_path(pkg_name) + " ; tar -czf " + pkg_name + ".app.tar.gz " + pkg_name + ".app")
+		#multiprocess.run_command("cd " + self.get_staging_path(pkg_name) + " ; tar -czf " + pkg_name + ".app.tar.gz " + pkg_name + ".app")
+		tools.create_directory_of_file(self.get_final_path())
+		tools.copy_file(self.get_staging_path(pkg_name) + "/" + pkg_name + ".app.tar.gz", self.get_final_path() + "/" + pkg_name + ".app.gpkg")
 	
-	def make_package(self, pkgName, pkgProperties, basePkgPath):
+	
+	
+	
+	def make_package_debian(self, pkg_name, pkg_properties, base_pkg_path, heritage_list):
 		# http://alp.developpez.com/tutoriels/debian/creer-paquet/
-		debianPkgName = re.sub("_", "-", pkgName)
+		debianpkg_name = re.sub("_", "-", pkg_name)
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Generate package '" + debianPkgName + "' v"+pkgProperties["VERSION"])
+		debug.info("Generate package '" + debianpkg_name + "' v"+pkg_properties["VERSION"])
 		debug.debug("------------------------------------------------------------------------")
-		self.get_staging_folder(pkgName)
-		targetOutFolderDebian = self.get_staging_folder(pkgName) + "/DEBIAN/"
-		finalFileControl = targetOutFolderDebian + "control"
-		finalFilepostRm = targetOutFolderDebian + "postrm"
-		# create the folders :
+		self.get_staging_path(pkg_name)
+		target_outpathDebian = self.get_staging_path(pkg_name) + "/DEBIAN/"
+		finalFileControl = target_outpathDebian + "control"
+		finalFilepostRm = target_outpathDebian + "postrm"
+		# create the paths :
 		tools.create_directory_of_file(finalFileControl)
 		tools.create_directory_of_file(finalFilepostRm)
 		## Create the control file
 		tools.create_directory_of_file(finalFileControl)
 		tmpFile = open(finalFileControl, 'w')
-		tmpFile.write("Package: " + debianPkgName + "\n")
-		tmpFile.write("Version: " + pkgProperties["VERSION"] + "\n")
-		tmpFile.write("Section: " + self.generate_list_separate_coma(pkgProperties["SECTION"]) + "\n")
-		tmpFile.write("Priority: " + pkgProperties["PRIORITY"] + "\n")
+		tmpFile.write("Package: " + debianpkg_name + "\n")
+		tmpFile.write("Version: " + pkg_properties["VERSION"] + "\n")
+		tmpFile.write("Section: " + self.generate_list_separate_coma(pkg_properties["SECTION"]) + "\n")
+		tmpFile.write("Priority: " + pkg_properties["PRIORITY"] + "\n")
 		tmpFile.write("Architecture: all\n")
 		tmpFile.write("Depends: bash\n")
-		tmpFile.write("Maintainer: " + self.generate_list_separate_coma(pkgProperties["MAINTAINER"]) + "\n")
-		tmpFile.write("Description: " + pkgProperties["DESCRIPTION"] + "\n")
+		tmpFile.write("Maintainer: " + self.generate_list_separate_coma(pkg_properties["MAINTAINER"]) + "\n")
+		tmpFile.write("Description: " + pkg_properties["DESCRIPTION"] + "\n")
 		tmpFile.write("\n")
 		tmpFile.flush()
 		tmpFile.close()
 		## Create the PostRm
 		tmpFile = open(finalFilepostRm, 'w')
 		tmpFile.write("#!/bin/bash\n")
-		tmpFile.write("touch ~/." + pkgName + "\n")
-		if pkgName != "":
-			tmpFile.write("touch ~/.local/share/" + pkgName + "\n")
-			tmpFile.write("rm -r ~/.local/share/" + pkgName + "\n")
+		tmpFile.write("touch ~/." + pkg_name + "\n")
+		if pkg_name != "":
+			tmpFile.write("touch ~/.local/share/" + pkg_name + "\n")
+			tmpFile.write("rm -r ~/.local/share/" + pkg_name + "\n")
 		tmpFile.write("\n")
 		tmpFile.flush()
 		tmpFile.close()
 		## Enable Execution in script
 		os.chmod(finalFilepostRm, stat.S_IRWXU + stat.S_IRGRP + stat.S_IXGRP + stat.S_IROTH + stat.S_IXOTH);
 		## Readme donumentation
-		readmeFileDest = self.get_staging_folder(pkgName) + "/usr/share/doc/"+ debianPkgName + "/README"
+		readmeFileDest = self.get_staging_path(pkg_name) + "/usr/share/doc/"+ debianpkg_name + "/README"
 		tools.create_directory_of_file(readmeFileDest)
-		if os.path.exists(basePkgPath + "/os-Linux/README")==True:
-			tools.copy_file(basePkgPath + "/os-Linux/README", readmeFileDest)
-		elif os.path.exists(basePkgPath + "/README")==True:
-			tools.copy_file(basePkgPath + "/README", readmeFileDest)
-		elif os.path.exists(basePkgPath + "/README.md")==True:
-			tools.copy_file(basePkgPath + "/README.md", readmeFileDest)
+		if os.path.exists(base_pkg_path + "/os-Linux/README")==True:
+			tools.copy_file(base_pkg_path + "/os-Linux/README", readmeFileDest)
+		elif os.path.exists(base_pkg_path + "/README")==True:
+			tools.copy_file(base_pkg_path + "/README", readmeFileDest)
+		elif os.path.exists(base_pkg_path + "/README.md")==True:
+			tools.copy_file(base_pkg_path + "/README.md", readmeFileDest)
 		else:
 			debug.info("no file 'README', 'README.md' or 'os-Linux/README' ==> generate an empty one")
 			tmpFile = open(readmeFileDest, 'w')
-			tmpFile.write("No documentation for " + pkgName + "\n")
+			tmpFile.write("No documentation for " + pkg_name + "\n")
 			tmpFile.flush()
 			tmpFile.close()
 		## licence file
-		licenseFileDest = self.get_staging_folder(pkgName) + "/usr/share/doc/"+ debianPkgName + "/copyright"
-		tools.create_directory_of_file(licenseFileDest)
-		if os.path.exists(basePkgPath + "/license.txt")==True:
-			tools.copy_file(basePkgPath + "/license.txt", licenseFileDest)
+		license_file_dest = self.get_staging_path(pkg_name) + "/usr/share/doc/"+ debianpkg_name + "/copyright"
+		tools.create_directory_of_file(license_file_dest)
+		if os.path.exists(base_pkg_path + "/license.txt")==True:
+			tools.copy_file(base_pkg_path + "/license.txt", license_file_dest)
 		else:
 			debug.info("no file 'license.txt' ==> generate an empty one")
-			tmpFile = open(licenseFileDest, 'w')
-			tmpFile.write("No license define by the developper for " + pkgName + "\n")
+			tmpFile = open(license_file_dest, 'w')
+			tmpFile.write("No license define by the developper for " + pkg_name + "\n")
 			tmpFile.flush()
 			tmpFile.close()
 		##changeLog file
-		changeLogFileDest = self.get_staging_folder(pkgName) + "/usr/share/doc/"+ debianPkgName + "/changelog"
-		tools.create_directory_of_file(changeLogFileDest)
-		if os.path.exists(basePkgPath + "/changelog")==True:
-			tools.copy_file(basePkgPath + "/changelog", changeLogFileDest)
+		change_log_file_dest = self.get_staging_path(pkg_name) + "/usr/share/doc/"+ debianpkg_name + "/changelog"
+		tools.create_directory_of_file(change_log_file_dest)
+		if os.path.exists(base_pkg_path + "/changelog")==True:
+			tools.copy_file(base_pkg_path + "/changelog", change_log_file_dest)
 		else:
 			debug.info("no file 'changelog' ==> generate an empty one")
-			tmpFile = open(changeLogFileDest, 'w')
-			tmpFile.write("No changelog data " + pkgName + "\n")
+			tmpFile = open(change_log_file_dest, 'w')
+			tmpFile.write("No changelog data " + pkg_name + "\n")
 			tmpFile.flush()
 			tmpFile.close()
 		## create the package :
-		debug.debug("package : " + self.get_staging_folder(pkgName) + "/" + debianPkgName + ".deb")
-		os.system("cd " + self.get_staging_folder("") + " ; dpkg-deb --build " + pkgName)
-		tools.create_directory_of_file(self.get_final_folder())
-		tools.copy_file(self.get_staging_folder("") + "/" + pkgName + self.suffix_package, self.get_final_folder() + "/" + pkgName + self.suffix_package)
+		debug.debug("package : " + self.get_staging_path(pkg_name) + "/" + debianpkg_name + ".deb")
+		os.system("cd " + self.get_staging_path("") + " ; dpkg-deb --build " + pkg_name)
+		tools.create_directory_of_file(self.get_final_path())
+		tools.copy_file(self.get_staging_path("") + "/" + pkg_name + self.suffix_package, self.get_final_path() + "/" + pkg_name + self.suffix_package)
 	
-	def install_package(self, pkgName):
+	def install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Install package '" + pkgName + "'")
+		debug.info("Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
-		os.system("sudo dpkg -i " + self.get_final_folder() + "/" + pkgName + self.suffix_package)
+		os.system("sudo dpkg -i " + self.get_final_path() + "/" + pkg_name + self.suffix_package)
 	
-	def un_install_package(self, pkgName):
+	def un_install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Un-Install package '" + pkgName + "'")
+		debug.info("Un-Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
-		os.system("sudo dpkg -r " + self.get_final_folder() + "/" + pkgName + self.suffix_package)
+		os.system("sudo dpkg -r " + self.get_final_path() + "/" + pkg_name + self.suffix_package)
+	
+	"""
+	.local/application
+	    *--> applName -> applName.app/bin/applName
+	    *--> applName.app
+	        *--> appl_description.txt
+	        *--> appl_name.txt
+	        *--> changelog.txt
+	        *--> copyright.txt
+	        *--> readme.txt
+	        *--> version.txt
+	        *--> website.txt
+	        *--> icon.png
+	        *--> bin
+	        *    *--> applName
+	        *--> doc
+	        *    *--> applName
+	        *--> lib
+	        *    *--> XX.so
+	        *    *--> YY.so
+	        *--> license
+	        *    *--> applName.txt
+	        *    *--> libXX.txt
+	        *    *--> libYY.txt
+	        *--> man
+	        *--> share
+	        *    *--> applName
+	        *    *--> XX
+	        *    *--> YY
+	        *--> sources
+	"""
+	def make_package_generic(self, pkg_name, pkg_properties, base_pkg_path, heritage_list):
+		debug.warning("heritage for " + str(pkg_name) + ":")
+		for heritage in heritage_list.list_heritage:
+			debug.warning("heritage .... " + str(heritage.name) + " : " + str(heritage.depends))
+		debianpkg_name = re.sub("_", "-", pkg_name)
+		debug.debug("------------------------------------------------------------------------")
+		debug.info("Generate generic '" + debianpkg_name + "' v"+pkg_properties["VERSION"])
+		debug.debug("------------------------------------------------------------------------")
+		target_outpath = self.get_staging_path(pkg_name) + "/edn.app/"
+		tools.create_directory_of_file(target_outpath)
+		## Create version file
+		tmpFile = open(target_outpath + "/version.txt", 'w')
+		tmpFile.write(pkg_properties["VERSION"])
+		tmpFile.flush()
+		tmpFile.close()
+		## Create maintainer file
+		tmpFile = open(target_outpath + "/maintainer.txt", 'w')
+		tmpFile.write(self.generate_list_separate_coma(pkg_properties["MAINTAINER"]))
+		tmpFile.flush()
+		tmpFile.close()
+		## Create appl_name file
+		tmpFile = open(target_outpath + "/appl_name.txt", 'w')
+		tmpFile.write("en_EN:" + pkg_properties["NAME"])
+		tmpFile.flush()
+		tmpFile.close()
+		## Create appl_description file
+		tmpFile = open(target_outpath + "/appl_description.txt", 'w')
+		tmpFile.write("en_EN:" + pkg_properties["DESCRIPTION"])
+		tmpFile.flush()
+		tmpFile.close()
+		## Create Readme file
+		readmeFileDest = target_outpath + "/readme.txt"
+		if os.path.exists(base_pkg_path + "/os-Linux/README")==True:
+			tools.copy_file(base_pkg_path + "/os-Linux/README", readmeFileDest)
+		elif os.path.exists(base_pkg_path + "/README")==True:
+			tools.copy_file(base_pkg_path + "/README", readmeFileDest)
+		elif os.path.exists(base_pkg_path + "/README.md")==True:
+			tools.copy_file(base_pkg_path + "/README.md", readmeFileDest)
+		else:
+			debug.info("no file 'README', 'README.md' or 'os-Linux/README' ==> generate an empty one")
+			tmpFile = open(readmeFileDest, 'w')
+			tmpFile.write("No documentation for " + pkg_name + "\n")
+			tmpFile.flush()
+			tmpFile.close()
+		## Create licence file
+		license_file_dest = target_outpath + "/license/"+ debianpkg_name + ".txt"
+		tools.create_directory_of_file(license_file_dest)
+		if os.path.exists(base_pkg_path + "/license.txt")==True:
+			tools.copy_file(base_pkg_path + "/license.txt", license_file_dest)
+		else:
+			debug.info("no file 'license.txt' ==> generate an empty one")
+			tmpFile = open(license_file_dest, 'w')
+			tmpFile.write("No license define by the developper for " + pkg_name + "\n")
+			tmpFile.flush()
+			tmpFile.close()
+		## Create changeLog file
+		change_log_file_dest = target_outpath + "/changelog.txt"
+		if os.path.exists(base_pkg_path + "/changelog") == True:
+			tools.copy_file(base_pkg_path + "/changelog", change_log_file_dest)
+		else:
+			debug.info("no file 'changelog' ==> generate an empty one")
+			tmpFile = open(change_log_file_dest, 'w')
+			tmpFile.write("No changelog data " + pkg_name + "\n")
+			tmpFile.flush()
+			tmpFile.close()
+		## copy share path
+		#debug.info("plop:" + self.get_staging_path(pkg_name) + self.path_data)
+		if os.path.exists(self.get_staging_path(pkg_name) + self.path_data) == True:
+			tools.copy_anything(self.get_staging_path(pkg_name) + self.path_data + "/*", target_outpath + self.path_data, recursive=True)
+		
+		## Create binary path:
+		bin_path = target_outpath + self.path_bin
+		#tools.create_directory_of_file(bin_path)
+		tools.copy_anything(self.get_staging_path(pkg_name) + self.path_bin + "/*",
+		                    bin_path)
+		
+		## create the package:
+		debug.debug("package : " + self.get_staging_path(pkg_name) + "/" + debianpkg_name + ".app.pkg")
+		os.system("cd " + self.get_staging_path(pkg_name) + " ; tar -czf " + pkg_name + ".app.tar.gz " + pkg_name + ".app")
+		#multiprocess.run_command("cd " + self.get_staging_path(pkg_name) + " ; tar -czf " + pkg_name + ".app.tar.gz " + pkg_name + ".app")
+		tools.create_directory_of_file(self.get_final_path())
+		tools.copy_file(self.get_staging_path(pkg_name) + "/" + pkg_name + ".app.tar.gz", self.get_final_path() + "/" + pkg_name + ".app.gpkg")
+		
+
+

lutin/z_target/lutinTarget_MacOs.py

@@ -28,110 +28,127 @@ class Target(target.Target):
 		# http://devs.openttd.org/~truebrain/compile-farm/apple-darwin9.txt
 		target.Target.__init__(self, "MacOs", config, "")
 		
-		self.folder_bin="/MacOS"
-		self.folder_lib="/lib"
-		self.folder_data="/Resources"
-		self.folder_doc="/doc"
+		#self.path_bin="MacOS"
+		#self.path_lib="lib"
+		#self.path_data="Resources"
+		#self.path_doc="doc"
 		
 		self.suffix_lib_static='.a'
 		self.suffix_lib_dynamic='.dylib'
-		self.suffix_binary=''
-		self.suffix_package=''
+		#self.suffix_binary=''
+		#self.suffix_package=''
 		
 		self.global_flags_cc.append("-D__STDCPP_LLVM__")
 		
-	
-	def get_staging_folder(self, binaryName):
-		return tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + binaryName + ".app/Contents/"
-	
-	def get_staging_folder_data(self, binaryName):
-		return self.get_staging_folder(binaryName) + self.folder_data + "/"
-	
-	def make_package(self, pkgName, pkgProperties, basePkgPath):
-		debug.debug("------------------------------------------------------------------------")
-		debug.info("Generate package '" + pkgName + "'")
-		debug.debug("------------------------------------------------------------------------")
+		self.pkg_path_data = "Resources"
+		self.pkg_path_bin = "MacOS"
+		self.pkg_path_lib = "lib"
+		self.pkg_path_license = "license"
 		
-		if    "ICON" in pkgProperties.keys() \
-		   and pkgProperties["ICON"] != "":
-			tools.copy_file(pkgProperties["ICON"], self.get_staging_folder_data(pkgName) + "/icon.icns", force=True)
+	"""
+	def get_staging_path(self, binary_name):
+		return tools.get_run_path() + self.path_out + self.path_staging + "/" + binary_name + ".app/Contents/"
+	
+	def get_staging_path_data(self, binary_name):
+		return self.get_staging_path(binary_name) + self.path_data + "/"
+	"""
+	
+	def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
+		debug.debug("------------------------------------------------------------------------")
+		debug.info("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"]))
+		debug.debug("------------------------------------------------------------------------")
+		#output path
+		target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app/Contents")
+		tools.create_directory_of_file(target_outpath)
 		
+		## Create share datas:
+		self.make_package_binary_data(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## copy binary files:
+		self.make_package_binary_bin(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create libraries:
+		self.make_package_binary_lib(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create generic files:
+		self.make_package_generic_files(target_outpath, pkg_properties, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create icon (no convertion ==> TODO: must test if png is now supported):
+		if     "ICON" in pkg_properties.keys() \
+		   and pkg_properties["ICON"] != "":
+			tools.copy_file(pkg_properties["ICON"], os.path.join(target_outpath, "icon.icns"), force=True)
+		
+		## Create info.plist file:
 		# http://www.sandroid.org/imcross/#Deployment
-		infoFile=self.get_staging_folder(pkgName) + "/Info.plist"
-		# Create the info file
-		tmpFile = open(infoFile, 'w')
-		tmpFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
-		tmpFile.write("<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n")
-		tmpFile.write("<plist version=\"1.0\">\n")
-		tmpFile.write("    <dict>\n")
-		tmpFile.write("        <key>CFBundleExecutableFile</key>\n")
-		tmpFile.write("        <string>"+pkgName+"</string>\n")
-		tmpFile.write("        <key>CFBundleName</key>\n")
-		tmpFile.write("        <string>"+pkgName+"</string>\n")
-		tmpFile.write("        <key>CFBundleIdentifier</key>\n")
-		tmpFile.write("        <string>" + pkgProperties["COMPAGNY_TYPE"] + "." + pkgProperties["COMPAGNY_NAME2"] + "." + pkgName + "</string>\n")
-		tmpFile.write("        <key>CFBundleSignature</key>\n")
-		tmpFile.write("        <string>????</string>\n")
-		tmpFile.write("        <key>CFBundleIconFile</key>\n")
-		tmpFile.write("        <string>icon.icns</string>\n")
-		tmpFile.write("    </dict>\n")
-		tmpFile.write("</plist>\n")
-		tmpFile.write("\n\n")
-		tmpFile.flush()
-		tmpFile.close()
-		infoFile=self.get_staging_folder(pkgName) + "/PkgInfo"
-		# Create the info file
-		tmpFile = open(infoFile, 'w')
-		tmpFile.write("APPL????")
-		tmpFile.flush()
-		tmpFile.close()
+		data_file  = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+		data_file += "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+		data_file += "<plist version=\"1.0\">\n"
+		data_file += "    <dict>\n"
+		data_file += "        <key>CFBundleExecutableFile</key>\n"
+		data_file += "        <string>"+pkg_name+"</string>\n"
+		data_file += "        <key>CFBundleName</key>\n"
+		data_file += "        <string>"+pkg_name+"</string>\n"
+		data_file += "        <key>CFBundleIdentifier</key>\n"
+		data_file += "        <string>" + pkg_properties["COMPAGNY_TYPE"] + "." + pkg_properties["COMPAGNY_NAME2"] + "." + pkg_name + "</string>\n"
+		data_file += "        <key>CFBundleSignature</key>\n"
+		data_file += "        <string>????</string>\n"
+		data_file += "        <key>CFBundleIconFile</key>\n"
+		data_file += "        <string>icon.icns</string>\n"
+		data_file += "    </dict>\n"
+		data_file += "</plist>\n"
+		data_file += "\n\n"
+		tools.file_write_data(os.path.join(target_outpath, "Info.plist"),
+		                      data_file,
+		                      only_if_new=True)
 		
-		# Create a simple interface to localy install the aplication for the shell (a shell command line interface)
-		shell_file_name=self.get_staging_folder(pkgName) + "/shell/" + pkgName
-		# Create the info file
-		tools.create_directory_of_file(shell_file_name)
-		tmpFile = open(shell_file_name, 'w')
-		tmpFile.write("#!/bin/bash\n")
-		tmpFile.write("# Simply open the real application in the correct way (a link does not work ...)\n")
-		tmpFile.write("/Applications/" + pkgName + ".app/Contents/MacOS/" + pkgName + " $*\n")
+		## Create PkgInfo file:
+		tools.file_write_data(os.path.join(target_outpath, "PkgInfo"),
+		                      "APPL????",
+		                      only_if_new=True)
+		
+		## Create a simple interface to localy install the aplication for the shell (a shell command line interface):
+		data_file  = "#!/bin/bash\n"
+		data_file += "# Simply open the real application in the correct way (a link does not work ...)\n"
+		data_file += "/Applications/" + pkg_name + ".app/Contents/MacOS/" + pkg_name + " $*\n"
 		#tmpFile.write("open -n /Applications/edn.app --args -AppCommandLineArg $*\n")
-		tmpFile.flush()
-		tmpFile.close()
+		tools.file_write_data(os.path.join(target_outpath, "shell", pkg_name),
+		                      data_file,
+		                      only_if_new=True)
 		
-		
-		# Must create the disk image of the application 
-		debug.info("Generate disk image for '" + pkgName + "'")
-		output_file_name = self.get_final_folder() + "/" + pkgName + ".dmg"
+		## Create the disk image of the application:
+		debug.info("Generate disk image for '" + pkg_name + "'")
+		output_file_name = os.path.join(self.get_final_path(), pkg_name + ".dmg")
 		cmd = "hdiutil create -volname "
-		cmd += pkgName + " -srcfolder "
-		cmd += tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + pkgName + ".app"
+		cmd += pkg_name + " -srcpath "
+		cmd += os.path.join(tools.get_run_path(), self.path_out,  self.path_staging, pkg_name + ".app")
 		cmd += " -ov -format UDZO "
 		cmd += output_file_name
 		tools.create_directory_of_file(output_file_name)
 		multiprocess.run_command_direct(cmd)
 		debug.info("disk image: " + output_file_name)
 		
+		## user information:
 		debug.info("You can have an shell interface by executing : ")
 		debug.info("    sudo cp " + shell_file_name + " /usr/local/bin")
 	
-	def install_package(self, pkgName):
+	def install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Install package '" + pkgName + "'")
+		debug.info("Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("copy " + tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + pkgName + ".app in /Applications/")
-		if os.path.exists("/Applications/" + pkgName + ".app") == True:
-			shutil.rmtree("/Applications/" + pkgName + ".app")
-		# copy the application in the basic application folder : /Applications/xxx.app
-		shutil.copytree(tools.get_run_folder() + self.folder_out + self.folder_staging + "/" + pkgName + ".app", "/Applications/" + pkgName + ".app")
+		debug.info("copy " + tools.get_run_path() + self.path_out + self.path_staging + "/" + pkg_name + ".app in /Applications/")
+		if os.path.exists("/Applications/" + pkg_name + ".app") == True:
+			shutil.rmtree("/Applications/" + pkg_name + ".app")
+		# copy the application in the basic application path : /Applications/xxx.app
+		shutil.copytree(tools.get_run_path() + self.path_out + self.path_staging + "/" + pkg_name + ".app", "/Applications/" + pkg_name + ".app")
 	
-	def un_install_package(self, pkgName):
+	def un_install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Un-Install package '" + pkgName + "'")
+		debug.info("Un-Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("remove OLD application /Applications/" + pkgName + ".app")
-		# Remove the application in the basic application folder : /Applications/xxx.app
-		if os.path.exists("/Applications/" + pkgName + ".app") == True:
-			shutil.rmtree("/Applications/" + pkgName + ".app")
+		debug.info("remove OLD application /Applications/" + pkg_name + ".app")
+		# Remove the application in the basic application path : /Applications/xxx.app
+		if os.path.exists("/Applications/" + pkg_name + ".app") == True:
+			shutil.rmtree("/Applications/" + pkg_name + ".app")
 
 
 

lutin/z_target/lutinTarget_Windows.py

@@ -50,38 +50,64 @@ class Target(target.Target):
 		                             "-static-libstdc++",
 		                             "-static"])
 		
-		self.folder_bin=""
-		self.folder_lib="/lib"
-		self.folder_data="/data"
-		self.folder_doc="/doc"
+		#self.path_bin=""
+		#self.path_lib="lib"
+		#self.path_data="data"
+		#self.path_doc="doc"
+		
+		self.pkg_path_data = "data"
+		self.pkg_path_bin = ""
+		self.pkg_path_lib = "lib"
+		self.pkg_path_license = "license"
 		
 		self.suffix_lib_static='.a'
 		self.suffix_lib_dynamic='.dll'
 		self.suffix_binary='.exe'
-		self.suffix_package=''
+		#self.suffix_package=''
 		self.global_flags_cc.append("-D__STDCPP_GNU__")
 	
 	
-	def get_staging_folder_data(self, binaryName):
-		return self.get_staging_folder(binaryName) + self.folder_data
+	def get_staging_path_data(self, binary_name, heritage_list):
+		return self.get_staging_path(binary_name) + self.path_data
 	
-	def make_package(self, pkgName, pkgProperties, basePkgPath):
+	def make_package_generic_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Generate package '" + pkgName + "'")
+		debug.info("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"]))
+		debug.debug("------------------------------------------------------------------------")
+		#output path
+		target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app")
+		tools.create_directory_of_file(target_outpath)
+		
+		## Create share datas:
+		self.make_package_binary_data(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## copy binary files:
+		self.make_package_binary_bin(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create libraries:
+		self.make_package_binary_lib(target_outpath, pkg_name, base_pkg_path, heritage_list, static)
+		
+		## Create generic files:
+		self.make_package_generic_files(target_outpath, pkg_properties, pkg_name, base_pkg_path, heritage_list, static)
+		
+	
+	def make_package_single_file(self, pkg_name, pkg_properties, base_pkg_path, heritage_list):
+		debug.debug("------------------------------------------------------------------------")
+		debug.info("Generate package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
 		debug.print_element("zip", "data.zip", "<==", "data/*")
-		zipPath = self.get_staging_folder(pkgName) + "/data.zip"
-		zip.create_zip(self.get_staging_folder_data(pkgName), zipPath)
+		zipPath = self.get_staging_path(pkg_name) + "/data.zip"
+		zip.create_zip(self.get_staging_path_data(pkg_name), zipPath)
 		
-		binPath = self.get_staging_folder(pkgName) + "/" + self.folder_bin + "/" + pkgName + self.suffix_binary
+		binPath = self.get_staging_path(pkg_name) + "/" + self.path_bin + "/" + pkg_name + self.suffix_binary
 		binSize = tools.file_size(binPath)
 		debug.info("binarysize : " + str(binSize/1024) + " ko ==> " + str(binSize) + " octets")
 		
 		#now we create a simple bundle binary ==> all file is stored in one file ...
-		self.get_staging_folder(pkgName)
-		finalBin = self.get_final_folder() + "/" + pkgName + self.suffix_binary
+		self.get_staging_path(pkg_name)
+		finalBin = self.get_final_path() + "/" + pkg_name + self.suffix_binary
 		tools.create_directory_of_file(finalBin);
-		debug.print_element("pkg", finalBin, "<==", pkgName + self.suffix_binary)
+		debug.print_element("pkg", finalBin, "<==", pkg_name + self.suffix_binary)
 		#open output file
 		tmpFile = open(finalBin, 'wb')
 		# read all executable binary
@@ -118,16 +144,16 @@ class Target(target.Target):
 		tmpFile.close()
 		debug.verbose("zip position=" + str(positionOfZip) + " = 0x" + h)
 	
-	def install_package(self, pkgName):
+	def install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Install package '" + pkgName + "'")
+		debug.info("Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
 		debug.warning("    ==> TODO")
 		#sudo dpkg -i $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package
 	
-	def un_install_package(self, pkgName):
+	def un_install_package(self, pkg_name):
 		debug.debug("------------------------------------------------------------------------")
-		debug.info("Un-Install package '" + pkgName + "'")
+		debug.info("Un-Install package '" + pkg_name + "'")
 		debug.debug("------------------------------------------------------------------------")
 		debug.warning("    ==> TODO")
 		#sudo dpkg -r $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package

setup.py

@@ -7,7 +7,7 @@ def readme():
 
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 setup(name='lutin',
-      version='0.6.3',
+      version='0.7.1',
       description='Lutin generic builder',
       long_description=readme(),
       url='http://github.com/HeeroYui/lutin',
@@ -26,9 +26,10 @@ setup(name='lutin',
       ],
       keywords='builder c++ c android ios macos makefile cmake',
       scripts=['bin/lutin'],
-      data_file=[
-          ('/etc/bash_completion.d', ['bash-autocompletion/lutin']),
-      ],
+      # Does not work on MacOs
+      #data_file=[
+      #    ('/etc/bash_completion.d', ['bash-autocompletion/lutin']),
+      #],
       include_package_data = True,
       zip_safe=False)