[TIMOB-18044] Android: tiapp.xml of module has two 'modules' tags #5961
Conversation
ingo
changed the title
ingo
changed the title
| @@ -117,7 +117,7 @@ def stage(platform, project_dir, manifest, callback): | |||
| xml = open(tiapp).read() | |||
| tiappf = open(tiapp,'w') | |||
| xml = xml.replace('<guid/>', '<guid></guid>') | |||
| xml = xml.replace('</guid>', '</guid>\n<modules>\n<module version="%s">%s</module>\n</modules>\n' % (version, moduleid)) | |||
| xml = xml.replace('</modules>', '\t<module version="%s">%s</module>\n\t</modules>\n' % (version, moduleid)) | |||
| # generate a guid since this is currently done by developer | |||
There was a problem hiding this comment.
The changes looks good. However, I'm concerned with a case where the modules section is missing in tiapp (either removed accidentally by user, or we didn't generate during creation). In that case, we might not end up adding the modules section. I would prefer to find the modules tag and if it is not found, then we add the modules section after guid section, otherwise, just replace the existing modules section. The code can be on similar lines (just a prototype)
moduleid = xml.find('</modules>') if moduleid: xml = xml.replace('</modules>', '\t<module version="%s">%s</module>\n\t</modules>\n' % (version, moduleid)) elif xml = xml.replace('</guid>', '</guid>\n<modules>\n<module version="%s">%s</module>\n</modules>\n' % (version, moduleid))
There was a problem hiding this comment.
Even though the modules tag is missing, it is still able to add the modules section to tiapp. So there is no need to add a check for missing modules section.
ingo
changed the title
[TIMOB-18044] Android: tiapp.xml of module has two 'modules' tags
see TC-4550