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

[API/DEV] set ICON and ANDROID_SIGN in relative only

Browse Source
This commit is contained in:
Edouard DUPIN 2016-10-04 22:56:40 +02:00
parent 4c883f177c
commit 94d8b82321
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lutin/module.py
View File

@ -1360,7 +1360,20 @@ class Module:
self._package_prop["COMPAGNY_NAME2"] = val2 self._package_prop["COMPAGNY_NAME2"] = val2
self._package_prop_default["COMPAGNY_NAME2"] = False self._package_prop_default["COMPAGNY_NAME2"] = False
elif "ICON" == variable: elif "ICON" == variable:
self._package_prop[variable] = value if len(value) > 1 \
and value[0] == '/':
# unix case
debug.warning(" set_pkg('ICON', " + value + ")")
debug.warning("[" + self._name + "] Not permited to add an ICON that start in / directory (only relative path) (compatibility until 2.x)")
self._package_prop[variable] = value
elif len(value) > 2 \
and value[1] == ':':
# windows case :
debug.warning(" set_pkg('ICON', " + value + ")")
debug.warning("[" + self._name + "] Not permited to add a path that start in '" + value[0] + ":' directory (only relative path) (compatibility until 2.x)")
self._package_prop[variable] = value
else:
self._package_prop[variable] = os.path.join(tools.get_current_path(self._origin_file), value)
self._package_prop_default[variable] = False self._package_prop_default[variable] = False
elif "MAINTAINER" == variable: elif "MAINTAINER" == variable:
self._package_prop[variable] = value self._package_prop[variable] = value
@ -1386,6 +1399,22 @@ class Module:
else: else:
self._package_prop[variable] = value self._package_prop[variable] = value
self._package_prop_default[variable] = False self._package_prop_default[variable] = False
elif "ANDROID_SIGN" == variable:
if len(value) > 1 \
and value[0] == '/':
# unix case
debug.warning(" set_pkg('ANDROID_SIGN', " + value + ")")
debug.warning("[" + self._name + "] Not permited to add an ICON that start in / directory (only relative path) (compatibility until 2.x)")
self._package_prop[variable] = value
elif len(value) > 2 \
and value[1] == ':':
# windows case :
debug.warning(" set_pkg('ANDROID_SIGN', " + value + ")")
debug.warning("[" + self._name + "] Not permited to add a path that start in '" + value[0] + ":' directory (only relative path) (compatibility until 2.x)")
self._package_prop[variable] = value
else:
self._package_prop[variable] = os.path.join(tools.get_current_path(self._origin_file), value)
self._package_prop_default[variable] = False
elif variable in ["DESCRIPTION", elif variable in ["DESCRIPTION",
"VERSION", "VERSION",
"VERSION_CODE", "VERSION_CODE",
@ -1397,8 +1426,7 @@ class Module:
"ANDROID_APPL_TYPE", "ANDROID_APPL_TYPE",
"ADMOD_ID", "ADMOD_ID",
"APPLE_APPLICATION_IOS_ID", "APPLE_APPLICATION_IOS_ID",
"LICENSE", "LICENSE"]:
"ANDROID_SIGN"]:
self._package_prop[variable] = value self._package_prop[variable] = value
self._package_prop_default[variable] = False self._package_prop_default[variable] = False
elif "ADMOD_POSITION" == variable: elif "ADMOD_POSITION" == variable: