From b5096256532d3db8e56dcd0db72ca8674256994c Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 31 Jan 2017 23:01:45 +0100 Subject: [PATCH] [TEST] remove log in the debug, verbose, extreme_verbose and speed move 2.95s to 2.64s ==> not enougth --- lutin/__init__.py | 25 ++-- lutin/arg.py | 12 +- lutin/builder.py | 15 +- lutin/depend.py | 86 +++++------ lutin/env.py | 6 +- lutin/heritage.py | 34 +++-- lutin/host.py | 4 +- lutin/image.py | 2 +- lutin/macro.py | 19 +-- lutin/module.py | 140 +++++++++--------- lutin/multiprocess.py | 33 +++-- lutin/system.py | 23 +-- lutin/target.py | 119 +++++++-------- lutin/tools.py | 46 +++--- lutin/z_builder/lutinBuilder_binary.py | 4 +- lutin/z_builder/lutinBuilder_java.py | 4 +- lutin/z_builder/lutinBuilder_javah.py | 6 +- .../z_builder/lutinBuilder_libraryDynamic.py | 10 +- lutin/z_builder/lutinBuilder_libraryStatic.py | 8 +- lutin/z_builder/lutinBuilder_m.py | 2 +- lutin/z_builder/lutinBuilder_mm.py | 2 +- lutin/z_target/lutinTarget_Android.py | 38 ++--- lutin/z_target/lutinTarget_Debian.py | 16 +- lutin/z_target/lutinTarget_IOs.py | 24 +-- lutin/z_target/lutinTarget_Linux.py | 24 +-- lutin/z_target/lutinTarget_MacOs.py | 20 +-- lutin/z_target/lutinTarget_Web.py | 26 ++-- lutin/z_target/lutinTarget_Windows.py | 30 ++-- lutin/zip.py | 12 +- 29 files changed, 405 insertions(+), 385 deletions(-) diff --git a/lutin/__init__.py b/lutin/__init__.py index 0907ef6..4318c70 100755 --- a/lutin/__init__.py +++ b/lutin/__init__.py @@ -44,9 +44,9 @@ def filter_path(root, list_files): def import_path_local(path, limit_sub_folder, exclude_path = [], base_name = ""): out = [] - debug.verbose("lutin files: " + str(path) + " [START]") + #debug.verbose("lutin files: " + str(path) + " [START]") if limit_sub_folder == 0: - debug.debug("Subparsing limitation append ...") + #debug.debug("Subparsing limitation append ...") return [] try: list_files = os.listdir(path) @@ -55,15 +55,15 @@ def import_path_local(path, limit_sub_folder, exclude_path = [], base_name = "") debug.warning("error when getting subdirectory of '" + str(path) + "'") return [] if path in exclude_path: - debug.debug("find '" + str(path) + "' in exclude_path=" + str(exclude_path)) + #debug.debug("find '" + str(path) + "' in exclude_path=" + str(exclude_path)) return [] # filter elements: tmp_list_lutin_file = filter_name_and_file(path, list_files, base_name + "*.py") - debug.verbose("lutin files: " + str(path) + " : " + str(tmp_list_lutin_file)) + #debug.verbose("lutin files: " + str(path) + " : " + str(tmp_list_lutin_file)) # Import the module: for filename in tmp_list_lutin_file: out.append(os.path.join(path, filename)) - debug.extreme_verbose(" Find a file : '" + str(out[-1]) + "'") + #debug.extreme_verbose(" Find a file : '" + str(out[-1]) + "'") need_parse_sub_folder = True rm_value = -1 # check if we need to parse sub_folder @@ -71,15 +71,15 @@ def import_path_local(path, limit_sub_folder, exclude_path = [], base_name = "") need_parse_sub_folder = False # check if the file "lutin_parse_sub.py" is present ==> parse SubFolder (force and add +1 in the resursing if base_name + "ParseSubFolders.txt" in list_files: - debug.debug("find SubParser ... " + str(base_name + "ParseSubFolders.txt") + " " + path) + #debug.debug("find SubParser ... " + str(base_name + "ParseSubFolders.txt") + " " + path) data_file_sub = tools.file_read_data(os.path.join(path, base_name + "ParseSubFolders.txt")) if data_file_sub == "": - debug.debug(" Empty file Load all subfolder in the worktree in '" + str(path) + "'") + #debug.debug(" Empty file Load all subfolder in the worktree in '" + str(path) + "'") need_parse_sub_folder = True rm_value = 0 else: list_sub = data_file_sub.split("\n") - debug.debug(" Parse selected folders " + str(list_sub) + " no parse local folder directory") + #debug.debug(" Parse selected folders " + str(list_sub) + " no parse local folder directory") need_parse_sub_folder = False for folder in list_sub: if folder == "" \ @@ -109,7 +109,7 @@ def init(): global is_init; if is_init == True: return - debug.verbose("Use Make as a make stadard") + #debug.verbose("Use Make as a make stadard") sys.path.append(tools.get_run_path()) # create the list of basic folder: basic_folder_list = [] @@ -121,7 +121,7 @@ def init(): if elem_path.lower() == "android" \ or elem_path == "out" : continue - debug.debug("Automatic load path: '" + elem_path + "'") + #debug.debug("Automatic load path: '" + elem_path + "'") basic_folder_list.append([elem_path, False]) # create in a single path the basic list of lutin files (all start with lutin and end with .py) @@ -141,9 +141,10 @@ def init(): for elem in tmp_out: list_of_lutin_files.append(elem) - debug.debug("Files specific lutin: ") + #debug.debug("Files specific lutin: ") for elem_path in list_of_lutin_files: - debug.debug(" " + elem_path) + #debug.debug(" " + elem_path) + pass # simply import element from the basic list of files (single parse ...) builder.import_path(list_of_lutin_files) module.import_path(list_of_lutin_files) diff --git a/lutin/arg.py b/lutin/arg.py index 38bbf53..03a28b0 100644 --- a/lutin/arg.py +++ b/lutin/arg.py @@ -259,16 +259,16 @@ class LutinArg: if NotparseNextElement==True: NotparseNextElement = False continue - debug.verbose("parse [" + str(iii) + "]=" + sys.argv[iii]) + #debug.verbose("parse [" + str(iii) + "]=" + sys.argv[iii]) argument = sys.argv[iii] optionList = argument.split("=") - debug.verbose(str(optionList)) + #debug.verbose(str(optionList)) if type(optionList) == type(str()): option = optionList else: option = optionList[0] optionParam = argument[len(option)+1:] - debug.verbose(option) + #debug.verbose(option) argumentFound=False; if option[:2]=="--": # big argument @@ -277,7 +277,7 @@ class LutinArg: continue if prop.get_option_big() == option[2:]: # find it - debug.verbose("find argument 2 : " + option[2:]) + #debug.verbose("find argument 2 : " + option[2:]) if prop.need_parameters()==True: internalSub = option[2+len(prop.get_option_big()):] if len(internalSub)!=0: @@ -319,7 +319,7 @@ class LutinArg: continue if prop.get_option_small() == option[1:1+len(prop.get_option_small())]: # find it - debug.verbose("find argument 1 : " + option[1:1+len(prop.get_option_small())]) + #debug.verbose("find argument 1 : " + option[1:1+len(prop.get_option_small())]) if prop.need_parameters()==True: internalSub = option[1+len(prop.get_option_small()):] if len(internalSub)!=0: @@ -355,7 +355,7 @@ class LutinArg: if argumentFound==False: #unknow element ... ==> just add in the list ... - debug.verbose("unknow argument : " + argument) + #debug.verbose("unknow argument : " + argument) listArgument.append(ArgElement("", argument)) #for argument in listArgument: diff --git a/lutin/builder.py b/lutin/builder.py index 0515550..7c749f1 100644 --- a/lutin/builder.py +++ b/lutin/builder.py @@ -34,7 +34,7 @@ __start_builder_name="Builder_" def import_path(path_list): global builder_list global_base = env.get_build_system_base_name() - debug.debug("BUILDER: Init with Files list:") + #debug.debug("BUILDER: Init with Files list:") for elem in path_list: sys.path.append(os.path.dirname(elem)) # Get file name: @@ -46,19 +46,20 @@ def import_path(path_list): filename = filename[len(global_base):] # Check if it start with the local patern: if filename[:len(__start_builder_name)] != __start_builder_name: - debug.extreme_verbose("BUILDER: Integrate: '" + filename + "' from '" + elem + "' ==> rejected") + #debug.extreme_verbose("BUILDER: Integrate: '" + filename + "' from '" + elem + "' ==> rejected") continue # Remove local patern builder_name = filename[len(__start_builder_name):] - debug.verbose("BUILDER: Integrate: '" + builder_name + "' from '" + elem + "'") + #debug.verbose("BUILDER: Integrate: '" + builder_name + "' from '" + elem + "'") the_builder = __import__(base_file_name) builder_list.append({"name":builder_name, "element":the_builder }) - debug.debug('BUILDER: type=' + the_builder.get_type() + " in=" + str(the_builder.get_input_type()) + " out=" + str(the_builder.get_output_type())) - debug.verbose("List of BUILDER: ") + #debug.debug('BUILDER: type=' + the_builder.get_type() + " in=" + str(the_builder.get_input_type()) + " out=" + str(the_builder.get_output_type())) + #debug.verbose("List of BUILDER: ") for elem in builder_list: - debug.verbose(" " + str(elem["name"])) + #debug.verbose(" " + str(elem["name"])) + pass ## @@ -66,7 +67,7 @@ def import_path(path_list): ## def init(): global builder_list - debug.debug('BUILDER: Initialize all ...') + #debug.debug('BUILDER: Initialize all ...') for element in builder_list: if element["element"] != None: element["element"].init() diff --git a/lutin/depend.py b/lutin/depend.py index 6c4dd6e..812eb3a 100644 --- a/lutin/depend.py +++ b/lutin/depend.py @@ -90,22 +90,22 @@ def file_exist(file_name): ## @return (bool) True: something change ==> need to rebuild, False otherwise ## 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(" 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) + "'") + #debug.extreme_verbose("Request check of dependency of :") + #debug.extreme_verbose(" dst='" + str(dst) + "'") + #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)") + #debug.extreme_verbose(" ==> must rebuild (force mode)") return True # check if the destination existed: if dst != "" \ and dst != None \ and file_exist(dst) == False: - debug.extreme_verbose(" ==> must rebuild (dst does not exist)") + #debug.extreme_verbose(" ==> must rebuild (dst does not exist)") return True if src != "" \ and src != None \ @@ -118,27 +118,27 @@ def need_re_build(dst, src, depend_file=None, file_cmd="", cmd_line="", force_id and src != "" \ and src != None \ and file_get_time(src) > file_get_time(dst): - debug.extreme_verbose(" ==> must rebuild (source time greater)") + #debug.extreme_verbose(" ==> must rebuild (source time greater)") return True if depend_file != "" \ and depend_file != None \ and file_exist(depend_file) == False: - debug.extreme_verbose(" ==> must rebuild (no depending file)") + #debug.extreme_verbose(" ==> must rebuild (no depending file)") return True if file_cmd != "" \ and file_cmd != None: if file_exist(file_cmd) == False: - debug.extreme_verbose(" ==> must rebuild (no commandLine file)") + #debug.extreme_verbose(" ==> must rebuild (no commandLine file)") return True # check if the 2 cmd_line are similar : file2 = open(file_cmd, "r") 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 + "'") + #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 ... @@ -146,7 +146,7 @@ def need_re_build(dst, src, depend_file=None, file_cmd="", cmd_line="", force_id if depend_file != "" \ and depend_file != None: - debug.extreme_verbose(" start parsing dependency file : '" + depend_file + "'") + #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" @@ -155,28 +155,30 @@ def need_re_build(dst, src, depend_file=None, file_cmd="", cmd_line="", force_id if cur_line[len(cur_line)-1:] == '\\' : cur_line = cur_line[:len(cur_line)-1] # remove white space : - #debug.verbose(" Line (read) : '" + cur_line + "'"); + ##debug.verbose(" Line (read) : '" + cur_line + "'"); cur_line = cur_line.strip() - #debug.verbose(" Line (strip) : '" + cur_line + "'"); + ##debug.verbose(" Line (strip) : '" + cur_line + "'"); test_file="" if cur_line[len(cur_line)-1:] == ':': - debug.extreme_verbose(" Line (no check (already done) : '" + cur_line + "'"); + #debug.extreme_verbose(" Line (no check (already done) : '" + cur_line + "'"); + pass elif len(cur_line) == 0 \ or cur_line == '\\': - debug.extreme_verbose(" Line (Not parsed) : '" + cur_line + "'"); + #debug.extreme_verbose(" Line (Not parsed) : '" + cur_line + "'"); + pass else: test_file = cur_line - debug.extreme_verbose(" Line (might check) : '" + test_file + "'"); + #debug.extreme_verbose(" Line (might check) : '" + test_file + "'"); # really check files: if test_file != "": - debug.extreme_verbose(" ==> test"); + #debug.extreme_verbose(" ==> test"); if file_exist(test_file) == False: - debug.extreme_verbose(" ==> must rebuild (a dependency file does not exist)") + #debug.extreme_verbose(" ==> must rebuild (a dependency file does not exist)") file.close() return True if file_get_time(test_file) > file_get_time(dst): - debug.extreme_verbose(" ==> must rebuild (a dependency file time is newer)") + #debug.extreme_verbose(" ==> must rebuild (a dependency file time is newer)") file.close() return True # close the current file : @@ -187,15 +189,15 @@ def need_re_build(dst, src, depend_file=None, file_cmd="", cmd_line="", force_id 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)) + #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") + #debug.extreme_verbose(" Force Rewrite not the same data") return True - debug.extreme_verbose(" ==> Not rebuild (all dependency is OK)") + #debug.extreme_verbose(" ==> Not rebuild (all dependency is OK)") return False ## @@ -208,23 +210,23 @@ def need_re_build(dst, src, depend_file=None, file_cmd="", cmd_line="", force_id ## @return (bool) True: Need to regenerate the package, False otherwise ## 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) + "'") + #debug.extreme_verbose("Request check of dependency of :") + #debug.extreme_verbose(" dst='" + str(dst) + "'") compleate_list = [] - debug.extreme_verbose(" src:") + #debug.extreme_verbose(" src:") if type(src_list) == str: compleate_list.append(src_list) - debug.extreme_verbose(" '" + 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) + "'") + #debug.extreme_verbose(" '" + str(src) + "'") elif type(src_list) == dict: for key in src_list: - debug.extreme_verbose(" '" + str(key) + "'") + #debug.extreme_verbose(" '" + str(key) + "'") for src in src_list[key]: compleate_list.append(src) - debug.extreme_verbose(" '" + str(src) + "'") + #debug.extreme_verbose(" '" + str(src) + "'") if must_have_src == False \ and len(compleate_list) == 0: @@ -232,39 +234,39 @@ def need_re_package(dst, src_list, must_have_src, file_cmd="", cmd_line=""): # if force mode selected ==> just force rebuild ... if env.get_force_mode(): - debug.extreme_verbose(" ==> must re-package (force mode)") + #debug.extreme_verbose(" ==> must re-package (force mode)") return True # check if the destination existed: if file_exist(dst) == False: - debug.extreme_verbose(" ==> must re-package (dst does not exist)") + #debug.extreme_verbose(" ==> must re-package (dst does not exist)") return True # chek the basic date if the 2 files if len(compleate_list) == 0: - debug.extreme_verbose(" ==> must re-package (no source ???)") + #debug.extreme_verbose(" ==> must re-package (no source ???)") return True for src in compleate_list: if file_get_time(src) > file_get_time(dst): - debug.extreme_verbose(" ==> must re-package (source time greater) : '" + src + "'") + #debug.extreme_verbose(" ==> must re-package (source time greater) : '" + src + "'") return True if ""!=file_cmd: if False==file_exist(file_cmd): - debug.extreme_verbose(" ==> must rebuild (no commandLine file)") + #debug.extreme_verbose(" ==> must rebuild (no commandLine file)") return True # check if the 2 cmd_line are similar : file2 = open(file_cmd, "r") 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 + "'") + #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() - debug.extreme_verbose(" ==> Not re-package (all dependency is OK)") + #debug.extreme_verbose(" ==> Not re-package (all dependency is OK)") return False diff --git a/lutin/env.py b/lutin/env.py index c29a3d2..799ef2e 100644 --- a/lutin/env.py +++ b/lutin/env.py @@ -57,7 +57,7 @@ parse_depth = 9999999 def set_parse_depth(val): global parse_depth parse_depth = val - debug.debug("Set depth search element: " + str(parse_depth)) + #debug.debug("Set depth search element: " + str(parse_depth)) def get_parse_depth(): global parse_depth @@ -68,7 +68,7 @@ exclude_search_path = [] def set_exclude_search_path(val): global exclude_search_path exclude_search_path = val - debug.debug("Set depth search element: " + str(exclude_search_path)) + #debug.debug("Set depth search element: " + str(exclude_search_path)) def get_exclude_search_path(): global exclude_search_path @@ -80,7 +80,7 @@ build_system_base_name = "lutin" def set_build_system_base_name(val): global build_system_base_name build_system_base_name = val - debug.debug("Set basename: '" + str(build_system_base_name) + "'") + #debug.debug("Set basename: '" + str(build_system_base_name) + "'") def get_build_system_base_name(): global build_system_base_name diff --git a/lutin/heritage.py b/lutin/heritage.py index 84c6b81..6d358ea 100644 --- a/lutin/heritage.py +++ b/lutin/heritage.py @@ -61,7 +61,7 @@ class HeritageList: self.regenerate_tree() def regenerate_tree(self): - debug.verbose("Regenerate heritage list:") + #debug.verbose("Regenerate heritage list:") self.flags = {} # sources list: self.src = { 'src':[], @@ -73,24 +73,25 @@ class HeritageList: listHeritage = self.list_heritage self.list_heritage = [] # first step : add all lib with no dependency: - debug.extreme_verbose(" add element with no dependency:") + #debug.extreme_verbose(" add element with no dependency:") for herit in listHeritage: if len(herit.depends) == 0: - debug.extreme_verbose(" add: " + str(herit.name)) + #debug.extreme_verbose(" add: " + str(herit.name)) self.list_heritage.append(copy.deepcopy(herit)) listHeritage.remove(herit) - debug.extreme_verbose(" add element with dependency:") + #debug.extreme_verbose(" add element with dependency:") while len(listHeritage) > 0: currentHeritageSize = len(listHeritage) - debug.verbose(" list heritage = " + str([[x.name, x.depends] for x in listHeritage])) - debug.extreme_verbose(" list heritage (rest):") + #debug.verbose(" list heritage = " + str([[x.name, x.depends] for x in listHeritage])) + #debug.extreme_verbose(" list heritage (rest):") for tmppp_herit in listHeritage: - debug.extreme_verbose(" elem= " + str(tmppp_herit.name) + " : " + str(tmppp_herit.depends)) + #debug.extreme_verbose(" elem= " + str(tmppp_herit.name) + " : " + str(tmppp_herit.depends)) + pass # Add element only when all dependence are resolved for herit in listHeritage: listDependsName = [y.name for y in self.list_heritage] if all(x in listDependsName for x in herit.depends) == True: - debug.extreme_verbose(" add: " + str(herit.name)) + #debug.extreme_verbose(" add: " + str(herit.name)) listHeritage.remove(herit) self.list_heritage.append(copy.deepcopy(herit)) if currentHeritageSize == len(listHeritage): @@ -101,9 +102,10 @@ class HeritageList: debug.warning("new heritage list:") for element in self.list_heritage: debug.warning(" " + element.name + " " + str(element.depends)) - debug.extreme_verbose("new heritage list:") + #debug.extreme_verbose("new heritage list:") for element in self.list_heritage: - debug.extreme_verbose(" " + element.name + " " + str(element.depends)) + #debug.extreme_verbose(" " + element.name + " " + str(element.depends)) + pass for element in reversed(self.list_heritage): for flags in element.flags: # get value @@ -134,22 +136,22 @@ class HeritageList: append_to_list(self.src['dynamic'], element.src['dynamic']) append_to_list(self.src['static'], element.src['static']) for element in self.list_heritage: - debug.extreme_verbose(" elem: " + str(element.name)) - debug.extreme_verbose(" Path (base): " + str(self.path)) - debug.extreme_verbose(" inside: " + str(element.path)) + #debug.extreme_verbose(" elem: " + str(element.name)) + #debug.extreme_verbose(" Path (base): " + str(self.path)) + #debug.extreme_verbose(" inside: " + str(element.path)) for ppp in element.path: value = copy.deepcopy(element.path[ppp]) if ppp not in self.path: self.path[ppp] = value else: append_to_list(self.path[ppp], value) - debug.extreme_verbose("Path : " + str(self.path)) + #debug.extreme_verbose("Path : " + str(self.path)) for ppp in self.path: tmp = self.path[ppp] self.path[ppp] = [] for iii in reversed(tmp): self.path[ppp].append(iii) - debug.extreme_verbose("Path : " + str(self.path)) + #debug.extreme_verbose("Path : " + str(self.path)) ## ## @brief Generate a string representing the class (for str(xxx)) @@ -230,7 +232,7 @@ class heritage: def add_sub(self, other): if type(other) == type(None): - debug.verbose("input of the heriatege class is None !!!") + #debug.verbose("input of the heriatege class is None !!!") return if other.has_been_updated == True: self.has_been_updated = True diff --git a/lutin/host.py b/lutin/host.py index 3e93824..47e3a1c 100644 --- a/lutin/host.py +++ b/lutin/host.py @@ -25,7 +25,7 @@ elif platform.system() == "Darwin": else: debug.error("Unknow the Host OS ... '" + platform.system() + "'") -debug.debug("host.OS = " + OS) +#debug.debug("host.OS = " + OS) if sys.maxsize > 2**32: @@ -33,5 +33,5 @@ if sys.maxsize > 2**32: else: BUS_SIZE = 32 -debug.debug("host.BUS_SIZE = " + str(BUS_SIZE)) +#debug.debug("host.BUS_SIZE = " + str(BUS_SIZE)) diff --git a/lutin/image.py b/lutin/image.py index c3a6762..6d061f9 100644 --- a/lutin/image.py +++ b/lutin/image.py @@ -75,7 +75,7 @@ def resize(src_file, dest_file, x, y, cmd_file=None): 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) + ")", src_file, "==>", dest_file) - debug.debug("Resize image: " + src_file + " size=(" + str(source_width) + "x" + str(source_height) + ") -> (" + str(x) + "x" + str(y) + ")") + #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() diff --git a/lutin/macro.py b/lutin/macro.py index b4e212a..a19da71 100644 --- a/lutin/macro.py +++ b/lutin/macro.py @@ -29,7 +29,7 @@ __start_macro_name="Macro_" def import_path(path_list): global __macro_list global_base = env.get_build_system_base_name() - debug.debug("TARGET: Init with Files list:") + #debug.debug("TARGET: Init with Files list:") for elem in path_list: sys.path.append(os.path.dirname(elem)) # Get file name: @@ -40,30 +40,31 @@ def import_path(path_list): filename = filename[len(global_base):] # Check if it start with the local patern: if filename[:len(__start_macro_name)] != __start_macro_name: - debug.extreme_verbose("MACRO: NOT-Integrate: '" + filename + "' from '" + elem + "' ==> rejected") + #debug.extreme_verbose("MACRO: NOT-Integrate: '" + filename + "' from '" + elem + "' ==> rejected") continue # Remove local patern target_name = filename[len(__start_macro_name):] - debug.verbose("MACRO: Integrate: '" + target_name + "' from '" + elem + "'") + #debug.verbose("MACRO: Integrate: '" + target_name + "' from '" + elem + "'") __macro_list.append([target_name, elem]) - debug.verbose("New list MACRO: ") + #debug.verbose("New list MACRO: ") for elem in __macro_list: - debug.verbose(" " + str(elem[0])) + #debug.verbose(" " + str(elem[0])) + pass ## ## @brief Load a specific target ## def load_macro(name): global __macro_list - debug.debug("load macro: " + name) + #debug.debug("load macro: " + name) if len(__macro_list) == 0: debug.error("No macro to compile !!!") - debug.debug("list macro: " + str(__macro_list)) + #debug.debug("list macro: " + str(__macro_list)) for mod in __macro_list: if mod[0] == name: - debug.verbose("add to path: '" + os.path.dirname(mod[1]) + "'") + #debug.verbose("add to path: '" + os.path.dirname(mod[1]) + "'") sys.path.append(os.path.dirname(mod[1])) - debug.verbose("import macro : '" + env.get_build_system_base_name() + __start_macro_name + name + "'") + #debug.verbose("import macro : '" + env.get_build_system_base_name() + __start_macro_name + name + "'") the_macro = __import__(env.get_build_system_base_name() + __start_macro_name + name) return the_macro raise KeyError("No entry for : " + name) diff --git a/lutin/module.py b/lutin/module.py index 5ee8a23..eb29eb9 100644 --- a/lutin/module.py +++ b/lutin/module.py @@ -53,7 +53,7 @@ class Module: ## def __init__(self, file, module_name, module_type): ## Remove all variable to prevent error of multiple deffinition of the module ... - debug.verbose("Create a new module : '" + module_name + "' TYPE=" + module_type) + #debug.verbose("Create a new module : '" + module_name + "' TYPE=" + module_type) self._origin_file = file; self._origin_path = tools.get_current_path(self._origin_file) # type of the module: @@ -245,11 +245,11 @@ class Module: source = self._origin_path + "/" + source if destination == "": destination = source[source.rfind('/')+1:] - debug.verbose("Regenerate Destination : '" + destination + "'") + #debug.verbose("Regenerate Destination : '" + destination + "'") # TODO : set it back : file_cmd = target.get_build_path_data(self.name) file_cmd = "" if sizeX > 0: - debug.verbose("Image file : " + display_source + " ==> " + destination + " resize=(" + str(sizeX) + "," + str(sizeY) + ")") + #debug.verbose("Image file : " + display_source + " ==> " + destination + " resize=(" + str(sizeX) + "," + str(sizeY) + ")") fileName, fileExtension = os.path.splitext(os.path.join(self._origin_path,source)) # Create the resized file in a temporary path to auto-copy when needed temporary_file = os.path.join(target.get_build_path_temporary_generate(self._name), "image_generation", destination) @@ -260,7 +260,7 @@ class Module: file_cmd, in_list=copy_list) else: - debug.verbose("Might copy file : " + display_source + " ==> " + destination) + #debug.verbose("Might copy file : " + display_source + " ==> " + destination) tools.copy_file(source, os.path.join(target.get_build_path_data(self._name), destination), file_cmd, @@ -279,10 +279,10 @@ class Module: source = os.path.join(self._origin_path, source) if destination == "": destination = source[source.rfind('/')+1:] - debug.verbose("Regenerate Destination : '" + destination + "'") + #debug.verbose("Regenerate Destination : '" + destination + "'") # TODO : set it back : file_cmd = target.get_build_path_data(self.name) file_cmd = "" - debug.verbose("Might copy file : " + display_source + " ==> " + destination) + #debug.verbose("Might copy file : " + display_source + " ==> " + destination) tools.copy_file(source, os.path.join(target.get_build_path_data(self._name), destination), force_identical=True, @@ -297,18 +297,18 @@ class Module: ## def paths_to_build(self, target, copy_list): for source, destination in self._paths: - debug.debug("Might copy path : " + source + "==>" + destination) + #debug.debug("Might copy path : " + source + "==>" + destination) tmp_path = os.path.dirname(os.path.realpath(os.path.join(self._origin_path, source))) tmp_rule = os.path.basename(source) for root, dirnames, filenames in os.walk(tmp_path): - debug.extreme_verbose(" root='" + str(root) + "' tmp_path='" + str(tmp_path)) + #debug.extreme_verbose(" root='" + str(root) + "' tmp_path='" + str(tmp_path)) if root != tmp_path: break - debug.verbose(" root='" + str(root) + "' dir='" + str(dirnames) + "' filenames=" + str(filenames)) + #debug.verbose(" root='" + str(root) + "' dir='" + str(dirnames) + "' filenames=" + str(filenames)) list_files = filenames if len(tmp_rule)>0: list_files = fnmatch.filter(filenames, tmp_rule) - debug.verbose(" filenames=" + str(filenames)) + #debug.verbose(" filenames=" + str(filenames)) # Import the module : for cycle_file in list_files: #for cycle_file in filenames: @@ -316,7 +316,7 @@ class Module: # TODO : maybe an error when changing subdirectory ... #if root[len(source)-1:] != "": # new_destination = os.path.join(new_destination, root[len(source)-1:]) - debug.verbose("Might copy : '" + os.path.join(root, cycle_file) + "' ==> '" + os.path.join(target.get_build_path_data(self._name), new_destination, cycle_file) + "'" ) + #debug.verbose("Might copy : '" + os.path.join(root, cycle_file) + "' ==> '" + os.path.join(target.get_build_path_data(self._name), new_destination, cycle_file) + "'" ) file_cmd = "" # TODO : ... tools.copy_file(os.path.join(root, cycle_file), os.path.join(target.get_build_path_data(self._name), new_destination, cycle_file), @@ -343,28 +343,28 @@ class Module: # squash header and src... full_list_file = [] for elem in self._header: - debug.extreme_verbose("plop H : " +str(elem['src'])) + #debug.extreme_verbose("plop H : " +str(elem['src'])) full_list_file.append([self._name, elem['src']]) for elem in self._src: - debug.extreme_verbose("plop S : " +str(elem)) + #debug.extreme_verbose("plop S : " +str(elem)) full_list_file.append([self._name, elem]) for mod_name in self._tools: tool_module = load_module(target, mod_name) if tool_module == None: continue for elem in tool_module.header: - debug.extreme_verbose("plop HH: " + ":" + str(elem['src'])) + #debug.extreme_verbose("plop HH: " + ":" + str(elem['src'])) full_list_file.append([tool_module.name, elem['src']]) for elem in tool_module.src: - debug.extreme_verbose("plop SS: " + tool_module.name + ":" + str(elem)) + #debug.extreme_verbose("plop SS: " + tool_module.name + ":" + str(elem)) full_list_file.append([tool_module.name, elem]) - debug.extreme_verbose("plop F : " +str(self._extention_order_build)) + #debug.extreme_verbose("plop F : " +str(self._extention_order_build)) # remove uncompilable elements: # TODO: list_file = tools.filter_extention(full_list_file, self.extention_order_build, True) list_file = full_list_file; global_list_file = "" for file in list_file: - debug.verbose(" gcov : " + self._name + " <== " + str(file)); + #debug.verbose(" gcov : " + self._name + " <== " + str(file)); file_dst = target.get_full_name_destination(file[0], self._origin_path, file[1], "o") global_list_file += file_dst + " " cmd = "gcov" @@ -375,22 +375,22 @@ class Module: if generate_output == False: cmd += "--no-output " cmd += global_list_file - debug.extreme_verbose(" " + cmd); + #debug.extreme_verbose(" " + cmd); ret = multiprocess.run_command_direct(cmd) # parsing ret : - debug.extreme_verbose("result: " + str(ret)); + #debug.extreme_verbose("result: " + str(ret)); ret = ret.split('\n'); - debug.verbose("*** Gcov result parsing ..."); + #debug.verbose("*** Gcov result parsing ..."); useful_list = [] remove_next = False last_file = "" executed_lines = 0 executable_lines = 0 for elem in ret: - debug.debug("line: " + elem) + #debug.debug("line: " + elem) if remove_next == True: remove_next = False - debug.debug("--------------------------") + #debug.debug("--------------------------") continue; if elem[:10] == "Creating '" \ or elem[:10] == "Removing '" \ @@ -409,12 +409,12 @@ class Module: last_file = last_file[:-1] if path_finder == False: remove_next = True - debug.verbose(" REMOVE: '" + str(elem[6:len(self._origin_path)+1]) + "' not in " + str(gcov_path_file)) + #debug.verbose(" REMOVE: '" + str(elem[6:len(self._origin_path)+1]) + "' not in " + str(gcov_path_file)) continue continue if elem[:7] == "Aucune " \ or elem[:19] == "No executable lines": - debug.verbose(" Nothing to execute"); + #debug.verbose(" Nothing to execute"); continue start_with = ["Lines executed:", "Lignes exécutées:"] find = False @@ -423,7 +423,7 @@ class Module: find = True elem = elem[len(line_base):] break; - debug.verbose(" temp Value: " + str(elem)) + #debug.verbose(" temp Value: " + str(elem)) if find == False: debug.warning(" gcov ret : " + str(elem)); debug.warning(" ==> does not start with : " + str(start_with)); @@ -436,31 +436,31 @@ class Module: debug.warning(" gcov ret : " + str(elem)); debug.warning(" Parsing error of '% of '"); continue - debug.verbose("property : " + str(out)) + #debug.verbose("property : " + str(out)) pourcent = float(out[0]) total_line_count = int(out[1]) total_executed_line = int(float(total_line_count)*pourcent/100.0) # check if in source or header: in_source_file = False - debug.verbose(" ??> Check: " + str(last_file)) + #debug.verbose(" ??> Check: " + str(last_file)) for elem_header in self._header: - debug.verbose(" ==> Check: " + str(elem_header['src'])) + #debug.verbose(" ==> Check: " + str(elem_header['src'])) if elem_header['src'] == last_file: in_source_file = True for elem_src in self._src: - debug.verbose(" ==> Check: " + str(elem_src)) + #debug.verbose(" ==> Check: " + str(elem_src)) if elem_src == last_file: in_source_file = True if in_source_file == False: - debug.verbose(" ==> Remove not in source: " + str(out)) + #debug.verbose(" ==> Remove not in source: " + str(out)) continue useful_list.append([last_file, pourcent, total_executed_line, total_line_count]) executed_lines += total_executed_line executable_lines += total_line_count last_file = "" - debug.debug("--------------------------") + #debug.debug("--------------------------") ret = useful_list[:-1] - debug.verbose("plopppp " + str(useful_list)) + #debug.verbose("plopppp " + str(useful_list)) #for elem in ret: # debug.info(" " + str(elem)); for elem in ret: @@ -470,14 +470,14 @@ class Module: debug.info(" % " + str(elem[1]) + "\r\t\t" + str(elem[0])); else: debug.info(" % " + str(elem[1]) + "\r\t\t" + str(elem[0])); - debug.verbose(" " + str(elem[2]) + " / " + str(elem[3])); + #debug.verbose(" " + str(elem[2]) + " / " + str(elem[3])); try: pourcent = 100.0*float(executed_lines)/float(executable_lines) except ZeroDivisionError: pourcent = 0.0 # generate json file: json_file_name = target.get_build_path(self._name) + "/" + self._name + "_coverage.json" - debug.debug("generate json file : " + json_file_name) + #debug.debug("generate json file : " + json_file_name) tmp_file = open(json_file_name, 'w') tmp_file.write('{\n') tmp_file.write(' "lib-name":"' + self._name + '",\n') @@ -522,7 +522,7 @@ class Module: # create the package heritage self._local_heritage = heritage.heritage(self, target) if len(self._actions) != 0: - debug.verbose("execute actions: " + str(len(self._actions))) + #debug.verbose("execute actions: " + str(len(self._actions))) for action in self._actions: action["action"](target, self, action["data"]); if package_name == None \ @@ -540,7 +540,7 @@ class Module: self._sub_heritage_list = heritage.HeritageList() # optionnal dependency : for dep, option, export, src_file, header_file, option_not_found in self._depends_optionnal: - debug.verbose("try find optionnal dependency: '" + str(dep) + "'") + #debug.verbose("try find optionnal dependency: '" + str(dep) + "'") inherit_list, isBuilt = target.build(dep, True, package_name=package_name) if isBuilt == True: self._local_heritage.add_depends(dep); @@ -552,7 +552,7 @@ class Module: # add at the heritage list : self._sub_heritage_list.add_heritage_list(inherit_list) for dep in self._depends: - debug.debug("module: '" + str(self._name) + "' request: '" + dep + "'") + #debug.debug("module: '" + str(self._name) + "' request: '" + dep + "'") inherit_list = target.build(dep, False, package_name=package_name) # add at the heritage list : self._sub_heritage_list.add_heritage_list(inherit_list) @@ -570,7 +570,7 @@ class Module: for lvl in range(0,100): for level, action_name, action in target.action_on_state[local_type]: if level == lvl: - debug.debug("level=" + str(level) + " Do Action : " + action_name) + #debug.debug("level=" + str(level) + " Do Action : " + action_name) elem = action(target, self, package_name); # ---------------------------------------------------- # -- Generic library help -- @@ -604,7 +604,7 @@ class Module: include_path = target.get_build_path_include(self._name) have_only_generate_file = False if len(self._generate_file) > 0: - debug.debug("install GENERATED headers / src ...") + #debug.debug("install GENERATED headers / src ...") for elem_generate in self._generate_file: ret_write = tools.file_write_data(os.path.join(generate_path, elem_generate["filename"]), elem_generate["data"], only_if_new=True) @@ -628,7 +628,7 @@ class Module: # --------------------------------------------------------------------------- # -- install header (do it first for extern lib and gcov better interface) -- # --------------------------------------------------------------------------- - debug.debug("install headers ...") + #debug.debug("install headers ...") for file in self._header: src_path = os.path.join(self._origin_path, file["src"]) if "multi-dst" in file: @@ -896,14 +896,15 @@ class Module: debug.error(" UN-SUPPORTED link format: 'binary'") """ elif self._type == "DATA": - debug.debug("Data package have noting to build... just install") + #debug.debug("Data package have noting to build... just install") + pass else: debug.error("Did not known the element type ... (impossible case) type=" + self._type) # ---------------------------------------------------- # -- install data -- # ---------------------------------------------------- - debug.debug("install datas") + #debug.debug("install datas") copy_list={} self.image_to_build(target, copy_list) self.files_to_build(target, copy_list) @@ -922,8 +923,8 @@ class Module: # ---------------------------------------------------- if self._type[:6] == 'BINARY' \ or self._type == 'PACKAGE': - debug.verbose("Request creating of package : " + str(self._name)) - debug.extreme_verbose("Heritage : " + str(self._local_heritage)) + #debug.verbose("Request creating of package : " + str(self._name)) + #debug.extreme_verbose("Heritage : " + str(self._local_heritage)) # TODO : Do package for library ... if target.end_generate_package == True: # generate the package with his properties ... @@ -931,7 +932,7 @@ class Module: self._sub_heritage_list.add_heritage(self._local_heritage) elif self._type == 'PACKAGE': self._sub_heritage_list.add_heritage(self._local_heritage) - debug.extreme_verbose("HeritageList : " + str(self._sub_heritage_list)) + #debug.extreme_verbose("HeritageList : " + str(self._sub_heritage_list)) target.make_package(self._name, self._package_prop, os.path.join(self._origin_path, ".."), self._sub_heritage_list) # return local dependency ... return copy.deepcopy(self._sub_heritage_list) @@ -1046,7 +1047,7 @@ class Module: add_list = tools.get_current_path(self._origin_file) else: add_list = os.path.join(tools.get_current_path(self._origin_file), list) - debug.verbose("Convert path : " + str(list) + " in " + str(add_list)) + #debug.verbose("Convert path : " + str(list) + " in " + str(add_list)) self._add_path(add_list, type, export) ## @@ -1101,7 +1102,8 @@ class Module: } self._flags["export"]["c++-version"] = api_version if gnu == True and same_as_api == True: - debug.debug("[" + self._name + "] Can not propagate the gnu extention of the CPP vesion for API"); + #debug.debug("[" + self._name + "] Can not propagate the gnu extention of the CPP vesion for API"); + pass elif compilator_type == "c" \ or compilator_type == "C": c_version_list = [1989, 1990, 1999, 2011] @@ -1116,7 +1118,8 @@ class Module: } self._flags["export"]["c-version"] = api_version if gnu == True and same_as_api == True: - debug.debug("[" + self._name + "] Can not propagate the gnu extention of the C vesion for API"); + #debug.debug("[" + self._name + "] Can not propagate the gnu extention of the C vesion for API"); + pass else: debug.warning("[" + self._name + "] Can not set version of compilator:" + str(compilator_type)); @@ -1147,7 +1150,7 @@ class Module: if list_of_file == None: debug.warning("[" + self.get_name() + "] ==> Can not find any file : " + os.path.join(self._origin_path, base_path) + " " + regex) return - debug.debug("[" + self.get_name() + "] add " + str(len(list_of_file)) + " file(s)") + #debug.debug("[" + self.get_name() + "] add " + str(len(list_of_file)) + " file(s)") self.add_src_file(list_of_file) ## @@ -1200,7 +1203,8 @@ class Module: ## def add_header_file(self, list, destination_path=None, clip_path=None, recursive=False): if destination_path != None: - debug.verbose("Change destination PATH: '" + str(destination_path) + "'") + #debug.verbose("Change destination PATH: '" + str(destination_path) + "'") + pass new_list = [] if tools.get_type_string(list) == "string": list = [list] @@ -1307,7 +1311,7 @@ class Module: ## @return None ## def add_action(self, action, data=None, name=None): - debug.verbose("add action : " + str(name)) + #debug.verbose("add action : " + str(name)) self._actions.append({ "name":name, "action":action, @@ -1458,7 +1462,7 @@ class Module: tmp_file.write(' ' + copy.deepcopy(self._name).replace('-','_')+ ';\n'); else: for elem in self._depends: - debug.verbose("add depend on: " + elem); + #debug.verbose("add depend on: " + elem); tmp_module = None try: tmp_module = target.get_module(elem) @@ -1467,17 +1471,18 @@ class Module: try: tmp_module = target.get_module(elem) except: - debug.verbose(" ==> get error"); + #debug.verbose(" ==> get error"); + pass if tmp_module == None: - debug.verbose(" ==> notFound"); + #debug.verbose(" ==> notFound"); continue if self.check_rules(tmp_module._type, rules) == True: - debug.verbose(" ==> not in rules"); + #debug.verbose(" ==> not in rules"); continue tmp_file.write(' ' + copy.deepcopy(self._name).replace('-','_') + ' -> ' + copy.deepcopy(elem).replace('-','_') + ';\n'); for elem in self._depends_optionnal: elem = elem[0] - debug.verbose("add depend on: " + elem); + #debug.verbose("add depend on: " + elem); tmp_module = None try: tmp_module = target.get_module(elem) @@ -1486,12 +1491,13 @@ class Module: try: tmp_module = target.get_module(elem) except: - debug.verbose(" ==> get error"); + #debug.verbose(" ==> get error"); + pass if tmp_module == None: - debug.verbose(" ==> notFound"); + #debug.verbose(" ==> notFound"); continue if self.check_rules(tmp_module._type, rules) == True: - debug.verbose(" ==> not in rules"); + #debug.verbose(" ==> not in rules"); continue tmp_file.write(' ' + copy.deepcopy(self._name).replace('-','_') + ' -> ' + copy.deepcopy(elem).replace('-','_') + ';\n'); """ @@ -1659,7 +1665,7 @@ __start_module_name="_" def import_path(path_list): global __module_list global_base = env.get_build_system_base_name() - debug.debug("MODULE: Init with Files list:") + #debug.debug("MODULE: Init with Files list:") for elem in path_list: sys.path.append(os.path.dirname(elem)) # Get file name: @@ -1670,15 +1676,16 @@ def import_path(path_list): filename = filename[len(global_base):] # Check if it start with the local patern: if filename[:len(__start_module_name)] != __start_module_name: - debug.extreme_verbose("MODULE: NOT-Integrate: '" + filename + "' from '" + elem + "' ==> rejected") + #debug.extreme_verbose("MODULE: NOT-Integrate: '" + filename + "' from '" + elem + "' ==> rejected") continue # Remove local patern module_name = filename[len(__start_module_name):] - debug.verbose("MODULE: Integrate: '" + module_name + "' from '" + elem + "'") + #debug.verbose("MODULE: Integrate: '" + module_name + "' from '" + elem + "'") __module_list.append([module_name, elem]) - debug.verbose("New list module: ") + #debug.verbose("New list module: ") for elem in __module_list: - debug.verbose(" " + str(elem[0])) + #debug.verbose(" " + str(elem[0])) + pass ## ## @brief Check if a module exist @@ -1704,7 +1711,7 @@ def load_module(target, name): for mod in __module_list: if mod[0] == name: sys.path.append(os.path.dirname(mod[1])) - debug.verbose("import module : '" + env.get_build_system_base_name() + __start_module_name + name + "'") + #debug.verbose("import module : '" + env.get_build_system_base_name() + __start_module_name + name + "'") the_module_file = mod[1] the_module = __import__(env.get_build_system_base_name() + __start_module_name + name) # get basic module properties: @@ -1753,7 +1760,8 @@ def load_module(target, name): """ # check if create has been done corectly if tmp_element == None: - debug.debug("Request load module '" + name + "' not define for this platform") + #debug.debug("Request load module '" + name + "' not define for this platform") + pass else: target.add_module(tmp_element) return tmp_element diff --git a/lutin/multiprocess.py b/lutin/multiprocess.py index 79b3af5..944a1c3 100644 --- a/lutin/multiprocess.py +++ b/lutin/multiprocess.py @@ -67,7 +67,7 @@ def run_command_no_lock_out(cmd_line): def run_command_direct(cmd_line): # prepare command line: args = shlex.split(cmd_line) - debug.verbose("cmd = " + str(args)) + #debug.verbose("cmd = " + str(args)) try: # create the subprocess p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -96,7 +96,7 @@ def run_command(cmd_line, store_cmd_line="", build_id=-1, file="", store_output_ global error_execution # prepare command line: args = shlex.split(cmd_line) - debug.verbose("cmd = " + str(args)) + #debug.verbose("cmd = " + str(args)) try: # create the subprocess p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) @@ -113,7 +113,7 @@ def run_command(cmd_line, store_cmd_line="", build_id=-1, file="", store_output_ tools.store_warning(store_output_file, output, err) # Check error : if p.returncode == 0: - debug.debug(env.print_pretty(cmd_line)) + #debug.debug(env.print_pretty(cmd_line)) queue_lock.acquire() if depend_data != None: depend.create_dependency_file(depend_data['file'], depend_data['data']) @@ -130,7 +130,7 @@ def run_command(cmd_line, store_cmd_line="", build_id=-1, file="", store_output_ exit_flag = True # if No ID : Not in a multiprocess mode ==> just stop here if build_id < 0: - debug.debug(env.print_pretty(cmd_line), force=True) + #debug.debug(env.print_pretty(cmd_line), force=True) debug.print_compilator(output) debug.print_compilator(err) if p.returncode == 2: @@ -153,7 +153,7 @@ def run_command(cmd_line, store_cmd_line="", build_id=-1, file="", store_output_ queue_lock.release() # not write the command file... return - debug.verbose("done 3") + #debug.verbose("done 3") # write cmd line only after to prevent errors ... tools.store_command(cmd_line, store_cmd_line) @@ -167,7 +167,7 @@ class myThread(threading.Thread): self.queue = queue self.lock = lock def run(self): - debug.verbose("Starting " + self.name) + #debug.verbose("Starting " + self.name) global exit_flag global current_thread_working working_set = False @@ -179,7 +179,7 @@ class myThread(threading.Thread): working_set = True data = self.queue.get() self.lock.release() - debug.verbose(self.name + " processing '" + data[0] + "'") + #debug.verbose(self.name + " processing '" + data[0] + "'") if data[0]=="cmd_line": comment = data[2] cmd_line = data[1] @@ -204,7 +204,7 @@ class myThread(threading.Thread): self.lock.release() time.sleep(0.2) # kill requested ... - debug.verbose("Exiting " + self.name) + #debug.verbose("Exiting " + self.name) def set_error_occured(): @@ -214,7 +214,7 @@ def set_error_occured(): def set_core_number(number_of_core): global processor_availlable processor_availlable = number_of_core - debug.debug(" set number of core for multi process compilation : " + str(processor_availlable)) + #debug.debug(" set number of core for multi process compilation : " + str(processor_availlable)) # nothing else to do def init(): @@ -244,9 +244,9 @@ def un_init(): if processor_availlable > 1: # Wait for all threads to complete for tmp in threads: - debug.verbose("join thread ...") + #debug.verbose("join thread ...") tmp.join() - debug.verbose("Exiting ALL Threads") + #debug.verbose("Exiting ALL Threads") @@ -260,7 +260,7 @@ def run_in_pool(cmd_line, comment, store_cmd_line="", store_output_file="", depe init() # Fill the queue queue_lock.acquire() - debug.verbose("add : in pool cmd_line") + #debug.verbose("add : in pool cmd_line") work_queue.put(["cmd_line", cmd_line, comment, store_cmd_line, current_id_execution, store_output_file, depend_data]) current_id_execution +=1; queue_lock.release() @@ -273,7 +273,7 @@ def pool_synchrosize(): #in this case : nothing to synchronise return - debug.verbose("wait queue process ended\n") + #debug.verbose("wait queue process ended\n") # Wait for queue to empty while not work_queue.empty() \ and error_occured == False: @@ -285,15 +285,16 @@ def pool_synchrosize(): time.sleep(0.2) pass if error_occured == False: - debug.verbose("queue is empty") + #debug.verbose("queue is empty") + pass else: un_init() - debug.debug("Thread return with error ... ==> stop all the pool") + #debug.debug("Thread return with error ... ==> stop all the pool") if error_execution["id"] == -1: debug.error("Pool error occured ... (No return information on Pool)") return debug.error("Error in an pool element : [" + str(error_execution["id"]) + "]", crash=False) - debug.debug(env.print_pretty(error_execution["cmd"]), force=True) + #debug.debug(env.print_pretty(error_execution["cmd"]), force=True) debug.print_compilator(str(error_execution["out"][0])) debug.print_compilator(str(error_execution["err"][0])) if error_execution["return"] == 2: diff --git a/lutin/system.py b/lutin/system.py index b5e8d91..fae19fb 100644 --- a/lutin/system.py +++ b/lutin/system.py @@ -152,7 +152,7 @@ class System: def configure_module(self, target, module): # add element flags to export for elem in self._export_flags: - debug.verbose("add element :" + str(elem) + " elems=" + str(self._export_flags[elem])) + #debug.verbose("add element :" + str(elem) + " elems=" + str(self._export_flags[elem])) module.add_flag(elem, self._export_flags[elem], export=True) # add module dependency if self._export_depends != []: @@ -204,7 +204,7 @@ __start_system_name="System_" def import_path(path_list): global __system_list global_base = env.get_build_system_base_name() - debug.debug("SYSTEM: Init with Files list:") + #debug.debug("SYSTEM: Init with Files list:") for elem in path_list: sys.path.append(os.path.dirname(elem)) # Get file name: @@ -215,12 +215,12 @@ def import_path(path_list): filename = filename[len(global_base):] # Check if it start with the local patern: if filename[:len(__start_system_name)] != __start_system_name: - debug.extreme_verbose("SYSTEM: NOT-Integrate: '" + filename + "' from '" + elem + "' ==> rejected") + #debug.extreme_verbose("SYSTEM: NOT-Integrate: '" + filename + "' from '" + elem + "' ==> rejected") continue # Remove local patern system_name = filename[len(__start_system_name):] system_type, system_name = system_name.split('_') - debug.verbose("SYSTEM: Integrate: '" + system_type + "':'" + system_name + "' from '" + elem + "'") + #debug.verbose("SYSTEM: Integrate: '" + system_type + "':'" + system_name + "' from '" + elem + "'") if system_type in __system_list: __system_list[system_type].append({"name":system_name, "path":elem, @@ -235,11 +235,12 @@ def import_path(path_list): "loaded":False, "exist":False, "module":None}] - debug.verbose("New list system: ") + #debug.verbose("New list system: ") for elem in __system_list: - debug.verbose(" " + str(elem)) + #debug.verbose(" " + str(elem)) for val in __system_list[elem]: - debug.verbose(" " + str(val["name"])) + #debug.verbose(" " + str(val["name"])) + pass ## ## @brief Display all the system binary that can be used @@ -260,7 +261,7 @@ def display(): ## def exist(lib_name, list_target_name, target) : global __system_list - debug.verbose("exist= " + lib_name + " in " + str(list_target_name)) + #debug.verbose("exist= " + lib_name + " in " + str(list_target_name)) find_target = False for target_name in list_target_name: if target_name in __system_list: @@ -274,12 +275,12 @@ def exist(lib_name, list_target_name, target) : if data["name"] == lib_name: # we find it in the List ==> need to check if it is present in the system : if data["loaded"] == False: - debug.verbose("add to path: '" + os.path.dirname(data["path"]) + "'") + #debug.verbose("add to path: '" + os.path.dirname(data["path"]) + "'") sys.path.append(os.path.dirname(data["path"])) - debug.verbose("import system : '" + data["name"] + "'") + #debug.verbose("import system : '" + data["name"] + "'") the_system = __import__(env.get_build_system_base_name() + __start_system_name + target_name + "_" + data["name"]) #create the system module - debug.verbose("SYSTEM: request: " + str(data["name"])) + #debug.verbose("SYSTEM: request: " + str(data["name"])) if "System" in dir(the_system): data["system"] = the_system.System(target) data["exist"] = data["system"].get_valid() diff --git a/lutin/target.py b/lutin/target.py index 023a0fe..f680fff 100644 --- a/lutin/target.py +++ b/lutin/target.py @@ -44,7 +44,7 @@ class Target: if self.config["arch"] == "auto": debug.error("system error ==> must generate the default 'bus-size' config") - debug.debug("config=" + str(config)) + #debug.debug("config=" + str(config)) if arch != "": self.arch = "-arch " + arch else: @@ -282,7 +282,7 @@ class Target: offset = 1000**(len(list)-1) for elem in list: out += offset*int(elem) - debug.verbose("get : " + str(int(elem)) + " tmp" + str(out)) + #debug.verbose("get : " + str(int(elem)) + " tmp" + str(out)) offset /= 1000 return out @@ -294,7 +294,7 @@ class Target: ## def set_cross_base(self, cross=""): self.cross = cross - debug.debug("== Target='" + self.cross + "'"); + #debug.debug("== Target='" + self.cross + "'"); self.java = "javac" self.javah = "javah" self.jar = "jar" @@ -319,7 +319,7 @@ class Target: if ret == False: debug.error("Can not get the g++/clang++ version ...") self.xx_version = self.create_number_from_version_string(ret) - debug.debug(self.config["compilator"] + "++ version=" + str(ret) + " number=" + str(self.xx_version)) + #debug.debug(self.config["compilator"] + "++ version=" + str(ret) + " number=" + str(self.xx_version)) self.ld = self.cross + "ld" self.nm = self.cross + "nm" @@ -553,7 +553,7 @@ class Target: ## @return None ## def add_module(self, new_module): - debug.debug("Add nodule for Taget : " + new_module.get_name()) + #debug.debug("Add nodule for Taget : " + new_module.get_name()) self.module_list.append(new_module) ## @@ -710,7 +710,7 @@ class Target: module_name = name action_list = actions for action_name in action_list: - debug.verbose("requested : " + module_name + "?" + action_name + " [START]") + #debug.verbose("requested : " + module_name + "?" + action_name + " [START]") ret = None; if action_name == "install": try: @@ -761,7 +761,7 @@ class Target: ret = [heritage.HeritageList(), False] else: for mod in self.module_list: - debug.verbose("compare " + mod.get_name() + " == " + module_name) + #debug.verbose("compare " + mod.get_name() + " == " + module_name) if mod.get_name() == module_name: if action_name[:4] == "dump": debug.info("dump module '" + module_name + "'") @@ -776,7 +776,7 @@ class Target: ret = mod.clean(self) break elif action_name[:4] == "gcov": - debug.debug("gcov on module '" + module_name + "'") + #debug.debug("gcov on module '" + module_name + "'") if len(action_name) > 4: # we have option: option_list = action_name.split(":") @@ -795,7 +795,7 @@ class Target: elif action_name[:5] == "build": if len(action_name) > 5: debug.warning("action 'build' does not support options ... : '" + action_name + "'") - debug.debug("build module '" + module_name + "'") + #debug.debug("build module '" + module_name + "'") if optionnal == True: ret = [mod.build(self, package_name), True] else: @@ -807,7 +807,7 @@ class Target: break if ret == None: debug.error("not know module name : '" + module_name + "' to '" + action_name + "' it") - debug.verbose("requested : " + module_name + "?" + action_name + " [STOP]") + #debug.verbose("requested : " + module_name + "?" + action_name + " [STOP]") if len(action_list) == 1: return ret @@ -829,7 +829,7 @@ class Target: ## @return None ## def add_action(self, name_of_state="PACKAGE", level=5, name="no-name", action=None): - debug.verbose("add action : " + name) + #debug.verbose("add action : " + name) if name_of_state not in self.action_on_state: self.action_on_state[name_of_state] = [[level, name, action]] else: @@ -844,7 +844,7 @@ class Target: ## @param[in] static The package is build in static mode ## def make_package(self, pkg_name, pkg_properties, base_pkg_path, heritage_list): - debug.debug("make_package [START]") + #debug.debug("make_package [START]") #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) @@ -865,7 +865,7 @@ class Target: self.make_package_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = False) elif module.get_type() == 'PACKAGE': self.make_package_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = False) - debug.debug("make_package [STOP]") + #debug.debug("make_package [STOP]") return ## @@ -878,7 +878,7 @@ class Target: ## @return False Nothing has been copied ## def make_package_binary_data(self, path_package, pkg_name, base_pkg_path, heritage_list, static): - debug.debug("make_package_binary_data [START]") + #debug.debug("make_package_binary_data [START]") 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) @@ -887,14 +887,14 @@ class Target: tools.create_directory_of_file(path_package_data) # prepare list of copy files copy_list={} - debug.debug("heritage for " + str(pkg_name) + ":") + #debug.debug("heritage for " + str(pkg_name) + ":") for heritage in heritage_list.list_heritage: - debug.debug("sub elements: " + str(heritage.name)) + #debug.debug("sub elements: " + str(heritage.name)) path_src = self.get_build_path_data(heritage.name) - debug.verbose(" has directory: " + path_src) + #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) + #debug.debug(" need copy: " + path_src + " to " + path_package_data) #copy all data: tools.copy_anything(path_src, path_package_data, @@ -902,7 +902,7 @@ class Target: force_identical=True, in_list=copy_list) else: - debug.debug(" need copy: " + os.path.dirname(path_src) + " to " + path_package_data) + #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, @@ -913,7 +913,7 @@ class Target: ret_copy = tools.copy_list(copy_list) # remove unneded files (NOT folder ...) ret_remove = tools.clean_directory(target_shared_path, copy_list) - debug.debug("make_package_binary_data [STOP]") + #debug.debug("make_package_binary_data [STOP]") return ret_copy or ret_remove ## @@ -926,7 +926,7 @@ class Target: ## @return False Nothing has been copied ## def make_package_binary_bin(self, path_package, pkg_name, base_pkg_path, heritage_list, static): - debug.debug("make_package_binary_bin [START]") + #debug.debug("make_package_binary_bin [START]") copy_list={} # creata basic output path path_package_bin = os.path.join(path_package, self.pkg_path_bin) @@ -936,51 +936,51 @@ class Target: if os.path.exists(path_src) == True: try: path_dst = os.path.join(path_package_bin, pkg_name + self.suffix_binary) - debug.verbose("path_dst: " + str(path_dst)) + #debug.verbose("path_dst: " + str(path_dst)) tools.copy_file(path_src, path_dst, in_list=copy_list) except: - debug.extreme_verbose("can not find : " + path_src) + #debug.extreme_verbose("can not find : " + path_src) pass path_src = self.get_build_file_bin(pkg_name, static) path_src = path_src[:len(path_src)-4] + "js" if os.path.exists(path_src) == True: try: path_dst = os.path.join(path_package_bin, pkg_name + self.suffix_binary2) - debug.verbose("path_dst: " + str(path_dst)) + #debug.verbose("path_dst: " + str(path_dst)) tools.copy_file(path_src, path_dst, in_list=copy_list) except: - debug.extreme_verbose("can not find : " + path_src) + #debug.extreme_verbose("can not find : " + path_src) pass # heritage binary - debug.debug("heritage for " + str(pkg_name) + ":") + #debug.debug("heritage for " + str(pkg_name) + ":") for heritage in heritage_list.list_heritage: - debug.debug("sub elements: " + str(heritage.name)) + #debug.debug("sub elements: " + str(heritage.name)) path_src = self.get_build_file_bin(heritage.name, static) if os.path.exists(path_src) == True: try: path_dst = os.path.join(path_package_bin, heritage.name + self.suffix_binary) - debug.verbose("path_dst: " + str(path_dst)) + #debug.verbose("path_dst: " + str(path_dst)) tools.copy_file(path_src, path_dst, in_list=copy_list) except: - debug.extreme_verbose("can not find : " + path_src) + #debug.extreme_verbose("can not find : " + path_src) pass path_src = self.get_build_file_bin(heritage.name, static) path_src = path_src[:len(path_src)-4] + "js" if os.path.exists(path_src) == True: try: path_dst = os.path.join(path_package_bin, heritage.name + self.suffix_binary2) - debug.verbose("path_dst: " + str(path_dst)) + #debug.verbose("path_dst: " + str(path_dst)) tools.copy_file(path_src, path_dst, in_list=copy_list) except: - debug.extreme_verbose("can not find : " + path_src) + #debug.extreme_verbose("can not find : " + path_src) pass #real copy files ret_copy = tools.copy_list(copy_list) @@ -988,7 +988,7 @@ class Target: if self.pkg_path_bin != "": # remove unneded files (NOT folder ...) ret_remove = tools.clean_directory(path_package_bin, copy_list) - debug.debug("make_package_binary_bin [STOP]") + #debug.debug("make_package_binary_bin [STOP]") return ret_copy or ret_remove ## @@ -1001,19 +1001,19 @@ class Target: ## @return False Nothing has been copied ## def make_package_binary_lib(self, path_package, pkg_name, base_pkg_path, heritage_list, static): - debug.debug("make_package_binary_lib [START]") + #debug.debug("make_package_binary_lib [START]") 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) + ":") + #debug.verbose("libs for " + str(pkg_name) + ":") for heritage in heritage_list.list_heritage: - debug.debug("sub elements: " + str(heritage.name)) + #debug.debug("sub elements: " + str(heritage.name)) file_src = self.get_build_file_dynamic(heritage.name) - debug.verbose(" has directory: " + file_src) + #debug.verbose(" has directory: " + file_src) if os.path.isfile(file_src): - debug.debug(" need copy: " + file_src + " to " + path_package_lib) + #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, @@ -1025,12 +1025,12 @@ class Target: if self.pkg_path_lib != "": # remove unneded files (NOT folder ...) ret_remove = tools.clean_directory(path_package_lib, copy_list) - debug.debug("make_package_binary_lib [STOP]") + #debug.debug("make_package_binary_lib [STOP]") return ret_copy or ret_remove def make_package_generic_files(self, path_package, pkg_properties, pkg_name, base_pkg_path, heritage_list, static): - debug.debug("make_package_generic_files [START]") + #debug.debug("make_package_generic_files [START]") ## Create version file: ret_version = tools.file_write_data(os.path.join(path_package, self.pkg_path_version_file), tools.version_to_string(pkg_properties["VERSION"]), @@ -1061,7 +1061,7 @@ class Target: elif os.path.exists(os.path.join(base_pkg_path, "README.md"))==True: ret_readme = 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") + #debug.debug("no file 'README', 'README.md' or 'os-Linux/README' ==> generate an empty one") ret_readme = tools.file_write_data(readme_file_dest, "No documentation for " + pkg_name + "\n", only_if_new=True) @@ -1087,11 +1087,11 @@ class Target: if os.path.exists(os.path.join(base_pkg_path, "changelog")) == True: ret_changelog = tools.copy_file(os.path.join(base_pkg_path, "changelog"), change_log_file_dest) else: - debug.debug("no file 'changelog' ==> generate an empty one") + #debug.debug("no file 'changelog' ==> generate an empty one") ret_changelog = tools.file_write_data(change_log_file_dest, "No changelog data " + pkg_name + "\n", only_if_new=True) - debug.debug("make_package_generic_files [STOP]") + #debug.debug("make_package_generic_files [STOP]") return ret_version \ or ret_maintainer \ or ret_appl_name \ @@ -1100,27 +1100,27 @@ class Target: or ret_changelog def install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.error("action not implemented ...") def un_install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Un-Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.error("action not implemented ...") def run(self, pkg_name, option_list, binary_name = None): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' + option: " + str(option_list)) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.error("action not implemented ...") def show_log(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Show log logcat '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.error("action not implemented ...") ## @@ -1150,7 +1150,7 @@ __start_target_name="Target_" def import_path(path_list): global __target_list global_base = env.get_build_system_base_name() - debug.debug("TARGET: Init with Files list:") + #debug.debug("TARGET: Init with Files list:") for elem in path_list: sys.path.append(os.path.dirname(elem)) # Get file name: @@ -1161,30 +1161,31 @@ def import_path(path_list): filename = filename[len(global_base):] # Check if it start with the local patern: if filename[:len(__start_target_name)] != __start_target_name: - debug.extreme_verbose("TARGET: NOT-Integrate: '" + filename + "' from '" + elem + "' ==> rejected") + #debug.extreme_verbose("TARGET: NOT-Integrate: '" + filename + "' from '" + elem + "' ==> rejected") continue # Remove local patern target_name = filename[len(__start_target_name):] - debug.verbose("TARGET: Integrate: '" + target_name + "' from '" + elem + "'") + #debug.verbose("TARGET: Integrate: '" + target_name + "' from '" + elem + "'") __target_list.append([target_name, elem]) - debug.verbose("New list TARGET: ") + #debug.verbose("New list TARGET: ") for elem in __target_list: - debug.verbose(" " + str(elem[0])) + #debug.verbose(" " + str(elem[0])) + pass ## ## @brief Load a specific target ## def load_target(name, config): global __target_list - debug.debug("load target: " + name) + #debug.debug("load target: " + name) if len(__target_list) == 0: debug.error("No target to compile !!!") - debug.debug("list target: " + str(__target_list)) + #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]) + "'") + #debug.verbose("add to path: '" + os.path.dirname(mod[1]) + "'") sys.path.append(os.path.dirname(mod[1])) - debug.verbose("import target : '" + env.get_build_system_base_name() + __start_target_name + name + "'") + #debug.verbose("import target : '" + env.get_build_system_base_name() + __start_target_name + name + "'") theTarget = __import__(env.get_build_system_base_name() + __start_target_name + name) #create the target tmpTarget = theTarget.Target(config) diff --git a/lutin/tools.py b/lutin/tools.py index 0acd921..e4dadc9 100644 --- a/lutin/tools.py +++ b/lutin/tools.py @@ -45,7 +45,7 @@ def get_list_sub_path(path): def remove_path_and_sub_path(path): if os.path.isdir(path): - debug.verbose("remove path : '" + path + "'") + #debug.verbose("remove path : '" + path + "'") shutil.rmtree(path) def remove_file(path): @@ -143,12 +143,14 @@ def copy_file(src, dst, cmd_file=None, force=False, force_identical=False, in_li cmd_line = "copy \"" + src + "\" \"" + dst + "\"" if force == 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 ...") + #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)) + #debug.verbose("replace copy file " + os.path.relpath(src) + " ==> " + os.path.relpath(dst)) + pass else: - debug.verbose("append copy file " + os.path.relpath(src) + " ==> " + os.path.relpath(dst)) + #debug.verbose("append copy file " + os.path.relpath(src) + " ==> " + os.path.relpath(dst)) + pass # update element in dictionnary: in_list[dst] = {"src":src, "cmd_file":cmd_file, @@ -163,7 +165,7 @@ def copy_file(src, dst, cmd_file=None, force=False, force_identical=False, in_li 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)) + #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, @@ -180,14 +182,14 @@ def copy_file(src, dst, cmd_file=None, force=False, force_identical=False, in_li ## def get_list_of_file_in_path(path, regex="*", recursive = False, remove_path=""): out = [] - debug.verbose(" List all in : '" + str(path) + "'") + #debug.verbose(" List all in : '" + str(path) + "'") if os.path.isdir(os.path.realpath(path)): tmp_path = os.path.realpath(path) tmp_rule = regex else: debug.error("path does not exist : '" + str(path) + "'") - debug.verbose(" " + str(tmp_path) + ":") + #debug.verbose(" " + str(tmp_path) + ":") for root, dirnames, filenames in os.walk(tmp_path): deltaRoot = root[len(tmp_path):] while len(deltaRoot) > 0 \ @@ -197,8 +199,8 @@ def get_list_of_file_in_path(path, regex="*", recursive = False, remove_path="") if recursive == False \ and deltaRoot != "": return out - debug.verbose(" root='" + str(deltaRoot) + "'") - debug.extreme_verbose(" files=" + str(filenames)) + #debug.verbose(" root='" + str(deltaRoot) + "'") + #debug.extreme_verbose(" files=" + str(filenames)) tmpList = filenames if len(tmp_rule) > 0: tmpList = fnmatch.filter(filenames, tmp_rule) @@ -211,7 +213,7 @@ def get_list_of_file_in_path(path, regex="*", recursive = False, remove_path="") debug.error("Request remove start of a path that is not the same: '" + add_file[:len(remove_path)] + "' demand remove of '" + str(remove_path) + "'") else: add_file = add_file[len(remove_path)+1:] - debug.verbose(" '" + add_file + "'") + #debug.verbose(" '" + add_file + "'") out.append(add_file) return out; @@ -224,8 +226,8 @@ def get_list_of_file_in_path(path, regex="*", recursive = False, remove_path="") ## @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) + "'") + #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 = "" @@ -233,7 +235,7 @@ def copy_anything(src, dst, recursive = False, force_identical=False, in_list=No tmp_path = os.path.dirname(os.path.realpath(src)) tmp_rule = os.path.basename(src) - debug.verbose(" " + str(tmp_path) + ":") + #debug.verbose(" " + str(tmp_path) + ":") for root, dirnames, filenames in os.walk(tmp_path): deltaRoot = root[len(tmp_path):] while len(deltaRoot) > 0 \ @@ -243,16 +245,16 @@ def copy_anything(src, dst, recursive = False, force_identical=False, in_list=No if recursive == False \ and deltaRoot != "": return - debug.verbose(" root='" + str(deltaRoot) + "'") - debug.verbose(" files=" + str(filenames)) + #debug.verbose(" root='" + str(deltaRoot) + "'") + #debug.verbose(" files=" + str(filenames)) tmpList = filenames if len(tmp_rule) > 0: tmpList = fnmatch.filter(filenames, tmp_rule) # Import the module : for cycleFile in tmpList: #for cycleFile in filenames: - debug.verbose(" '" + cycleFile + "'") - debug.extreme_verbose("Might copy : '" + tmp_path + " " + deltaRoot + " " + cycleFile + "' ==> '" + dst + "'") + #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, @@ -328,7 +330,7 @@ def store_command(cmd_line, file): if file == "" \ or file == None: return; - debug.verbose("create cmd file: " + file) + #debug.verbose("create cmd file: " + file) # Create directory: create_directory_of_file(file) # Store the command Line: @@ -343,11 +345,11 @@ def store_warning(file, output, err): or file == None: return; if env.get_warning_mode() == False: - debug.verbose("remove warning file: " + file) + #debug.verbose("remove warning file: " + file) # remove file if exist... remove_file(file); return; - debug.verbose("create warning file: " + file) + #debug.verbose("create warning file: " + file) # Create directory: create_directory_of_file(file) # Store the command Line: @@ -424,7 +426,7 @@ def get_version_from_file_or_direct(path_module, filename_or_version): debug.warning("More thatn one line in the file version ==> bas case use mode: 'XX', XX.YYY', 'XX.Y.ZZZ' or 'XX.Y-dev' : " + path_module + " / " + filename_or_version) return [0,0,0] line = lines[0] - debug.debug("Parse line: '" + line + "'") + #debug.debug("Parse line: '" + line + "'") #check if we have "-dev" dev_mode = "" list_tiret = line.split('-') @@ -439,7 +441,7 @@ def get_version_from_file_or_direct(path_module, filename_or_version): out.append(int(elem)) if dev_mode != "": out.append(dev_mode) - debug.debug(" ==> " + str(out)) + #debug.debug(" ==> " + str(out)) return out ## diff --git a/lutin/z_builder/lutinBuilder_binary.py b/lutin/z_builder/lutinBuilder_binary.py index 2c8dfb7..744ddfd 100644 --- a/lutin/z_builder/lutinBuilder_binary.py +++ b/lutin/z_builder/lutinBuilder_binary.py @@ -64,7 +64,7 @@ def link(file, binary, target, depancy, flags, name, basic_path, static = False) file_cmd = file_dst + target.suffix_cmd_line file_warning = file_dst + target.suffix_warning - debug.extreme_verbose("list files = " + str(depancy.src)) + #debug.extreme_verbose("list files = " + str(depancy.src)) list_static = [] list_dynamic = [] if static == True: @@ -181,7 +181,7 @@ def link(file, binary, target, depancy, flags, name, basic_path, static = False) multiprocess.run_command(cmd_lineStrip, store_output_file=file_warning) # get the stip size of the binary strip_size = tools.file_size(file_dst) - debug.debug("file reduce size : " + str(originSize/1024) + "ko ==> " + str(strip_size/1024) + "ko") + #debug.debug("file reduce size : " + str(originSize/1024) + "ko ==> " + str(strip_size/1024) + "ko") # write cmd line only after to prevent errors ... tools.store_command(cmd_line, file_cmd) diff --git a/lutin/z_builder/lutinBuilder_java.py b/lutin/z_builder/lutinBuilder_java.py index 58b1bc4..8a670bd 100644 --- a/lutin/z_builder/lutinBuilder_java.py +++ b/lutin/z_builder/lutinBuilder_java.py @@ -57,14 +57,14 @@ def create_dependency_files(target, src, heritage_src, basic_path): extention = elem.split('.')[-1] if extention == 'jar' \ or extention == 'java': - debug.extreme_verbose("add java depedence ... " + elem) + #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) + #debug.extreme_verbose("add java depedence ... " + elem) depend.append(elem) return depend diff --git a/lutin/z_builder/lutinBuilder_javah.py b/lutin/z_builder/lutinBuilder_javah.py index 5c70fc3..a4b2ec0 100644 --- a/lutin/z_builder/lutinBuilder_javah.py +++ b/lutin/z_builder/lutinBuilder_javah.py @@ -57,14 +57,14 @@ def create_dependency_files(target, src, heritage_src, basic_path): extention = elem.split('.')[-1] if extention == 'jar' \ or extention == 'java': - debug.extreme_verbose("add java depedence ... " + elem) + #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) + #debug.extreme_verbose("add java depedence ... " + elem) depend.append(elem) return depend @@ -107,7 +107,7 @@ def compile(file, binary, target, depancy, flags, path, name, basic_path, module store_output_file = file_warning, depend_data = {"file":file_depend, "data":depend_files}) - debug.verbose("file= " + file_dst) + #debug.verbose("file= " + file_dst) #return file_dst return {"action":"path", "path":target.get_build_path(name) + target.path_generate_code} diff --git a/lutin/z_builder/lutinBuilder_libraryDynamic.py b/lutin/z_builder/lutinBuilder_libraryDynamic.py index 272470a..6fa4516 100644 --- a/lutin/z_builder/lutinBuilder_libraryDynamic.py +++ b/lutin/z_builder/lutinBuilder_libraryDynamic.py @@ -63,10 +63,10 @@ def link(file, binary, target, depancy, flags, name, basic_path, static=False): file_cmd = file_dst + target.suffix_cmd_line file_warning = file_dst + target.suffix_warning - debug.extreme_verbose("file_dst = " + file_dst) - debug.extreme_verbose("file_depend = " + file_depend) - debug.extreme_verbose("file_cmd = " + file_cmd) - debug.extreme_verbose("file_warning = " + file_warning) + #debug.extreme_verbose("file_dst = " + file_dst) + #debug.extreme_verbose("file_depend = " + file_depend) + #debug.extreme_verbose("file_cmd = " + file_cmd) + #debug.extreme_verbose("file_warning = " + file_warning) list_static = [] list_dynamic = [] @@ -177,7 +177,7 @@ def link(file, binary, target, depancy, flags, name, basic_path, static=False): multiprocess.run_command(cmdLineStrip, 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") + #debug.debug("file reduce size : " + str(originSize/1024) + "ko ==> " + str(stripSize/1024) + "ko") # write cmd line only after to prevent errors ... tools.store_command(cmdLine, file_cmd) #debug.print_element("SharedLib", self.name, "==>", tmpList[1]) diff --git a/lutin/z_builder/lutinBuilder_libraryStatic.py b/lutin/z_builder/lutinBuilder_libraryStatic.py index b264687..96cb26d 100644 --- a/lutin/z_builder/lutinBuilder_libraryStatic.py +++ b/lutin/z_builder/lutinBuilder_libraryStatic.py @@ -63,10 +63,10 @@ def link(file, binary, target, depancy, flags, name, basic_path): file_cmd = file_dst + target.suffix_cmd_line file_warning = file_dst + target.suffix_warning - debug.extreme_verbose("file_dst = " + file_dst) - debug.extreme_verbose("file_depend = " + file_depend) - debug.extreme_verbose("file_cmd = " + file_cmd) - debug.extreme_verbose("file_warning = " + file_warning) + #debug.extreme_verbose("file_dst = " + file_dst) + #debug.extreme_verbose("file_depend = " + file_depend) + #debug.extreme_verbose("file_cmd = " + file_cmd) + #debug.extreme_verbose("file_warning = " + file_warning) cmd = [ target.ar diff --git a/lutin/z_builder/lutinBuilder_m.py b/lutin/z_builder/lutinBuilder_m.py index d2306e5..b53bdb1 100644 --- a/lutin/z_builder/lutinBuilder_m.py +++ b/lutin/z_builder/lutinBuilder_m.py @@ -24,7 +24,7 @@ local_ref_on_builder_c = None ## def init(): global local_ref_on_builder_c - debug.debug("m builder get dependency on the C builder") + #debug.debug("m builder get dependency on the C builder") local_ref_on_builder_c = builder.get_builder("c") ## diff --git a/lutin/z_builder/lutinBuilder_mm.py b/lutin/z_builder/lutinBuilder_mm.py index a1ce26b..d04f24e 100644 --- a/lutin/z_builder/lutinBuilder_mm.py +++ b/lutin/z_builder/lutinBuilder_mm.py @@ -24,7 +24,7 @@ local_ref_on_builder_cpp = None ## def init(): global local_ref_on_builder_cpp - debug.debug("mm builder get dependency on the CPP builder") + #debug.debug("mm builder get dependency on the CPP builder") local_ref_on_builder_cpp = builder.get_builder("cpp") ## diff --git a/lutin/z_target/lutinTarget_Android.py b/lutin/z_target/lutinTarget_Android.py index 8beb216..51a722a 100644 --- a/lutin/z_target/lutinTarget_Android.py +++ b/lutin/z_target/lutinTarget_Android.py @@ -100,11 +100,11 @@ class Target(target.Target): debug.error("Specify PROJECT_NDK_BOARD_ID env variable and the BOARD_ID does not exit ... : " + str(self.board_id) + "==> auto-search") self.board_id = 0 if self.board_id == 0: - debug.debug("Auto-search BOARD-ID") + #debug.debug("Auto-search BOARD-ID") for iii in reversed(range(0, 50)): - debug.debug("try: " + os.path.join(self.path_sdk, "platforms", "android-" + str(iii))) + #debug.debug("try: " + os.path.join(self.path_sdk, "platforms", "android-" + str(iii))) if os.path.isdir(os.path.join(self.path_sdk, "platforms", "android-" + str(iii))): - debug.debug("Find BOARD-ID : " + str(iii)) + #debug.debug("Find BOARD-ID : " + str(iii)) self.board_id = iii break; if self.board_id == 0: @@ -244,9 +244,9 @@ class Target(target.Target): """ def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"])) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") #output path target_outpath = self.get_staging_path(pkg_name) tools.create_directory_of_file(target_outpath) @@ -264,20 +264,20 @@ class Target(target.Target): # 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) + #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) + ":") + #debug.verbose("libs for " + str(pkg_name) + ":") for heritage in heritage_list.list_heritage: - debug.debug("sub elements: " + str(heritage.name)) + #debug.debug("sub elements: " + str(heritage.name)) file_src = self.get_build_file_dynamic(heritage.name) - debug.verbose(" has directory: " + file_src) + #debug.verbose(" has directory: " + file_src) if os.path.isfile(file_src): - debug.debug(" need copy: " + file_src + " to " + target_outpath_lib) + #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, @@ -370,7 +370,7 @@ class Target(target.Target): debug.error("An error occured when getting the tools for android") elif len(dirnames) > 1: dirnames = sorted(dirnames, reverse=True) - debug.debug("sort tools directory: '" + str(dirnames) + "' ==> select : " + str(dirnames[0])) + #debug.debug("sort tools directory: '" + str(dirnames) + "' ==> select : " + str(dirnames[0])) android_tool_path += dirnames[0] + "/" # this is to create resource file for android ... (we did not use aset in jar with ewol ... @@ -412,8 +412,8 @@ class Target(target.Target): + self.get_staging_path(pkg_name) + "/src/R.java " multiprocess.run_command(cmdLine) """ - 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"]))) + #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_list.src['src'], ["jar"]) @@ -512,9 +512,9 @@ class Target(target.Target): force=True) def install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") pkg_name_application_name = pkg_name if self.config["mode"] == "debug": pkg_name_application_name += "debug" @@ -523,9 +523,9 @@ class Target(target.Target): multiprocess.run_command(cmdLine) def un_install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Un-Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") pkg_name_application_name = pkg_name if self.config["mode"] == "debug": pkg_name_application_name += "debug" @@ -533,9 +533,9 @@ class Target(target.Target): Rmultiprocess.run_command(cmdLine) def show_log(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("logcat of android board") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("cmd: " + self.path_sdk + "/platform-tools/adb shell logcat ") cmdLine = self.path_sdk + "/platform-tools/adb shell logcat " multiprocess.run_command_no_lock_out(cmdLine) diff --git a/lutin/z_target/lutinTarget_Debian.py b/lutin/z_target/lutinTarget_Debian.py index 0257f5c..b7f06db 100644 --- a/lutin/z_target/lutinTarget_Debian.py +++ b/lutin/z_target/lutinTarget_Debian.py @@ -56,9 +56,9 @@ class Target(lutinTarget_Linux.Target): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): # http://alp.developpez.com/tutoriels/debian/creer-paquet/ debianpkg_name = re.sub("_", "-", pkg_name) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Generate generic '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"])) - debug.debug("------------------------------------------------------------------------") + #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) @@ -88,7 +88,7 @@ class Target(lutinTarget_Linux.Target): or need_generate_package: """ ## create the package: - debug.debug("package : " + self.get_staging_path(pkg_name) + "/" + pkg_name + ".app.pkg") + #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()) @@ -166,7 +166,7 @@ class Target(lutinTarget_Linux.Target): tmpFile.flush() tmpFile.close() ## create the package : - debug.debug("package : " + self.get_staging_path(pkg_name) + "/" + debianpkg_name + ".deb") + #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) @@ -175,15 +175,15 @@ class Target(lutinTarget_Linux.Target): tools.file_write_data(build_package_path_done, "done...") def install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") os.system("sudo dpkg -i " + self.get_final_path() + "/" + pkg_name + self.suffix_package) def un_install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Un-Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") os.system("sudo dpkg -r " + self.get_final_path() + "/" + pkg_name + self.suffix_package) diff --git a/lutin/z_target/lutinTarget_IOs.py b/lutin/z_target/lutinTarget_IOs.py index 1476362..d0d84b0 100644 --- a/lutin/z_target/lutinTarget_IOs.py +++ b/lutin/z_target/lutinTarget_IOs.py @@ -102,9 +102,9 @@ class Target(target.Target): ]) def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"])) - debug.debug("------------------------------------------------------------------------") + #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) @@ -388,9 +388,9 @@ class Target(target.Target): return out def install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") if self.get_simulation() == False: if tools.file_size("framework/tools/ios-deploy/build/Release/ios-deploy") == 0: debug.print_element("tool", "ios-deploy", "<==", "external sources") @@ -432,9 +432,9 @@ class Target(target.Target): #sudo dpkg -i $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package def un_install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Un-Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") if self.get_simulation() == False: debug.warning("not implemented") else: @@ -445,9 +445,9 @@ class Target(target.Target): #sudo dpkg -r $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package def show_log(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- log of iOs board") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") if self.get_simulation() == False: if tools.file_size("framework/tools/ios-deploy/ios-deploy") == 0: debug.print_element("tool", "ios-deploy", "<==", "external sources") @@ -463,9 +463,9 @@ class Target(target.Target): multiprocess.run_command_no_lock_out(cmdLine) def run(self, pkg_name, option_list, binary_name = None): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' + option: " + str(option_list)) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") if self.get_simulation() == True: debug.error (" can not run in simulation mode ....") return @@ -480,8 +480,8 @@ class Target(target.Target): for elem in option_list: cmd += elem + " " multiprocess.run_command_no_lock_out(cmd) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' Finished") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") diff --git a/lutin/z_target/lutinTarget_Linux.py b/lutin/z_target/lutinTarget_Linux.py index 1c8aec6..0c58d37 100644 --- a/lutin/z_target/lutinTarget_Linux.py +++ b/lutin/z_target/lutinTarget_Linux.py @@ -85,9 +85,9 @@ class Target(target.Target): *--> sources """ def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): - debug.debug("------------------------------------------------------------------------") - debug.debug("-- Generate generic '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"])) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") + #debug.debug("-- 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) @@ -115,7 +115,7 @@ class Target(target.Target): or ret_lib \ or ret_file \ or need_generate_package: - debug.debug("package : " + os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app.pkg")) + #debug.debug("package : " + os.path.join(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()) @@ -124,9 +124,9 @@ class Target(target.Target): tools.file_write_data(build_package_path_done, "done...") def install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") # this is temporary ... Will call: if False: os.system("lutin-pkg -i " + os.path.join(self.get_final_path(), + pkg_name + ".app.gpkg")) @@ -147,9 +147,9 @@ class Target(target.Target): os.symlink(target_bin_path, target_bin_link) def un_install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Un-Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") # this is temporary ... Will call: if False: os.system("lutin-pkg -r " + pkg_name) @@ -165,16 +165,16 @@ class Target(target.Target): def run(self, pkg_name, option_list, binary_name = None): if binary_name == None: binary_name = pkg_name; - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' executable: '" + binary_name + "' + option: " + str(option_list)) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") appl_path = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app", "bin", binary_name) cmd = appl_path + " " for elem in option_list: cmd += elem + " " multiprocess.run_command_no_lock_out(cmd) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' Finished") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") diff --git a/lutin/z_target/lutinTarget_MacOs.py b/lutin/z_target/lutinTarget_MacOs.py index 4f5a7ed..4c05cd9 100644 --- a/lutin/z_target/lutinTarget_MacOs.py +++ b/lutin/z_target/lutinTarget_MacOs.py @@ -65,9 +65,9 @@ class Target(target.Target): """ def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"])) - debug.debug("------------------------------------------------------------------------") + #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) @@ -155,9 +155,9 @@ class Target(target.Target): tools.file_write_data(build_package_path_done, "done...") def install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("copy " + os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app") + " in /Applications/") if os.path.exists("/Applications/" + pkg_name + ".app") == True: shutil.rmtree("/Applications/" + pkg_name + ".app") @@ -165,27 +165,27 @@ class Target(target.Target): shutil.copytree(os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app"), os.path.join("/Applications", pkg_name + ".app")) def un_install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Un-Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") 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") def run(self, pkg_name, option_list, binary_name = None): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") appl_path = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app" , "Contents", "MacOS", pkg_name) appl_path = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app", "Contents", "MacOS", pkg_name) cmd = appl_path + " " for elem in option_list: cmd += elem + " " multiprocess.run_command_no_lock_out(cmd) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' Finished") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") diff --git a/lutin/z_target/lutinTarget_Web.py b/lutin/z_target/lutinTarget_Web.py index 79ffbff..5b75f1e 100644 --- a/lutin/z_target/lutinTarget_Web.py +++ b/lutin/z_target/lutinTarget_Web.py @@ -27,7 +27,7 @@ class Target(lutinTarget_Linux.Target): lutinTarget_Linux.Target.__init__(self, config, ["Web"] + sub_name) self.cross ="./emsdk_portable/emscripten/master/em" - debug.debug("== Target='em'"); + #debug.debug("== Target='em'"); self.java = "javac" self.javah = "javah" self.jar = "jar" @@ -94,9 +94,9 @@ class Target(lutinTarget_Linux.Target): *--> sources """ def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): - debug.debug("------------------------------------------------------------------------") - debug.debug("-- Generate generic '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"])) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") + #debug.debug("-- 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, tmp=True), pkg_name + ".app") tools.create_directory_of_file(target_outpath) @@ -165,7 +165,7 @@ class Target(lutinTarget_Linux.Target): or ret_lib \ or ret_file \ or need_generate_package: - debug.debug("package : " + os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app.pkg")) + #debug.debug("package : " + os.path.join(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()) @@ -175,9 +175,9 @@ class Target(lutinTarget_Linux.Target): """ def install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") # this is temporary ... Will call: if False: os.system("lutin-pkg -i " + os.path.join(self.get_final_path(), + pkg_name + ".app.gpkg")) @@ -198,9 +198,9 @@ class Target(lutinTarget_Linux.Target): os.symlink(target_bin_path, target_bin_link) def un_install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Un-Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") # this is temporary ... Will call: if False: os.system("lutin-pkg -r " + pkg_name) @@ -214,16 +214,16 @@ class Target(lutinTarget_Linux.Target): tools.remove_file(target_bin_link) def run(self, pkg_name, option_list, binary_name = None): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' + option: " + str(option_list)) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") appl_path = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app", pkg_name + ".html") cmd = "firefox " + appl_path + " " for elem in option_list: cmd += elem + " " multiprocess.run_command_no_lock_out(cmd) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' Finished") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") diff --git a/lutin/z_target/lutinTarget_Windows.py b/lutin/z_target/lutinTarget_Windows.py index 146f5c2..1aae395 100644 --- a/lutin/z_target/lutinTarget_Windows.py +++ b/lutin/z_target/lutinTarget_Windows.py @@ -76,9 +76,9 @@ class Target(target.Target): return os.path.join(self.get_staging_path(binary_name, tmp), binary_name + ".app", self.pkg_path_data) def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): - debug.debug("------------------------------------------------------------------------") - debug.debug("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"])) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") + #debug.debug("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, tmp=True), pkg_name + ".app") tools.create_directory_of_file(target_outpath) @@ -130,9 +130,9 @@ class Target(target.Target): tools.file_write_data(build_package_path_done, "done...") def make_package_single_file(self, pkg_name, pkg_properties, base_pkg_path, heritage_list): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Generate package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.print_element("zip", "data.zip", "<==", "data/*") zipPath = self.get_staging_path(pkg_name) + "/data.zip" zip.create_zip(self.get_staging_path_data(pkg_name), zipPath) @@ -180,36 +180,36 @@ class Target(target.Target): # package is done tmpFile.flush() tmpFile.close() - debug.verbose("zip position=" + str(positionOfZip) + " = 0x" + h) + #debug.verbose("zip position=" + str(positionOfZip) + " = 0x" + h) def install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.warning(" ==> TODO") #sudo dpkg -i $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package def un_install_package(self, pkg_name): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("Un-Install package '" + pkg_name + "'") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.warning(" ==> TODO") #sudo dpkg -r $(TARGET_OUT_FINAL)/$(PROJECT_NAME) + self.suffix_package def run(self, pkg_name, option_list, binary_name = None): - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' + option: " + str(option_list)) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") if host.OS == "Windows": debug.error("action not implemented ...") return - debug.debug(" think to configure your wine : 'winecfg' : https://www.winehq.org/docs/wineusr-guide/config-wine-main") + #debug.debug(" think to configure your wine : 'winecfg' : https://www.winehq.org/docs/wineusr-guide/config-wine-main") appl_path = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app", pkg_name + self.suffix_binary) cmd = "wine " + appl_path + " " for elem in option_list: cmd += elem + " " multiprocess.run_command_no_lock_out(cmd) - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") debug.info("-- Run package '" + pkg_name + "' Finished") - debug.debug("------------------------------------------------------------------------") + #debug.debug("------------------------------------------------------------------------") diff --git a/lutin/zip.py b/lutin/zip.py index 7ee50a7..7f7d42b 100644 --- a/lutin/zip.py +++ b/lutin/zip.py @@ -17,9 +17,9 @@ from . import tools def create_zip(path, outputFile): - debug.debug("Create Zip : '" + outputFile + "'") + #debug.debug("Create Zip : '" + outputFile + "'") tools.create_directory_of_file(outputFile) - debug.debug(" from '" + str(path) + "'") + #debug.debug(" from '" + str(path) + "'") if tools.get_type_string(path) == "string": path = [path] zf = zipfile.ZipFile(outputFile, mode='w') @@ -29,19 +29,19 @@ def create_zip(path, outputFile): # List all files : for filename in filenames: file = os.path.join(root, filename) - debug.verbose(" ADD zip = " + str(file) + " ==> " +file[basePathlen:]) + #debug.verbose(" ADD zip = " + str(file) + " ==> " +file[basePathlen:]) zf.write(file, file[basePathlen:]) zf.close() def create_zip_file(files, base_output, outputFile): - debug.debug("Create Zip : '" + outputFile + "'") + #debug.debug("Create Zip : '" + outputFile + "'") tools.create_directory_of_file(outputFile) - debug.debug(" from '" + str(files) + "'") + #debug.debug(" from '" + str(files) + "'") if tools.get_type_string(files) == "string": files = [files] zf = zipfile.ZipFile(outputFile, mode='w') for elem in files: - debug.verbose(" ADD zip = " + str(elem) + " ==> " + base_output + "/" + elem[len(os.path.dirname(elem)):]) + #debug.verbose(" ADD zip = " + str(elem) + " ==> " + base_output + "/" + elem[len(os.path.dirname(elem)):]) zf.write(elem, base_output + "/" + elem[len(os.path.dirname(elem)):]) zf.close()