From 23e2cee26fb7cb5c823cae78a990c8300229badc Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 25 Jun 2014 09:54:34 +0000
Subject: [PATCH] fine tuning
---
contrib/mobile/utils/onelab_android_build.sh | 4 +-
contrib/mobile/utils/onelab_ios_build.sh | 4 +-
.../mobile/utils/onelab_iossimulator_build.sh | 40 ++++++++++++-------
3 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/contrib/mobile/utils/onelab_android_build.sh b/contrib/mobile/utils/onelab_android_build.sh
index 0ced608fd3..478d79f0b0 100755
--- a/contrib/mobile/utils/onelab_android_build.sh
+++ b/contrib/mobile/utils/onelab_android_build.sh
@@ -48,9 +48,7 @@ if [ ! -d "$getdp_svn/build_android" ] || [ ! -f "$getdp_svn/build_android/CMake
mkdir $getdp_svn/build_android
fi
cd $getdp_svn/build_android
-export PETSC_DIR=
-export PETSC_ARCH=
-cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_SHARED=1 -DENABLE_GMSH=1 -DENABLE_LEGACY=1 -DENABLE_PETSC=1 -DPETSC_INC="$petsc_lib/Headers;$petsc_lib/Headers/mpiuni" -DPETSC_LIBS="$petsc_lib/libpetsc.so" -DGMSH_INC="$gmsh_svn/build_android/Headers/" -DGMSH_LIB="$gmsh_svn/build_android/libs/libGmsh.so" -DBLAS_LAPACK_LIBRARIES="$petsc_lib/libf2cblas.so;$petsc_lib/libf2clapack.so" ..
+PETSC_DIR= PETSC_ARCH= SLEPC_DIR= cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_SHARED=1 -DENABLE_GMSH=1 -DENABLE_LEGACY=1 -DENABLE_PETSC=1 -DPETSC_INC="$petsc_lib/Headers;$petsc_lib/Headers/mpiuni" -DPETSC_LIBS="$petsc_lib/libpetsc.so" -DGMSH_INC="$gmsh_svn/build_android/Headers/" -DGMSH_LIB="$gmsh_svn/build_android/libs/libGmsh.so" -DBLAS_LAPACK_LIBRARIES="$petsc_lib/libf2cblas.so;$petsc_lib/libf2clapack.so" ..
check
make androidGetdp -j$cmake_thread
check
diff --git a/contrib/mobile/utils/onelab_ios_build.sh b/contrib/mobile/utils/onelab_ios_build.sh
index 48e65e6b1e..73e5b8eeb0 100755
--- a/contrib/mobile/utils/onelab_ios_build.sh
+++ b/contrib/mobile/utils/onelab_ios_build.sh
@@ -45,9 +45,7 @@ function build_getdp {
mkdir $getdp_svn/build_ios_$1
fi
cd $getdp_svn/build_ios_$1
- export PETSC_DIR=
- export PETSC_ARCH=
- cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_GMSH=1 -DENABLE_LEGACY=1 -DENABLE_PETSC=1 -DPETSC_INC="$petsc_framework/Headers/" -DPETSC_LIBS="$petsc_framework/petsc" -DENABLE_SLEPC=1 -DSLEPC_INC="$slepc_framework/Headers/" -DSLEPC_LIB="$slepc_framework/slepc" -DGMSH_INC="$gmsh_svn/build_ios_$1/Headers/" -DGMSH_LIB="$gmsh_svn/build_ios_$1/Release-iphoneos/libGmsh.a" -DCMAKE_OSX_ARCHITECTURES="$1" ..
+ PETSC_DIR= PETSC_ARCH= SLEPC_DIR= cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_GMSH=1 -DENABLE_LEGACY=1 -DENABLE_PETSC=1 -DPETSC_INC="$petsc_framework/Headers/" -DPETSC_LIBS="$petsc_framework/petsc" -DENABLE_SLEPC=1 -DSLEPC_INC="$slepc_framework/Headers/" -DSLEPC_LIB="$slepc_framework/slepc" -DGMSH_INC="$gmsh_svn/build_ios_$1/Headers/" -DGMSH_LIB="$gmsh_svn/build_ios_$1/Release-iphoneos/libGmsh.a" -DCMAKE_OSX_ARCHITECTURES="$1" ..
check
$build_cmd
check
diff --git a/contrib/mobile/utils/onelab_iossimulator_build.sh b/contrib/mobile/utils/onelab_iossimulator_build.sh
index 87c37dec20..77ea8e6300 100755
--- a/contrib/mobile/utils/onelab_iossimulator_build.sh
+++ b/contrib/mobile/utils/onelab_iossimulator_build.sh
@@ -9,36 +9,46 @@ slepc_framework="$frameworks_dir/slepc.framework"
cmake_default="-DDEFAULT=0 -DCMAKE_C_FLAGS='-m32' -DCMAKE_CXX_FLAGS='-m32'"
-build_cmd="make framework -j4"
+build_cmd="make lib -j4"
+headers_cmd="make get_headers"
function build_gmsh {
- if [ ! -d "$gmsh_svn/build_ios_$1" ]; then
- mkdir $gmsh_svn/build_ios_$1
+ if [ ! -d "$gmsh_svn/build_iossimulator" ]; then
+ mkdir $gmsh_svn/build_iossimulator
fi
- cd $gmsh_svn/build_ios_$1
+ cd $gmsh_svn/build_iossimulator
cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_TETGEN=1 ..
$build_cmd
+ $headers_cmd
cd -
}
function build_getdp {
- if [ ! -d "$getdp_svn/build_ios_$1" ]; then
- mkdir $getdp_svn/build_ios_$1
+ if [ ! -d "$getdp_svn/build_iossimulator" ]; then
+ mkdir $getdp_svn/build_iossimulator
fi
- cd $getdp_svn/build_ios_$1
- PETSC_DIR= PETSC_ARCH= SLEPC_DIR= cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_GMSH=1 -DENABLE_LEGACY=1 -DENABLE_PETSC=1 -DPETSC_INC="$petsc_framework/Headers/" -DPETSC_LIBS="$petsc_framework/petsc" -DENABLE_SLEPC=1 -DSLEPC_INC="$slepc_framework/Headers/" -DSLEPC_LIB="$slepc_framework/slepc" -DGMSH_INC="$gmsh_svn/build_ios_$1/Gmsh.framework/Headers/" -DGMSH_LIB="$gmsh_svn/build_ios_$1/Gmsh.framework/Gmsh" ..
+ cd $getdp_svn/build_iossimulator
+ PETSC_DIR= PETSC_ARCH= SLEPC_DIR= cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_LIB=1 -DENABLE_GMSH=1 -DENABLE_LEGACY=1 -DENABLE_PETSC=1 -DPETSC_INC="$petsc_framework/Headers/" -DPETSC_LIBS="$petsc_framework/petsc" -DENABLE_SLEPC=1 -DSLEPC_INC="$slepc_framework/Headers/" -DSLEPC_LIB="$slepc_framework/slepc" -DGMSH_INC="$gmsh_svn/build_iossimulator/Headers/" -DGMSH_LIB="$gmsh_svn/build_iossimulator/libGmsh.a" ..
$build_cmd
+ $headers_cmd
cd -
}
-# build gmsh's framework
+# build gmsh framework
cd $gmsh_svn && svn up
-build_gmsh x86
-cp -R $gmsh_svn/build_ios_x86/Gmsh.framework/ $frameworks_dir/Gmsh.framework
-
-# build getdp's framework
+build_gmsh
+mkdir -p $frameworks_dir/Gmsh.framework/Headers
+cp $gmsh_svn/build_iossimulator/libGmsh.a $frameworks_dir/Gmsh.framework/Gmsh
+cd $frameworks_dir/Gmsh.framework/Headers
+cp $gmsh_svn/build_iossimulator/Headers/gmsh/* .
+ln -s . gmsh
+
+# build getdp framework
cd $getdp_svn && svn up
-build_getdp x86
-cp -R $getdp_svn/build_ios_x86/GetDP.framework/ $frameworks_dir/GetDP.framework
+build_getdp
+mkdir -p $frameworks_dir/GetDP.framework/Headers
+cp $getdp_svn/build_iossimulator/libGetDP.a $frameworks_dir/GetDP.framework/GetDP
+cd $frameworks_dir/GetDP.framework/Headers
+cp $getdp_svn/build_iossimulator/Headers/getdp/* .
# create xcode project
mkdir $gmsh_svn/contrib/mobile/build_iossimulator
--
GitLab