kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-15 02:18:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into custom_app

Browse Source
This commit is contained in:
renaud gaudin 2015-06-03 15:33:49 +02:00
commit edc123670c
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build-android-with-native.py
View File

@ -30,6 +30,7 @@ USAGE = '''Usage: {arg0} [--option]
--strip Strip libkiwix.so --strip Strip libkiwix.so
--locales Create the locales.txt file --locales Create the locales.txt file
--apk Create an APK file --apk Create an APK file
--clean Remove build folder (except apk files)
Note that the '--' prefix is optional. Note that the '--' prefix is optional.
@ -47,7 +48,7 @@ def init_with_args(args):
# default is executing all the steps # default is executing all the steps
create_toolchain = compile_liblzma = compile_libicu = \ create_toolchain = compile_liblzma = compile_libicu = \
compile_libzim = compile_libkiwix = strip_libkiwix = \ compile_libzim = compile_libkiwix = strip_libkiwix = \
compile_apk = locales_txt = True compile_apk = locales_txt = clean = True
archs = ALL_ARCHS archs = ALL_ARCHS
options = [a.lower() for a in args[1:]] options = [a.lower() for a in args[1:]]
@ -83,7 +84,7 @@ def init_with_args(args):
# consider we only want the specified steps # consider we only want the specified steps
create_toolchain = compile_liblzma = compile_libicu = compile_libzim = \ create_toolchain = compile_liblzma = compile_libicu = compile_libzim = \
compile_libkiwix = strip_libkiwix = \ compile_libkiwix = strip_libkiwix = \
compile_apk = locales_txt = False compile_apk = locales_txt = clean = False
for option in options: for option in options:
if 'toolchain' in option: if 'toolchain' in option:
@ -102,9 +103,12 @@ def init_with_args(args):
compile_apk = True compile_apk = True
if 'locales' in option: if 'locales' in option:
locales_txt = True locales_txt = True
if 'clean' in option:
clean = True
return (create_toolchain, compile_liblzma, compile_libicu, compile_libzim, return (create_toolchain, compile_liblzma, compile_libicu, compile_libzim,
compile_libkiwix, strip_libkiwix, compile_apk, locales_txt, archs) compile_libkiwix, strip_libkiwix, compile_apk, locales_txt,
clean, archs)
# store the OS's environment PATH as we'll mess with it # store the OS's environment PATH as we'll mess with it
# ORIGINAL_ENVIRON_PATH = os.environ.get('PATH') # ORIGINAL_ENVIRON_PATH = os.environ.get('PATH')
@ -113,6 +117,9 @@ ORIGINAL_ENVIRON = copy.deepcopy(os.environ)
# the directory of this file for relative referencing # the directory of this file for relative referencing
CURRENT_PATH = os.path.dirname(os.path.abspath(__file__)) 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)
# different names of folder path for accessing files # different names of folder path for accessing files
ARCHS_FULL_NAMES = { ARCHS_FULL_NAMES = {
'arm-linux-androideabi': 'arm-linux-androideabi', 'arm-linux-androideabi': 'arm-linux-androideabi',
@ -131,7 +138,7 @@ SYSTEMS = {'Linux': 'linux', 'Darwin': 'mac'}
# find out what to execute based on command line arguments # find out what to execute based on command line arguments
CREATE_TOOLCHAIN, COMPILE_LIBLZMA, COMPILE_LIBICU, COMPILE_LIBZIM, \ CREATE_TOOLCHAIN, COMPILE_LIBLZMA, COMPILE_LIBICU, COMPILE_LIBZIM, \
COMPILE_LIBKIWIX, STRIP_LIBKIWIX, COMPILE_APK, \ COMPILE_LIBKIWIX, STRIP_LIBKIWIX, COMPILE_APK, \
LOCALES_TXT, ARCHS = init_with_args(sys.argv) LOCALES_TXT, CLEAN, ARCHS = init_with_args(sys.argv)
# compiler version to use # compiler version to use
# list of available toolchains in <NDK_PATH>/toolchains # list of available toolchains in <NDK_PATH>/toolchains
@ -155,7 +162,7 @@ NDK_PLATFORM = os.environ.get('NDK_PLATFORM', 'android-14')
# will contain the different prepared toolchains for a specific build # will contain the different prepared toolchains for a specific build
PLATFORM_PREFIX = os.environ.get('PLATFORM_PREFIX', PLATFORM_PREFIX = os.environ.get('PLATFORM_PREFIX',
os.path.join(CURRENT_PATH, 'platforms')) os.path.join(PARENT_PATH, 'platforms'))
if not os.path.exists(PLATFORM_PREFIX): if not os.path.exists(PLATFORM_PREFIX):
os.makedirs(PLATFORM_PREFIX) os.makedirs(PLATFORM_PREFIX)
@ -559,3 +566,10 @@ if COMPILE_APK:
'android-debug-unaligned.apk')): 'android-debug-unaligned.apk')):
failed_on_step("The android-debug-unaligned.apk package " failed_on_step("The android-debug-unaligned.apk package "
"has not been created and is not present.") "has not been created and is not present.")
if CLEAN:
# remove everything from build folder expect the APKs
syscall('rm -rf build/generated build/intermediates build/native-libs '
'build/reports build/test-results build/tmp build/outputs/logs '
'build/outputs/lint*', shell=True)

5
res/layout/main.xml
View File

@ -24,13 +24,12 @@
android:ellipsize="end" android:ellipsize="end"
android:ems="10" android:ems="10"
android:hint="@string/articlesearch_hint" android:hint="@string/articlesearch_hint"
android:imeOptions="actionGo" android:imeOptions="actionGo|flagNoExtractUi"
android:inputType="text|textCapWords" android:inputType="text|textCapWords"
android:maxLines="1" android:maxLines="1"
android:background="@android:color/background_dark" android:background="@android:color/background_dark"
android:textColor="@android:color/white" android:textColor="@android:color/white"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"/>
/>
</LinearLayout> </LinearLayout>