From c6cc1ce309ca2f3b09b83dc64a98d8abf05608c2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 13 Sep 2015 07:38:59 +0000
Subject: [PATCH]
---
contrib/mobile/Android/AndroidManifest.xml | 4 ++--
contrib/mobile/utils/onelab_android_build.sh | 7 -------
contrib/mobile/utils/petsc_reconfigure_ios_real.py | 7 +++++++
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml
index 4299db5d42..964ccbdf4b 100644
--- a/contrib/mobile/Android/AndroidManifest.xml
+++ b/contrib/mobile/Android/AndroidManifest.xml
@@ -1,7 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.geuz.onelab"
- android:versionCode="11"
- android:versionName="1.0.12"
+ android:versionCode="12"
+ android:versionName="1.1.0"
android:installLocation="auto" >
<uses-sdk android:minSdkVersion="14"
diff --git a/contrib/mobile/utils/onelab_android_build.sh b/contrib/mobile/utils/onelab_android_build.sh
index 48c623d270..cb1faa1841 100755
--- a/contrib/mobile/utils/onelab_android_build.sh
+++ b/contrib/mobile/utils/onelab_android_build.sh
@@ -20,13 +20,6 @@ function check {
fi
}
-# PETSc and BLAS/LAPACK
-echo $petsc_lib/libpetsc.so
-if [ ! -f "$petsc_lib/libpetsc.so" ] || [ ! -f "$petsc_lib/libf2clapack.so" ] || [ ! -f "$petsc_lib/libf2cblas.so" ] || [ ! -d "$petsc_lib/Headers/" ]; then
- echo -e "ERROR: Need BLAS (f2c), LAPACK (f2c) and PETSc\ncheck android_petsc_reconfigure-armv7-android-linux.py for compile options\n"
- exit 1
-fi
-
export ANDROID_NDK=$android_ndk
# Gmsh
diff --git a/contrib/mobile/utils/petsc_reconfigure_ios_real.py b/contrib/mobile/utils/petsc_reconfigure_ios_real.py
index d5068074d6..51479f4dd8 100755
--- a/contrib/mobile/utils/petsc_reconfigure_ios_real.py
+++ b/contrib/mobile/utils/petsc_reconfigure_ios_real.py
@@ -1,4 +1,11 @@
#!/Users/geuzaine/anaconda/bin/python
+
+######## FOR PETSC 3.6.0
+########## You will need to compile 3 times, with arch=arm64, armv7, armv7s)
+########## and lipo the 3 libs
+########## I had to remove sys.exit(0) after message saying ".reconfigure..."
+########## in config/BuildSystem/config/framework.py"
+
if __name__ == '__main__':
import sys
import os
--
GitLab