[DEV/DEBUG] correct the build of IOs target and correct the resize installed image

This commit is contained in:
Edouard DUPIN 2016-09-20 22:33:00 +02:00
parent 62d084b351
commit 52729c3c71
2 changed files with 12 additions and 5 deletions

View File

@ -244,7 +244,14 @@ class Module:
if sizeX > 0:
debug.verbose("Image file : " + display_source + " ==> " + destination + " resize=(" + str(sizeX) + "," + str(sizeY) + ")")
fileName, fileExtension = os.path.splitext(os.path.join(self._origin_path,source))
image.resize(source, os.path.join(target.get_build_path_data(self._name), destination), sizeX, sizeY, file_cmd)
# 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)
image.resize(source, temporary_file, sizeX, sizeY, file_cmd)
# Copy file in statndard mode
tools.copy_file(temporary_file,
os.path.join(target.get_build_path_data(self._name), destination),
file_cmd,
in_list=copy_list)
else:
debug.verbose("Might copy file : " + display_source + " ==> " + destination)
tools.copy_file(source,
@ -857,7 +864,7 @@ class Module:
# ----------------------------------------------------
debug.debug("install datas")
copy_list={}
self.image_to_build(target, copy_list) # TODO : When file is resized, the final file is not removed if the file is not needed anymore
self.image_to_build(target, copy_list)
self.files_to_build(target, copy_list)
self.paths_to_build(target, copy_list)
#real copy files

View File

@ -323,7 +323,7 @@ class Target(target.Target):
pkg_properties["APPLE_APPLICATION_IOS_ID"] = "00000000"
debug.warning("Missing package property : APPLE_APPLICATION_IOS_ID USE " + pkg_properties["APPLE_APPLICATION_IOS_ID"] + " ID ... ==> CAN NOT WORK ..." )
# Create the info file
tmpFile = open(os.path.join(target_outpath, pkg_name + ".xcent"), 'w')
tmpFile = open(os.path.join(self.get_build_path(pkg_name), pkg_name + ".xcent"), 'w')
tmpFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n")
tmpFile.write("<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n")
tmpFile.write("<plist version=\"1.0\">\n")
@ -352,8 +352,8 @@ class Target(target.Target):
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)
cmdLine += ' --entitlements ' + os.path.join(self.get_build_path(pkg_name), pkg_name + ".xcent")
cmdLine += ' ' + os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app")
multiprocess.run_command(cmdLine)
def create_random_number(self, len):