Better handling of extra branding.xml files

This commit is contained in:
renaud gaudin 2015-06-21 14:36:10 +00:00
parent 56777e1533
commit e8d720e9a0

View File

@ -247,10 +247,7 @@ def step_update_branding_xml(jsdata, **options):
move_to_android_placeholder() move_to_android_placeholder()
# copy and rewrite res/values/branding.xml # copy and rewrite res/values/branding.xml
for root, dirs, files in os.walk(os.path.join(ANDROID_PATH, 'res')): branding_xml = os.path.join(ANDROID_PATH, 'res', 'values', 'branding.xml')
for file in files:
if file.endswith('branding.xml'):
branding_xml = os.path.join(root, file)
soup = soup = BeautifulSoup(open(branding_xml, 'r'), soup = soup = BeautifulSoup(open(branding_xml, 'r'),
'xml', from_encoding='utf-8') 'xml', from_encoding='utf-8')
for elem in soup.findAll('string'): for elem in soup.findAll('string'):
@ -258,6 +255,14 @@ def step_update_branding_xml(jsdata, **options):
elem.text.replace('Kiwix', jsdata.get('app_name'))) elem.text.replace('Kiwix', jsdata.get('app_name')))
flushxml(soup, 'resources', branding_xml) flushxml(soup, 'resources', branding_xml)
# remove all non-default branding.xml files
for folder in os.listdir(os.path.join(ANDROID_PATH, 'res')):
if re.match(r'^values\-[a-z]{2}$', folder):
lbx = os.path.join(ANDROID_PATH, 'res', folder, 'branding.xml')
if os.path.exists(lbx):
os.remove(lbx)
def step_gen_constants_java(jsdata, **options): def step_gen_constants_java(jsdata, **options):
''' gen Java Source class (final constants) with all JSON values ''' ''' gen Java Source class (final constants) with all JSON values '''