Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
6c416c9fef | |||
fc6493f441 | |||
16c019ac5b | |||
328681d44b | |||
fbf7d2dbad | |||
5f008a153e |
@@ -192,7 +192,7 @@ def parseGenericArg(argument, active):
|
|||||||
if active==True:
|
if active==True:
|
||||||
debug.enable_color()
|
debug.enable_color()
|
||||||
return True
|
return True
|
||||||
elif argument.get_option_name() == "force":
|
elif argument.get_option_name() == "force-build":
|
||||||
if active==True:
|
if active==True:
|
||||||
env.set_force_mode(True)
|
env.set_force_mode(True)
|
||||||
return True
|
return True
|
||||||
@@ -284,7 +284,7 @@ for argument in localArgument:
|
|||||||
my_target = None
|
my_target = None
|
||||||
else:
|
else:
|
||||||
if argument.get_option_name() != "":
|
if argument.get_option_name() != "":
|
||||||
debug.warning("Can not understand argument : '" + argument.get_option_nName() + "'")
|
debug.warning("Can not understand argument : '" + argument.get_option_name() + "'")
|
||||||
usage()
|
usage()
|
||||||
else:
|
else:
|
||||||
#load the target if needed :
|
#load the target if needed :
|
||||||
|
@@ -1051,7 +1051,7 @@ def get_module_option(the_module, name):
|
|||||||
if "get_type" in dir(the_module):
|
if "get_type" in dir(the_module):
|
||||||
type = the_module.get_type()
|
type = the_module.get_type()
|
||||||
else:
|
else:
|
||||||
debug.debug(" fundtion get_type() must be provided in the module: " + name)
|
debug.debug(" function get_type() must be provided in the module: " + name)
|
||||||
|
|
||||||
if "get_sub_type" in dir(the_module):
|
if "get_sub_type" in dir(the_module):
|
||||||
sub_type = the_module.get_sub_type()
|
sub_type = the_module.get_sub_type()
|
||||||
|
@@ -535,7 +535,7 @@ class Target:
|
|||||||
or module.get_type() == 'BINARY_STAND_ALONE':
|
or module.get_type() == 'BINARY_STAND_ALONE':
|
||||||
self.make_package_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = True)
|
self.make_package_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = True)
|
||||||
if module.get_type() == 'BINARY_SHARED':
|
if module.get_type() == 'BINARY_SHARED':
|
||||||
self.make_packages_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = False)
|
self.make_package_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = False)
|
||||||
if module.get_type() == 'PACKAGE':
|
if module.get_type() == 'PACKAGE':
|
||||||
debug.info("Can not create package for package");
|
debug.info("Can not create package for package");
|
||||||
return
|
return
|
||||||
|
@@ -38,7 +38,7 @@ def get_output_type():
|
|||||||
##
|
##
|
||||||
## @brief Commands for running gcc to link a shared library.
|
## @brief Commands for running gcc to link a shared library.
|
||||||
##
|
##
|
||||||
def link(file, binary, target, depancy, name, basic_path):
|
def link(file, binary, target, depancy, flags, name, basic_path):
|
||||||
file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_path, file, "jar")
|
file_src, file_dst, file_depend, file_cmd, file_warning = target.generate_file(binary, name, basic_path, file, "jar")
|
||||||
#create command Line
|
#create command Line
|
||||||
cmd = [
|
cmd = [
|
||||||
|
@@ -127,6 +127,12 @@ def link(file, binary, target, depancy, flags, name, basic_path, static=False):
|
|||||||
# get the file size of the non strip file
|
# get the file size of the non strip file
|
||||||
originSize = tools.file_size(file_dst);
|
originSize = tools.file_size(file_dst);
|
||||||
debug.print_element("SharedLib(strip)", name, "", "")
|
debug.print_element("SharedLib(strip)", name, "", "")
|
||||||
|
if target.name == "MacOs":
|
||||||
|
cmdLineStrip=tools.list_to_str([
|
||||||
|
target.strip,
|
||||||
|
"-u",
|
||||||
|
file_dst])
|
||||||
|
else:
|
||||||
cmdLineStrip=tools.list_to_str([
|
cmdLineStrip=tools.list_to_str([
|
||||||
target.strip,
|
target.strip,
|
||||||
file_dst])
|
file_dst])
|
||||||
|
@@ -340,7 +340,9 @@ class Target(target.Target):
|
|||||||
debug.print_element("pkg(signed)", "pkg", "<==", "Signing application")
|
debug.print_element("pkg(signed)", "pkg", "<==", "Signing application")
|
||||||
iosDevelopperKeyFile = ".iosKey.txt"
|
iosDevelopperKeyFile = ".iosKey.txt"
|
||||||
if tools.file_size(iosDevelopperKeyFile) < 10:
|
if tools.file_size(iosDevelopperKeyFile) < 10:
|
||||||
debug.error("To sign an application we need to have a signing key in the file '" + iosDevelopperKeyFile + "' \n it is represented like: 'iPhone Developer: Francis DUGENOUX (YRRQE5KGTH)'\n you can obtain it with : 'certtool y | grep \"Developer\"'")
|
debug.warning("To sign an application we need to have a signing key in the file '" + iosDevelopperKeyFile + "' \n it is represented like: 'iPhone Developer: Francis DUGENOUX (YRRQE5KGTH)'\n you can obtain it with : 'certtool y | grep \"Developer\"'")
|
||||||
|
debug.warning("Can not be install ... not runnable")
|
||||||
|
else:
|
||||||
signatureKey = tools.file_read_data(iosDevelopperKeyFile)
|
signatureKey = tools.file_read_data(iosDevelopperKeyFile)
|
||||||
signatureKey = re.sub('\n', '', signatureKey)
|
signatureKey = re.sub('\n', '', signatureKey)
|
||||||
cmdLine = 'codesign --force --sign '
|
cmdLine = 'codesign --force --sign '
|
||||||
|
4
setup.py
4
setup.py
@@ -7,8 +7,8 @@ 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.7.5',
|
version='0.7.6',
|
||||||
description='Lutin generic builder',
|
description='Lutin generic builder (might replace makefile, CMake ...)',
|
||||||
long_description=readme(),
|
long_description=readme(),
|
||||||
url='http://github.com/HeeroYui/lutin',
|
url='http://github.com/HeeroYui/lutin',
|
||||||
author='Edouard DUPIN',
|
author='Edouard DUPIN',
|
||||||
|
Reference in New Issue
Block a user