From d1c8df0223ef51c468e233a370771b71b7e38680 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 23 Sep 2016 20:04:57 +0000
Subject: [PATCH] xcode 8.0
---
contrib/mobile/Android/AndroidManifest.xml | 4 ++--
contrib/mobile/drawContext.cpp | 6 ------
contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj | 12 ++++--------
contrib/mobile/iOS/Onelab/Onelab-Info.plist | 4 ++--
.../mobile/iOS/Onelab/ParametersViewController.mm | 2 ++
contrib/mobile/utils/ios_build.sh | 4 ++--
contrib/mobile/utils/iossimulator_build.sh | 4 ++--
7 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml
index f878b6b746..42ec5c5f5f 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="21"
- android:versionName="1.3.0"
+ android:versionCode="22"
+ android:versionName="1.3.1"
android:installLocation="auto" >
<uses-sdk android:minSdkVersion="14"
diff --git a/contrib/mobile/drawContext.cpp b/contrib/mobile/drawContext.cpp
index bcef800c73..7163dc3454 100644
--- a/contrib/mobile/drawContext.cpp
+++ b/contrib/mobile/drawContext.cpp
@@ -60,12 +60,6 @@ void drawContext::load(std::string filename)
// reset onelab database
onelab::server::instance()->clear();
- // hide the model checking menu
- onelab::number n("GetDP/}ModelCheck", 0.);
- n.setVisible(false);
- n.setNeverChanged(true);
- onelab::server::instance()->set(n);
-
// restore default options
GmshRestoreDefaultOptions();
diff --git a/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj b/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj
index 96537bccd0..c308fb445d 100644
--- a/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj
+++ b/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj
@@ -399,7 +399,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -433,7 +433,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -451,8 +451,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_OBJC_ARC = YES;
- CODE_SIGN_IDENTITY = "iPhone Distribution";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Onelab/frameworks",
@@ -460,7 +458,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch";
INFOPLIST_FILE = "Onelab/Onelab-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Onelab/frameworks/petsc.framework",
@@ -481,8 +479,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_OBJC_ARC = YES;
- CODE_SIGN_IDENTITY = "iPhone Distribution";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Onelab/frameworks",
@@ -490,7 +486,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch";
INFOPLIST_FILE = "Onelab/Onelab-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Onelab/frameworks/petsc.framework",
diff --git a/contrib/mobile/iOS/Onelab/Onelab-Info.plist b/contrib/mobile/iOS/Onelab/Onelab-Info.plist
index 0c7bec4171..9a43ca377b 100644
--- a/contrib/mobile/iOS/Onelab/Onelab-Info.plist
+++ b/contrib/mobile/iOS/Onelab/Onelab-Info.plist
@@ -35,11 +35,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.3.0</string>
+ <string>1.3.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.3.0.1</string>
+ <string>1.3.1.2</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIFileSharingEnabled</key>
diff --git a/contrib/mobile/iOS/Onelab/ParametersViewController.mm b/contrib/mobile/iOS/Onelab/ParametersViewController.mm
index 6afe395968..42a66cf253 100644
--- a/contrib/mobile/iOS/Onelab/ParametersViewController.mm
+++ b/contrib/mobile/iOS/Onelab/ParametersViewController.mm
@@ -216,6 +216,8 @@ NSString *GetSectionTitle(NSString *name)
// check for new/updated parameters (number)
for(int i = 0; i < number.size(); i++) {
if(!number[i].getVisible()) continue; // do not add invisible parameter
+ if(number[i].getName() == "GetDP/}ModelCheck") continue; // don't show model checking
+
NSString *name = [Utils getStringFromCString:number[i].getName().c_str()];
NSString *sectiontitle = GetSectionTitle(name);
Boolean found = false;
diff --git a/contrib/mobile/utils/ios_build.sh b/contrib/mobile/utils/ios_build.sh
index 4e358f3257..b77bfd43c8 100755
--- a/contrib/mobile/utils/ios_build.sh
+++ b/contrib/mobile/utils/ios_build.sh
@@ -34,7 +34,7 @@ mkdir -p $gmsh_svn/build_ios
cd $gmsh_svn/build_ios
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_ANN=1 -DENABLE_TETGEN=1 -DENABLE_KBIPACK=1 -DENABLE_GMP=0 -DENABLE_ZIPPER=1 ..
check
-$build_cmd OTHER_CFLAGS="-miphoneos-version-min=7.0 -fembed-bitcode" OTHER_CPLUSPLUSFLAGS="-miphoneos-version-min=7.0 -fembed-bitcode"
+$build_cmd OTHER_CFLAGS="-miphoneos-version-min=8.0 -fembed-bitcode" OTHER_CPLUSPLUSFLAGS="-miphoneos-version-min=8.0 -fembed-bitcode"
check
$headers_cmd
mkdir -p $gmsh_framework/Headers
@@ -49,7 +49,7 @@ mkdir -p $getdp_svn/build_ios
cd $getdp_svn/build_ios
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_framework/Headers/" -DGMSH_LIB="$gmsh_framework/Gmsh" ..
check
-$build_cmd OTHER_CFLAGS="-miphoneos-version-min=7.0 -fembed-bitcode" OTHER_CPLUSPLUSFLAGS="-miphoneos-version-min=7.0 -fembed-bitcode"
+$build_cmd OTHER_CFLAGS="-miphoneos-version-min=8.0 -fembed-bitcode" OTHER_CPLUSPLUSFLAGS="-miphoneos-version-min=8.0 -fembed-bitcode"
check
$headers_cmd
mkdir -p $getdp_framework/Headers
diff --git a/contrib/mobile/utils/iossimulator_build.sh b/contrib/mobile/utils/iossimulator_build.sh
index e48afb8e9a..68ed2cc396 100755
--- a/contrib/mobile/utils/iossimulator_build.sh
+++ b/contrib/mobile/utils/iossimulator_build.sh
@@ -34,7 +34,7 @@ mkdir -p $gmsh_svn/build_iossimulator
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_ANN=1 -DENABLE_TETGEN=1 -DENABLE_KBIPACK=1 -DENABLE_GMP=0 -DENABLE_ZIPPER=1 ..
check
-$build_cmd OTHER_CFLAGS="-mios-simulator-version-min=7.0" OTHER_CPLUSPLUSFLAGS="-mios-simulator-version-min=7.0"
+$build_cmd OTHER_CFLAGS="-mios-simulator-version-min=8.0" OTHER_CPLUSPLUSFLAGS="-mios-simulator-version-min=8.0"
check
$headers_cmd
mkdir -p $gmsh_framework/Headers
@@ -49,7 +49,7 @@ mkdir -p $getdp_svn/build_iossimulator
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_framework/Headers/" -DGMSH_LIB="$gmsh_framework/Gmsh" ..
check
-$build_cmd OTHER_CFLAGS="-mios-simulator-version-min=7.0" OTHER_CPLUSPLUSFLAGS="-mios-simulator-version-min=7.0"
+$build_cmd OTHER_CFLAGS="-mios-simulator-version-min=8.0" OTHER_CPLUSPLUSFLAGS="-mios-simulator-version-min=8.0"
check
$headers_cmd
mkdir -p $getdp_framework/Headers
--
GitLab