diff --git a/lutin/module.py b/lutin/module.py index 7ea7aeb..4142c7a 100644 --- a/lutin/module.py +++ b/lutin/module.py @@ -575,7 +575,7 @@ class Module: # ---------------------------------------------------- # -- Generic library help -- # ---------------------------------------------------- - package_version_string = tools.version_toString(self._package_prop["VERSION"]); + package_version_string = tools.version_to_string(self._package_prop["VERSION"]); if self._type == 'DATA': debug.print_element("Data", self._name, "-", package_version_string) elif self._type == 'PREBUILD': diff --git a/lutin/target.py b/lutin/target.py index 50abe1a..98f02cb 100644 --- a/lutin/target.py +++ b/lutin/target.py @@ -1035,7 +1035,7 @@ class Target: 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_toString(pkg_properties["VERSION"]), + tools.version_to_string(pkg_properties["VERSION"]), only_if_new=True) ## Create maintainer file: diff --git a/lutin/tools.py b/lutin/tools.py index bab59da..44e1927 100644 --- a/lutin/tools.py +++ b/lutin/tools.py @@ -61,6 +61,7 @@ def file_size(path): return statinfo.st_size def file_read_data(path, binary=False): + debug.verbose("path= " + path) if not os.path.isfile(path): return "" if binary == True: @@ -71,7 +72,7 @@ def file_read_data(path, binary=False): file.close() return data_file -def version_toString(version): +def version_to_string(version): version_ID = "" for id in version: if len(version_ID) != 0: diff --git a/lutin/z_target/lutinTarget_Android.py b/lutin/z_target/lutinTarget_Android.py index 858dd80..8beb216 100644 --- a/lutin/z_target/lutinTarget_Android.py +++ b/lutin/z_target/lutinTarget_Android.py @@ -245,7 +245,7 @@ class Target(target.Target): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): debug.debug("------------------------------------------------------------------------") - debug.info("Generate package '" + pkg_name + "' v" + tools.version_toString(pkg_properties["VERSION"])) + debug.info("Generate package '" + pkg_name + "' v" + tools.version_to_string(pkg_properties["VERSION"])) debug.debug("------------------------------------------------------------------------") #output path target_outpath = self.get_staging_path(pkg_name) diff --git a/lutin/z_target/lutinTarget_Debian.py b/lutin/z_target/lutinTarget_Debian.py index 00d5cfa..0257f5c 100644 --- a/lutin/z_target/lutinTarget_Debian.py +++ b/lutin/z_target/lutinTarget_Debian.py @@ -57,7 +57,7 @@ class Target(lutinTarget_Linux.Target): # http://alp.developpez.com/tutoriels/debian/creer-paquet/ debianpkg_name = re.sub("_", "-", pkg_name) debug.debug("------------------------------------------------------------------------") - debug.info("Generate generic '" + pkg_name + "' v" + tools.version_toString(pkg_properties["VERSION"])) + debug.info("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") @@ -106,7 +106,7 @@ class Target(lutinTarget_Linux.Target): tools.create_directory_of_file(finalFileControl) tmpFile = open(finalFileControl, 'w') tmpFile.write("Package: " + debianpkg_name + "\n") - tmpFile.write("Version: " + tools.version_toString(pkg_properties["VERSION"]) + "\n") + tmpFile.write("Version: " + tools.version_to_string(pkg_properties["VERSION"]) + "\n") tmpFile.write("Section: " + self.generate_list_separate_coma(pkg_properties["SECTION"]) + "\n") tmpFile.write("Priority: " + pkg_properties["PRIORITY"] + "\n") tmpFile.write("Architecture: all\n") diff --git a/lutin/z_target/lutinTarget_IOs.py b/lutin/z_target/lutinTarget_IOs.py index b7f393c..d122c13 100644 --- a/lutin/z_target/lutinTarget_IOs.py +++ b/lutin/z_target/lutinTarget_IOs.py @@ -103,7 +103,7 @@ class Target(target.Target): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): debug.debug("------------------------------------------------------------------------") - debug.info("Generate package '" + pkg_name + "' v" + tools.version_toString(pkg_properties["VERSION"])) + debug.info("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), pkg_name + ".app") @@ -206,7 +206,7 @@ class Target(target.Target): data_file += " \n" data_file += " \n" data_file += " CFBundleShortVersionString\n" - data_file += " "+tools.version_toString(pkg_properties["VERSION"])+"\n" + data_file += " "+tools.version_to_string(pkg_properties["VERSION"])+"\n" data_file += " CFBundleVersion\n" data_file += " "+str(pkg_properties["VERSION_CODE"])+"\n" data_file += " \n" diff --git a/lutin/z_target/lutinTarget_Linux.py b/lutin/z_target/lutinTarget_Linux.py index fc2d7bd..1c8aec6 100644 --- a/lutin/z_target/lutinTarget_Linux.py +++ b/lutin/z_target/lutinTarget_Linux.py @@ -86,7 +86,7 @@ class Target(target.Target): """ 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_toString(pkg_properties["VERSION"])) + 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") diff --git a/lutin/z_target/lutinTarget_MacOs.py b/lutin/z_target/lutinTarget_MacOs.py index 4a2b52e..9e80eb2 100644 --- a/lutin/z_target/lutinTarget_MacOs.py +++ b/lutin/z_target/lutinTarget_MacOs.py @@ -69,7 +69,7 @@ class Target(target.Target): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): debug.debug("------------------------------------------------------------------------") - debug.info("Generate package '" + pkg_name + "' v" + tools.version_toString(pkg_properties["VERSION"])) + debug.info("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), pkg_name + ".app/Contents") diff --git a/lutin/z_target/lutinTarget_Web.py b/lutin/z_target/lutinTarget_Web.py index 5bdd79b..79ffbff 100644 --- a/lutin/z_target/lutinTarget_Web.py +++ b/lutin/z_target/lutinTarget_Web.py @@ -95,7 +95,7 @@ class Target(lutinTarget_Linux.Target): """ 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_toString(pkg_properties["VERSION"])) + 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") diff --git a/lutin/z_target/lutinTarget_Windows.py b/lutin/z_target/lutinTarget_Windows.py index 0d6a890..146f5c2 100644 --- a/lutin/z_target/lutinTarget_Windows.py +++ b/lutin/z_target/lutinTarget_Windows.py @@ -77,7 +77,7 @@ class Target(target.Target): 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_toString(pkg_properties["VERSION"])) + 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")