From ce4caa266f43212325436943add31a7583f60f49 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Fri, 13 Dec 2013 15:06:23 +0100 Subject: [PATCH 1/2] md5.cpp was renamed in md5.c --- build-android-with-native.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-android-with-native.py b/build-android-with-native.py index a397630f3..bcb03f15a 100755 --- a/build-android-with-native.py +++ b/build-android-with-native.py @@ -180,7 +180,7 @@ LIBZIM_SOURCE_FILES = ('article.cpp', 'articlesearch.cpp', 'cluster.cpp', 'fileimpl.cpp', 'indexarticle.cpp', 'ptrstream.cpp', 'search.cpp', 'template.cpp', 'unicode.cpp', 'uuid.cpp', 'zintstream.cpp', 'envvalue.cpp', 'lzmastream.cpp', - 'unlzmastream.cpp', 'fstream.cpp', 'md5.cpp', + 'unlzmastream.cpp', 'fstream.cpp', 'md5.c', 'md5stream.cpp') # root folder for libkiwix From 5261fd2143e030aab70e846d14f5bc15b6e2c2b9 Mon Sep 17 00:00:00 2001 From: kelson42 Date: Sat, 14 Dec 2013 12:40:23 +0100 Subject: [PATCH 2/2] + fix compilation with external zimlib --- build-android-with-native.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build-android-with-native.py b/build-android-with-native.py index bcb03f15a..e7d7205e5 100755 --- a/build-android-with-native.py +++ b/build-android-with-native.py @@ -7,6 +7,7 @@ . Compile libkiwix ''' import os +import re import sys import copy import shutil @@ -408,7 +409,7 @@ for arch in ARCHS: + platform_includes)}) link_cmd = ('ar rvs libzim.a ' '%(obj_files)s ' - % {'obj_files': ' '.join([n.replace('.cpp', '.o') + % {'obj_files': ' '.join([re.sub('(\.c[p]*)', '.o', n) for n in LIBZIM_SOURCE_FILES])}) if COMPILE_LIBZIM: @@ -420,7 +421,7 @@ for arch in ARCHS: os.remove(libzim_file) for src in LIBZIM_SOURCE_FILES: - os.remove(src.replace('.cpp', '.o')) + os.remove(re.sub('(\.c[p]*)', '.o', src)) # check that the step went well if COMPILE_LIBZIM or COMPILE_LIBKIWIX: