Compare commits

..

6 Commits
0.7.5 ... 0.7.6

7 changed files with 27 additions and 19 deletions

View File

@@ -192,7 +192,7 @@ def parseGenericArg(argument, active):
if active==True:
debug.enable_color()
return True
elif argument.get_option_name() == "force":
elif argument.get_option_name() == "force-build":
if active==True:
env.set_force_mode(True)
return True
@@ -284,7 +284,7 @@ for argument in localArgument:
my_target = None
else:
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()
else:
#load the target if needed :

View File

@@ -1051,7 +1051,7 @@ def get_module_option(the_module, name):
if "get_type" in dir(the_module):
type = the_module.get_type()
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):
sub_type = the_module.get_sub_type()

View File

@@ -535,7 +535,7 @@ class Target:
or module.get_type() == 'BINARY_STAND_ALONE':
self.make_package_binary(pkg_name, pkg_properties, base_pkg_path, heritage_list, static = True)
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':
debug.info("Can not create package for package");
return

View File

@@ -38,7 +38,7 @@ def get_output_type():
##
## @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")
#create command Line
cmd = [

View File

@@ -127,9 +127,15 @@ def link(file, binary, target, depancy, flags, name, basic_path, static=False):
# get the file size of the non strip file
originSize = tools.file_size(file_dst);
debug.print_element("SharedLib(strip)", name, "", "")
cmdLineStrip=tools.list_to_str([
target.strip,
file_dst])
if target.name == "MacOs":
cmdLineStrip=tools.list_to_str([
target.strip,
"-u",
file_dst])
else:
cmdLineStrip=tools.list_to_str([
target.strip,
file_dst])
multiprocess.run_command(cmdLineStrip, store_output_file=file_warning)
# get the stip size of the binary
stripSize = tools.file_size(file_dst)

View File

@@ -340,15 +340,17 @@ class Target(target.Target):
debug.print_element("pkg(signed)", "pkg", "<==", "Signing application")
iosDevelopperKeyFile = ".iosKey.txt"
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\"'")
signatureKey = tools.file_read_data(iosDevelopperKeyFile)
signatureKey = re.sub('\n', '', signatureKey)
cmdLine = 'codesign --force --sign '
# to get this key ; certtool y | grep "Developer"
cmdLine += ' "' + signatureKey + '" '
cmdLine += ' --entitlements ' + self.get_build_path(pkg_name) + '/worddown.xcent'
cmdLine += ' ' + self.get_staging_path(pkg_name)
multiprocess.run_command(cmdLine)
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 = re.sub('\n', '', signatureKey)
cmdLine = 'codesign --force --sign '
# to get this key ; certtool y | grep "Developer"
cmdLine += ' "' + signatureKey + '" '
cmdLine += ' --entitlements ' + self.get_build_path(pkg_name) + '/worddown.xcent'
cmdLine += ' ' + self.get_staging_path(pkg_name)
multiprocess.run_command(cmdLine)
def createRandomNumber(self, len):
out = ""

View File

@@ -7,8 +7,8 @@ def readme():
# https://pypi.python.org/pypi?%3Aaction=list_classifiers
setup(name='lutin',
version='0.7.5',
description='Lutin generic builder',
version='0.7.6',
description='Lutin generic builder (might replace makefile, CMake ...)',
long_description=readme(),
url='http://github.com/HeeroYui/lutin',
author='Edouard DUPIN',