mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-08 23:07:26 -04:00
Android custom apps can now be compiled for individual architectures #6
This commit is contained in:
mhutti1
parent
5a78089a1f
commit
db2c8db537
@ -21,6 +21,17 @@ from subprocess import call, check_output
|
||||
ALL_ARCHS = ['arm-linux-androideabi', 'mipsel-linux-android', 'x86', 'aarch64-linux-android']
|
||||
|
||||
|
||||
def syscall(args, shell=False, with_print=True):
|
||||
''' make a system call '''
|
||||
args = args.split()
|
||||
if with_print:
|
||||
print(u"-----------\n" + u" ".join(args) + u"\n-----------")
|
||||
|
||||
if shell:
|
||||
args = ' '.join(args)
|
||||
call(args, shell=shell)
|
||||
|
||||
|
||||
def find_package():
|
||||
d = parse('AndroidManifest.xml')
|
||||
return [e.getAttribute('package').strip()
|
||||
@ -91,6 +102,9 @@ def init_with_args(args):
|
||||
#doptions.pop(idx)
|
||||
# recreate options list from other items
|
||||
options = [v for v in doptions.values() if not v.startswith('--on=')]
|
||||
# clean out current libs
|
||||
os.chdir(curdir)
|
||||
syscall('rm -rf libs/*', shell=True)
|
||||
|
||||
if len(options):
|
||||
# we received options.
|
||||
@ -137,6 +151,9 @@ CURRENT_PATH = os.path.dirname(os.path.abspath(__file__))
|
||||
# the parent directory of this file for relative referencing
|
||||
PARENT_PATH = os.path.dirname(CURRENT_PATH)
|
||||
|
||||
# store where we are so we can go back
|
||||
curdir = os.getcwd()
|
||||
|
||||
# different names of folder path for accessing files
|
||||
ARCHS_FULL_NAMES = {
|
||||
'arm-linux-androideabi': 'arm-linux-androideabi',
|
||||
@ -159,6 +176,7 @@ CREATE_TOOLCHAIN, COMPILE_LIBLZMA, COMPILE_LIBICU, COMPILE_LIBZIM, \
|
||||
COMPILE_LIBKIWIX, COMPILE_LIBXAPIAN, STRIP_LIBKIWIX, COMPILE_APK, \
|
||||
COMPILE_GLASSIFY, LOCALES_TXT, CLEAN, ARCHS = init_with_args(sys.argv)
|
||||
|
||||
|
||||
# compiler version to use
|
||||
# list of available toolchains in <NDK_PATH>/toolchains
|
||||
# 4.4.3, 4.6, 4.7, clang3.1, clang3.2
|
||||
@ -244,18 +262,6 @@ def fail_on_missing(path):
|
||||
u"and run 'make' in 'src/dependencies'" % path)
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def syscall(args, shell=False, with_print=True):
|
||||
''' make a system call '''
|
||||
args = args.split()
|
||||
if with_print:
|
||||
print(u"-----------\n" + u" ".join(args) + u"\n-----------")
|
||||
|
||||
if shell:
|
||||
args = ' '.join(args)
|
||||
call(args, shell=shell)
|
||||
|
||||
|
||||
def change_env(values):
|
||||
''' update a set of environment variables '''
|
||||
for k, v in values.items():
|
||||
@ -271,9 +277,6 @@ def failed_on_step(error_msg):
|
||||
for path in REQUIRED_PATHS:
|
||||
fail_on_missing(path)
|
||||
|
||||
# store where we are so we can go back
|
||||
curdir = os.getcwd()
|
||||
|
||||
# Prepare the libicu cross-compilation
|
||||
if COMPILE_LIBICU:
|
||||
if (not os.path.exists(ICU_TMP)):
|
||||
@ -287,12 +290,15 @@ if COMPILE_LIBICU:
|
||||
shell=True)
|
||||
syscall('make', shell=True)
|
||||
os.chdir(curdir)
|
||||
|
||||
|
||||
for arch in ARCHS:
|
||||
# second name of the platform ; used as subfolder in platform/
|
||||
arch_full = ARCHS_FULL_NAMES.get(arch)
|
||||
arch_short = ARCHS_SHORT_NAMES.get(arch)
|
||||
|
||||
|
||||
if (not os.path.exists('libs/' + arch_short)):
|
||||
syscall('mkdir libs/' + arch_short, shell=True)
|
||||
|
||||
# platform contains the toolchain
|
||||
platform = os.path.join(PLATFORM_PREFIX, arch)
|
||||
|
||||
@ -652,7 +658,7 @@ for arch in ARCHS:
|
||||
os.remove(obj)
|
||||
|
||||
# check that the step went well
|
||||
if COMPILE_LIBKIWIX or STRIP_LIBKIWIX or COMPILE_APK:
|
||||
if COMPILE_LIBKIWIX or STRIP_LIBKIWIX:
|
||||
if not os.path.exists(os.path.join('libs', arch_short, 'libkiwix.so')):
|
||||
failed_on_step('The libkiwix.so shared lib has not been created '
|
||||
'and is not present.')
|
||||
|
||||
@ -42,6 +42,8 @@ PY3 = sys.version_info.major >= 3
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
architectures = [];
|
||||
|
||||
DEFAULT_JSDATA = {
|
||||
# mandatory fields
|
||||
# 'app_name': "Kiwix Custom App",
|
||||
@ -393,7 +395,7 @@ def step_update_android_manifest(jsdata, **options):
|
||||
shutil.move(
|
||||
os.path.join(ANDROID_PATH, 'src', 'org', 'kiwix', 'kiwixmobile'),
|
||||
os.path.join(ANDROID_PATH, 'src', *package_path))
|
||||
|
||||
|
||||
shutil.move(
|
||||
os.path.join(ANDROID_PATH, 'test', 'org', 'kiwix', 'kiwixmobile'),
|
||||
os.path.join(ANDROID_PATH, 'test', *package_path))
|
||||
@ -431,17 +433,24 @@ def step_compile_libkiwix(jsdata, **options):
|
||||
''' launch the native libkiwix script without building an APK '''
|
||||
|
||||
move_to_android_placeholder()
|
||||
|
||||
# compile libkiwix and all dependencies
|
||||
syscall('./build-android-with-native.py '
|
||||
'--toolchain '
|
||||
'--lzma '
|
||||
'--icu '
|
||||
'--zim '
|
||||
'--kiwix '
|
||||
'--strip '
|
||||
'--locales ')
|
||||
|
||||
|
||||
if not architectures:
|
||||
# compile libkiwix and all dependencies
|
||||
syscall('./build-android-with-native.py '
|
||||
'--toolchain '
|
||||
'--lzma '
|
||||
'--icu '
|
||||
'--zim '
|
||||
'--kiwix '
|
||||
'--strip '
|
||||
'--locales ')
|
||||
else:
|
||||
command = './build-android-with-native.py --toolchain --lzma --icu --zim --kiwix --strip --locales '
|
||||
|
||||
for arch in architectures:
|
||||
command += "--on=" + arch
|
||||
|
||||
syscall(command)
|
||||
|
||||
def step_embed_zimfile(jsdata, **options):
|
||||
''' prepare a content-libs.jar file with ZIM file for inclusion in APK '''
|
||||
@ -450,19 +459,17 @@ def step_embed_zimfile(jsdata, **options):
|
||||
return
|
||||
|
||||
move_to_android_placeholder()
|
||||
|
||||
# create content-libs.jar
|
||||
tmpd = tempfile.mkdtemp()
|
||||
archs = os.listdir('libs')
|
||||
for arch in archs:
|
||||
for arch in architectures:
|
||||
os.makedirs(os.path.join(tmpd, 'lib', arch))
|
||||
# shutil.copy(os.path.join('libs', arch, 'libkiwix.so'),
|
||||
# os.path.join(tmpd, 'lib', arch, 'libkiwix.so'))
|
||||
copy_to(jsdata.get('zim_file'),
|
||||
os.path.join(tmpd, 'lib', archs[0], jsdata.get('zim_name')))
|
||||
for arch in archs[1:]:
|
||||
os.path.join(tmpd, 'lib', architectures[0], jsdata.get('zim_name')))
|
||||
for arch in architectures[1:]:
|
||||
os.chdir(os.path.join(tmpd, 'lib', arch))
|
||||
os.link('../{}/{}'.format(archs[0], jsdata.get('zim_name')),
|
||||
os.link('../{}/{}'.format(architectures[0], jsdata.get('zim_name')),
|
||||
jsdata.get('zim_name'))
|
||||
os.chdir(tmpd)
|
||||
syscall('zip -r -0 -y {} lib'
|
||||
@ -473,13 +480,12 @@ def step_build_apk(jsdata, **options):
|
||||
''' build the actual APK '''
|
||||
|
||||
move_to_android_placeholder()
|
||||
|
||||
|
||||
# compile KiwixAndroid
|
||||
syscall('./build-android-with-native.py '
|
||||
'--apk '
|
||||
'--clean ')
|
||||
|
||||
|
||||
def step_move_apk_to_destination(jsdata, **options):
|
||||
''' place and rename built APKs to main output directory '''
|
||||
|
||||
@ -607,16 +613,24 @@ if __name__ == '__main__':
|
||||
jspath = sys.argv[1]
|
||||
args = sys.argv[2:]
|
||||
|
||||
if len(args) == 0:
|
||||
full = True
|
||||
for arg in args:
|
||||
step_name = re.sub(r'^\-\-', '', arg)
|
||||
if step_name in ARGS_MATRIX.keys():
|
||||
full = False
|
||||
if (len(args) == 0) or (full):
|
||||
options = OrderedDict([('do_{}'.format(step), True)
|
||||
for step in ARGS_MATRIX.keys()])
|
||||
else:
|
||||
options = OrderedDict()
|
||||
if (len(args) != 0):
|
||||
for arg in args:
|
||||
step_name = re.sub(r'^\-\-', '', arg)
|
||||
if step_name not in ARGS_MATRIX.keys():
|
||||
logger.error("{} not a valid step. Exiting.".format(step_name))
|
||||
usage(sys.argv[0], 1)
|
||||
if step_name.startswith('on='):
|
||||
rarch = step_name.split('=', 1)[1]
|
||||
architectures.append(rarch)
|
||||
else:
|
||||
logger.error("{} not a valid step. Exiting.".format(step_name))
|
||||
usage(sys.argv[0], 1)
|
||||
else:
|
||||
options.update({'do_{}'.format(step_name): True})
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user