Merge pull request #532 from kiwix/release_android_fix

.github/scripts/common.py

@@ -52,6 +52,13 @@ PLATFORM_TO_RELEASE = {
     "android_x86_64": "android-x86_64",
 }
 
+LIB_PREFIX = {
+    "android_arm": "arm-linux-androideabi",
+    "android_arm64": "aarch64-linux-android",
+    "android_x86": "i686-linux-android",
+    "android_x86_64": "x86_64-linux-android",
+}
+
 FLATPAK_HTTP_GIT_REMOTE = "https://github.com/flathub/org.kiwix.desktop.git"
 FLATPAK_GIT_REMOTE = "git@github.com:flathub/org.kiwix.desktop.git"
 
@@ -100,7 +107,17 @@ EXPORT_FILES = {
     "libkiwix": (
         INSTALL_DIR,
         (
-            "lib/libkiwix.so",
+            "lib/{libprefix}/libkiwix.so".format(
+                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
+            ),
+            "lib/{libprefix}/libkiwix.so.{version}".format(
+                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
+                version=main_project_versions["libkiwix"]
+            ),
+            "lib/{libprefix}/libkiwix.so.{version}".format(
+                libprefix=LIB_PREFIX.get(PLATFORM_TARGET, "x86_64-linux-gnu"),
+                version=main_project_versions["libkiwix"][0]
+            ),
             "include/kiwix/**/*.h"
         ),
     ),

appveyor/install_xapian.cmd

@@ -1,6 +1,6 @@
 REM ========================================================
 REM Install xapian
-curl -fsSL -O http://mirror.download.kiwix.org/dev/xapian-core-1.4.18.zip || exit /b 1
+curl -fsSL -O http://mirror.download.kiwix.org/dev/kiwix-build/xapian-core-1.4.18.zip || exit /b 1
 7z x xapian-core-1.4.18.zip || exit /b 1
 cd xapian-core-1.4.18
 mkdir build

appveyor/install_zlib.cmd

@@ -1,6 +1,6 @@
 REM ========================================================
 REM Install zlib
-curl -fsSL -O http://mirror.download.kiwix.org/dev/zlib-1.2.12.meson.zip || exit /b 1
+curl -fsSL -O http://mirror.download.kiwix.org/dev/kiwix-build/zlib-1.2.12.meson.zip || exit /b 1
 7z x zlib-1.2.12.meson.zip || exit /b 1
 cd zlib-1.2.12
 meson . build --prefix %EXTRA_DIR% --default-library static --buildtype release || exit /b 1

kiwixbuild/buildenv.py

@@ -102,6 +102,8 @@ class BuildEnv:
         return os.path.isfile('/etc/debian_version')
 
     def _detect_libdir(self):
+        if self.platformInfo.libdir is not None:
+            return self.platformInfo.libdir
         if self._is_debianlike():
             try:
                 pc = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'],

kiwixbuild/platforms/android.py

@@ -12,6 +12,10 @@ class AndroidPlatformInfo(PlatformInfo):
     def __str__(self):
         return "android"
 
+    @property
+    def libdir(self):
+        return 'lib/{}'.format(self.arch_full)
+
     @property
     def binaries_name(self):
         arch_full = self.arch_full

kiwixbuild/platforms/base.py

@@ -24,6 +24,7 @@ class PlatformInfo(metaclass=_MetaPlatform):
     all_running_platforms = {}
     toolchain_names = []
     configure_option = ""
+    libdir = None
 
     @classmethod
     def get_platform(cls, name, targets=None):

kiwixbuild/utils.py

@@ -25,7 +25,7 @@ COLORS = {
 }
 
 
-REMOTE_PREFIX = 'http://mirror.download.kiwix.org/dev/'
+REMOTE_PREFIX = 'http://mirror.download.kiwix.org/dev/kiwix-build/'
 
 
 def which(name):

kiwixbuild/versions.py

@@ -39,7 +39,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = '76'
+base_deps_meta_version = '77'
 
 base_deps_versions = {
   'zlib' : '1.2.12',