Skip to content
Snippets Groups Projects
Commit 09525e62 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

tweak

parent 8df7db2f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
contrib/mobile/utils/android_build.sh
+ 9
− 9
View file @ 09525e62
...@@ -37,7 +37,7 @@ fi ...@@ -37,7 +37,7 @@ fi
cd $gmsh_svn/build_android cd $gmsh_svn/build_android
cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_SHARED=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_ANN=1 -DENABLE_TETGEN=1 -DENABLE_KBIPACK=1 -DENABLE_GMP=0 -DENABLE_ZIPPER=1 -DBLAS_LIB="$petsc_lib/libf2cblas.so" -DLAPACK_LIB="$petsc_lib/libf2clapack.so" .. cmake $cmake_default -DENABLE_BLAS_LAPACK=1 -DENABLE_BUILD_SHARED=1 -DENABLE_MATHEX=1 -DENABLE_MESH=1 -DENABLE_ONELAB=1 -DENABLE_PARSER=1 -DENABLE_POST=1 -DENABLE_ANN=1 -DENABLE_TETGEN=1 -DENABLE_KBIPACK=1 -DENABLE_GMP=0 -DENABLE_ZIPPER=1 -DBLAS_LIB="$petsc_lib/libf2cblas.so" -DLAPACK_LIB="$petsc_lib/libf2clapack.so" ..
check check
make androidGmsh VERBOSE=1 -j$cmake_thread make androidGmsh -j$cmake_thread
check check
make get_headers make get_headers
check check
...@@ -51,7 +51,7 @@ fi ...@@ -51,7 +51,7 @@ fi
cd $getdp_svn/build_android cd $getdp_svn/build_android
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" -DENABLE_SLEPC=1 -DSLEPC_INC="$slepc_lib/Headers/" -DSLEPC_LIB="$slepc_lib/libslepc.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" -DENABLE_SLEPC=1 -DSLEPC_INC="$slepc_lib/Headers/" -DSLEPC_LIB="$slepc_lib/libslepc.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 check
make androidGetdp VERBOSE=1 -j$cmake_thread make androidGetdp -j$cmake_thread
check check
make get_headers make get_headers
check check
...@@ -89,20 +89,20 @@ if [ $# -eq 1 ] ; then ...@@ -89,20 +89,20 @@ if [ $# -eq 1 ] ; then
cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-128x128.png res/drawable-hdpi/ic_launcher.png cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-128x128.png res/drawable-hdpi/ic_launcher.png
cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-64x64.png res/drawable-mdpi/ic_launcher.png cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-64x64.png res/drawable-mdpi/ic_launcher.png
cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-48x48.png res/drawable-ldpi/ic_launcher.png cp $HOME/tex/proposals/bbemg/icons/bbemg-logo-48x48.png res/drawable-ldpi/ic_launcher.png
$android_sdk/tools/android update project --name $appname --path . --target 1 $android_sdk/tools/android update project --name $appname --path . --target 1 --subprojects
else else
cd Onelab cd Onelab
$android_sdk/tools/android update project --name Onelab --path . --target 1 $android_sdk/tools/android update project --name Onelab --path . --target 1 --subprojects
fi fi
check check
if [ ! -f "ant.properties" ]; then
cp $gmsh_svn/contrib/mobile/utils/ant.properties .
fi
ant release ant release
check check
# to sign the APK: # to install on the device:
# cp utils/ant.properties build_android_Onelab/Onelab/
# to re-install on the device:
# ~/android-sdk/platform-tools/adb install -r build_android_Onelab/Onelab/bin/Onelab-release.apk # ~/android-sdk/platform-tools/adb install -r build_android_Onelab/Onelab/bin/Onelab-release.apk
# to launch the app on the device: # to launch the app on the device:
...@@ -111,5 +111,5 @@ check ...@@ -111,5 +111,5 @@ check
# to debug and check the log: # to debug and check the log:
# ~/android-sdk/tools/ddms # ~/android-sdk/tools/ddms
# see stack traces after crashes: # to see stack traces after crashes:
# ~/android-sdk/platform-tools/adb logcat | ~/android-ndk-r8b/ndk-stack -sym build_android_Onelab/ # ~/android-sdk/platform-tools/adb logcat | ~/android-ndk-r8b/ndk-stack -sym build_android_Onelab/
contrib/mobile/utils/ios_build.sh
+ 2
− 2
View file @ 09525e62
...@@ -17,8 +17,8 @@ getdp_framework="$frameworks_dir/GetDP.framework" ...@@ -17,8 +17,8 @@ getdp_framework="$frameworks_dir/GetDP.framework"
cmake_default="-DDEFAULT=0 -DCMAKE_TOOLCHAIN_FILE=$gmsh_svn/contrib/mobile/utils/iOS.cmake -DIOS_PLATFORM=OS -DENABLE_BUILD_IOS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=armv7;armv7s;arm64 -GXcode" cmake_default="-DDEFAULT=0 -DCMAKE_TOOLCHAIN_FILE=$gmsh_svn/contrib/mobile/utils/iOS.cmake -DIOS_PLATFORM=OS -DENABLE_BUILD_IOS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=armv7;armv7s;arm64 -GXcode"
build_cmd="xcodebuild -verbose -target lib -configuration Release" build_cmd="xcodebuild -target lib -configuration Release"
headers_cmd="xcodebuild -verbose -target get_headers -configuration Release" headers_cmd="xcodebuild -target get_headers -configuration Release"
function check { function check {
return_code=$? return_code=$?
......
contrib/mobile/utils/iossimulator_build.sh
+ 2
− 2
View file @ 09525e62
...@@ -17,8 +17,8 @@ getdp_framework="$frameworks_dir/GetDP.framework" ...@@ -17,8 +17,8 @@ getdp_framework="$frameworks_dir/GetDP.framework"
cmake_default="-DDEFAULT=0 -DCMAKE_TOOLCHAIN_FILE=$gmsh_svn/contrib/mobile/utils/iOS.cmake -DIOS_PLATFORM=SIMULATOR -DENABLE_BUILD_IOS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=i386;x86_64 -GXcode" cmake_default="-DDEFAULT=0 -DCMAKE_TOOLCHAIN_FILE=$gmsh_svn/contrib/mobile/utils/iOS.cmake -DIOS_PLATFORM=SIMULATOR -DENABLE_BUILD_IOS=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=i386;x86_64 -GXcode"
build_cmd="xcodebuild -verbose -target lib -configuration Release OTHER_CPLUSPLUSFLAGS=\"-mios-simulator-version-min=7.0\"" build_cmd="xcodebuild -target lib -configuration Release OTHER_CPLUSPLUSFLAGS=\"-mios-simulator-version-min=7.0\""
headers_cmd="xcodebuild -verbose -target get_headers -configuration Release" headers_cmd="xcodebuild -target get_headers -configuration Release"
function check { function check {
return_code=$? return_code=$?
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment