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

[DEBUG] some naming correction

Browse Source
This commit is contained in:
Edouard DUPIN 2017-10-09 10:23:52 +02:00
parent 0946252a10
commit f6abd70d75
10 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lutin/module.py
View File

@ -575,7 +575,7 @@ class Module:
# ---------------------------------------------------- # ----------------------------------------------------
# -- Generic library help -- # -- 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': if self._type == 'DATA':
debug.print_element("Data", self._name, "-", package_version_string) debug.print_element("Data", self._name, "-", package_version_string)
elif self._type == 'PREBUILD': elif self._type == 'PREBUILD':

2
lutin/target.py
View File

@ -1035,7 +1035,7 @@ class Target:
debug.debug("make_package_generic_files [START]") debug.debug("make_package_generic_files [START]")
## Create version file: ## Create version file:
ret_version = tools.file_write_data(os.path.join(path_package, self.pkg_path_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) only_if_new=True)
## Create maintainer file: ## Create maintainer file:

3
lutin/tools.py
View File

@ -61,6 +61,7 @@ def file_size(path):
return statinfo.st_size return statinfo.st_size
def file_read_data(path, binary=False): def file_read_data(path, binary=False):
debug.verbose("path= " + path)
if not os.path.isfile(path): if not os.path.isfile(path):
return "" return ""
if binary == True: if binary == True:
@ -71,7 +72,7 @@ def file_read_data(path, binary=False):
file.close() file.close()
return data_file return data_file
def version_toString(version): def version_to_string(version):
version_ID = "" version_ID = ""
for id in version: for id in version:
if len(version_ID) != 0: if len(version_ID) != 0:

2
lutin/z_target/lutinTarget_Android.py
View File

@ -245,7 +245,7 @@ class Target(target.Target):
def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
debug.debug("------------------------------------------------------------------------") 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("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
#output path #output path
target_outpath = self.get_staging_path(pkg_name) target_outpath = self.get_staging_path(pkg_name)

4
lutin/z_target/lutinTarget_Debian.py
View File

@ -57,7 +57,7 @@ class Target(lutinTarget_Linux.Target):
# http://alp.developpez.com/tutoriels/debian/creer-paquet/ # http://alp.developpez.com/tutoriels/debian/creer-paquet/
debianpkg_name = re.sub("_", "-", pkg_name) debianpkg_name = re.sub("_", "-", pkg_name)
debug.debug("------------------------------------------------------------------------") 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("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
#output path #output path
target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app") 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) tools.create_directory_of_file(finalFileControl)
tmpFile = open(finalFileControl, 'w') tmpFile = open(finalFileControl, 'w')
tmpFile.write("Package: " + debianpkg_name + "\n") 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("Section: " + self.generate_list_separate_coma(pkg_properties["SECTION"]) + "\n")
tmpFile.write("Priority: " + pkg_properties["PRIORITY"] + "\n") tmpFile.write("Priority: " + pkg_properties["PRIORITY"] + "\n")
tmpFile.write("Architecture: all\n") tmpFile.write("Architecture: all\n")

4
lutin/z_target/lutinTarget_IOs.py
View File

@ -103,7 +103,7 @@ class Target(target.Target):
def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
debug.debug("------------------------------------------------------------------------") 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("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
#output path #output path
target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app") target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app")
@ -206,7 +206,7 @@ class Target(target.Target):
data_file += " </array>\n" data_file += " </array>\n"
data_file += " \n" data_file += " \n"
data_file += " <key>CFBundleShortVersionString</key>\n" data_file += " <key>CFBundleShortVersionString</key>\n"
data_file += " <etk/String.hpp>"+tools.version_toString(pkg_properties["VERSION"])+"</string>\n" data_file += " <etk/String.hpp>"+tools.version_to_string(pkg_properties["VERSION"])+"</string>\n"
data_file += " <key>CFBundleVersion</key>\n" data_file += " <key>CFBundleVersion</key>\n"
data_file += " <etk/String.hpp>"+str(pkg_properties["VERSION_CODE"])+"</string>\n" data_file += " <etk/String.hpp>"+str(pkg_properties["VERSION_CODE"])+"</string>\n"
data_file += " \n" data_file += " \n"

2
lutin/z_target/lutinTarget_Linux.py
View File

@ -86,7 +86,7 @@ class Target(target.Target):
""" """
def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
debug.debug("------------------------------------------------------------------------") 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("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
#output path #output path
target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app") target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app")

2
lutin/z_target/lutinTarget_MacOs.py
View File

@ -69,7 +69,7 @@ class Target(target.Target):
def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
debug.debug("------------------------------------------------------------------------") 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("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
#output path #output path
target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app/Contents") target_outpath = os.path.join(self.get_staging_path(pkg_name), pkg_name + ".app/Contents")

2
lutin/z_target/lutinTarget_Web.py
View File

@ -95,7 +95,7 @@ class Target(lutinTarget_Linux.Target):
""" """
def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
debug.debug("------------------------------------------------------------------------") 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("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
#output path #output path
target_outpath = os.path.join(self.get_staging_path(pkg_name, tmp=True), pkg_name + ".app") target_outpath = os.path.join(self.get_staging_path(pkg_name, tmp=True), pkg_name + ".app")

2
lutin/z_target/lutinTarget_Windows.py
View File

@ -77,7 +77,7 @@ class Target(target.Target):
def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static): def make_package_binary(self, pkg_name, pkg_properties, base_pkg_path, heritage_list, static):
debug.debug("------------------------------------------------------------------------") 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("------------------------------------------------------------------------") debug.debug("------------------------------------------------------------------------")
#output path #output path
target_outpath = os.path.join(self.get_staging_path(pkg_name, tmp=True), pkg_name + ".app") target_outpath = os.path.join(self.get_staging_path(pkg_name, tmp=True), pkg_name + ".app")