From 3eb335ba8aeb245e36503e7169bc12e3cdef4323 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 22 Jun 2014 18:29:20 +0000
Subject: [PATCH] finetuning
---
contrib/mobile/utils/ant.properties | 4 ++++
contrib/mobile/utils/onelab_android_build.sh | 9 +++++----
contrib/mobile/utils/onelab_ios_build.sh | 2 +-
contrib/mobile/utils/onelab_iossimulator_build.sh | 2 +-
4 files changed, 11 insertions(+), 6 deletions(-)
create mode 100644 contrib/mobile/utils/ant.properties
diff --git a/contrib/mobile/utils/ant.properties b/contrib/mobile/utils/ant.properties
new file mode 100644
index 0000000000..3277dc2508
--- /dev/null
+++ b/contrib/mobile/utils/ant.properties
@@ -0,0 +1,4 @@
+key.store=/Users/geuzaine/.geuzaine.keystore
+key.store.password=Gmsh2013
+key.alias=cgeuzaine
+key.alias.password=Gmsh2013
diff --git a/contrib/mobile/utils/onelab_android_build.sh b/contrib/mobile/utils/onelab_android_build.sh
index 6a2fb3d19f..f26d162764 100755
--- a/contrib/mobile/utils/onelab_android_build.sh
+++ b/contrib/mobile/utils/onelab_android_build.sh
@@ -1,11 +1,12 @@
#!/usr/bin/env bash
-android_ndk="${HOME}/android-ndk-r8b/"
-android_sdk="${HOME}/android-sdk/"
-
gmsh_svn="${HOME}/src/gmsh"
getdp_svn="${HOME}/src/getdp"
-petsc_lib="${HOME}/petsc"
+frameworks_dir="${HOME}/src/gmsh/contrib/mobile/frameworks_android"
+
+petsc_lib="$frameworks_dir/petsc"
+android_ndk="${HOME}/android-ndk-r8b/"
+android_sdk="${HOME}/android-sdk/"
cmake_default="-DDEFAULT=0 -DCMAKE_TOOLCHAIN_FILE=$gmsh_svn/contrib/mobile/utils/Android.cmake -DENABLE_BUILD_ANDROID=1 -DCMAKE_BUILD_TYPE=Release"
cmake_thread=6
diff --git a/contrib/mobile/utils/onelab_ios_build.sh b/contrib/mobile/utils/onelab_ios_build.sh
index 22f03e0ad9..b1316d6616 100755
--- a/contrib/mobile/utils/onelab_ios_build.sh
+++ b/contrib/mobile/utils/onelab_ios_build.sh
@@ -2,7 +2,7 @@
gmsh_svn="${HOME}/src/gmsh/"
getdp_svn="${HOME}/src/getdp/"
-frameworks_dir="${HOME}/src/gmsh/contrib/mobile/frameworks/"
+frameworks_dir="${HOME}/src/gmsh/contrib/mobile/frameworks_ios/"
petsc_framework="$frameworks_dir/petsc.framework"
slepc_framework="$frameworks_dir/slepc.framework"
diff --git a/contrib/mobile/utils/onelab_iossimulator_build.sh b/contrib/mobile/utils/onelab_iossimulator_build.sh
index 1e9dde115d..a32c30c704 100755
--- a/contrib/mobile/utils/onelab_iossimulator_build.sh
+++ b/contrib/mobile/utils/onelab_iossimulator_build.sh
@@ -2,7 +2,7 @@
gmsh_svn="${HOME}/src/gmsh/"
getdp_svn="${HOME}/src/getdp/"
-frameworks_dir="${HOME}/src/gmsh/contrib/mobile/frameworks_simulator/"
+frameworks_dir="${HOME}/src/gmsh/contrib/mobile/frameworks_iossimulator/"
petsc_framework="$frameworks_dir/petsc.framework"
slepc_framework="$frameworks_dir/slepc.framework"
--
GitLab