atria-tools/lutin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse Source
This commit is contained in:
Edouard DUPIN 2015-05-11 08:39:21 +02:00
commit 575f90ebbe
4 changed files with 17 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/lutin
View File

@ -94,7 +94,7 @@ def parseGenericArg(argument, active):
return True return True
elif argument.get_option_nName()=="jobs": elif argument.get_option_nName()=="jobs":
if active==True: if active==True:
lutinMultiprocess.set_core_number(int(argument.get_arg())) multiprocess.set_core_number(int(argument.get_arg()))
return True return True
elif argument.get_option_nName() == "verbose": elif argument.get_option_nName() == "verbose":
if active==True: if active==True:

47
lutin/module.py
View File

@ -115,7 +115,7 @@ class Module:
## @brief add Some copilation flags for this module (and only this one) ## @brief add Some copilation flags for this module (and only this one)
## ##
def add_extra_compile_flags(self): def add_extra_compile_flags(self):
self.compile_flags_CC([ self.compile_flags('c', [
"-Wall", "-Wall",
"-Wsign-compare", "-Wsign-compare",
"-Wreturn-type", "-Wreturn-type",
@ -130,10 +130,10 @@ class Module:
## @brief remove all unneeded warning on compilation ==> for extern libs ... ## @brief remove all unneeded warning on compilation ==> for extern libs ...
## ##
def remove_compile_warning(self): def remove_compile_warning(self):
self.compile_flags_CC([ self.compile_flags('c', [
"-Wno-int-to-pointer-cast" "-Wno-int-to-pointer-cast"
]); ]);
self.compile_flags_XX([ self.compile_flags('c++', [
"-Wno-c++11-narrowing" "-Wno-c++11-narrowing"
]) ])
# only for gcc :"-Wno-unused-but-set-variable" # only for gcc :"-Wno-unused-but-set-variable"
@ -215,9 +215,9 @@ class Module:
# TODO : Add optionnal Flags ... # TODO : Add optionnal Flags ...
# ==> do it really better ... # ==> do it really better ...
if export == False: if export == False:
self.compile_flags_CC("-D"+option); self.compile_flags(option[0], option[1]);
else: else:
self.add_export_flag_CC("-D"+option); self.add_export_flag(option[0], option[1]);
# add at the heritage list : # add at the heritage list :
self.sub_heritage_list.add_heritage_list(inherit_list) self.sub_heritage_list.add_heritage_list(inherit_list)
for dep in self.depends: for dep in self.depends:
@ -377,7 +377,7 @@ class Module:
def add_module_depend(self, list): def add_module_depend(self, list):
self.append_to_internalList(self.depends, list, True) self.append_to_internalList(self.depends, list, True)
def add_optionnal_module_depend(self, module_name, compilation_flags="", export=False): def add_optionnal_module_depend(self, module_name, compilation_flags=["", ""], export=False):
self.append_and_check(self.depends_optionnal, [module_name, compilation_flags, export], True) self.append_and_check(self.depends_optionnal, [module_name, compilation_flags, export], True)
def add_export_path(self, list): def add_export_path(self, list):
@ -386,39 +386,12 @@ class Module:
def add_path(self, list): def add_path(self, list):
self.append_to_internalList(self.path["local"], list) self.append_to_internalList(self.path["local"], list)
def add_export_flag_LD(self, list): def add_export_flag(self, type, list):
self.append_to_internalList2(self.flags["export"], "link", list) self.append_to_internalList2(self.flags["export"], type, list)
def add_export_flag_CC(self, list):
self.append_to_internalList2(self.flags["export"], "c", list)
def add_export_flag_XX(self, list):
self.append_to_internalList2(self.flags["export"], "c++", list)
def add_export_flag_M(self, list):
self.append_to_internalList2(self.flags["export"], "m", list)
def add_export_flag_MM(self, list):
self.append_to_internalList2(self.flags["export"], "mm", list)
# add the link flag at the module # add the link flag at the module
def compile_flags_LD(self, list): def compile_flags(self, type, list):
self.append_to_internalList2(self.flags["local"], "link", list) self.append_to_internalList2(self.flags["local"], type, list)
def compile_flags_CC(self, list):
self.append_to_internalList2(self.flags["local"], "c", list)
def compile_flags_XX(self, list):
self.append_to_internalList2(self.flags["local"], "c++", list)
def compile_flags_M(self, list):
self.append_to_internalList2(self.flags["local"], "m", list)
def compile_flags_MM(self, list):
self.append_to_internalList2(self.flags["local"], "mm", list)
def compile_flags_S(self, list):
self.append_to_internalList2(self.flags["local"], "s", list)
def compile_version_XX(self, version, same_as_api=True, gnu=False): def compile_version_XX(self, version, same_as_api=True, gnu=False):
cpp_version_list = [1999, 2003, 2011, 2014] cpp_version_list = [1999, 2003, 2011, 2014]

10
lutin/system.py
View File

@ -69,11 +69,11 @@ class System:
def createModuleFromSystem(target, dict): def createModuleFromSystem(target, dict):
myModule = module.Module(dict["path"], dict["name"], 'PREBUILD') myModule = module.Module(dict["path"], dict["name"], 'PREBUILD')
myModule.add_export_flag_CC(dict["system"].export_flags_cc) myModule.add_export_flag('c', dict["system"].export_flags_cc)
myModule.add_export_flag_LD(dict["system"].export_flags_ld) myModule.add_export_flag('link', dict["system"].export_flags_ld)
myModule.add_export_flag_XX(dict["system"].export_flags_xx) myModule.add_export_flag('c++', dict["system"].export_flags_xx)
myModule.add_export_flag_M(dict["system"].export_flags_m) myModule.add_export_flag('m', dict["system"].export_flags_m)
myModule.add_export_flag_MM(dict["system"].export_flags_mm) myModule.add_export_flag('mm', dict["system"].export_flags_mm)
# add the currrent module at the # add the currrent module at the
return myModule return myModule

2
setup.py
View File

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