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

xcode 8.0

parent 4d859b9c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 22 deletions
contrib/mobile/Android/AndroidManifest.xml
+ 2
− 2
View file @ d1c8df02
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.geuz.onelab" package="org.geuz.onelab"
android:versionCode="21" android:versionCode="22"
android:versionName="1.3.0" android:versionName="1.3.1"
android:installLocation="auto" > android:installLocation="auto" >
<uses-sdk android:minSdkVersion="14" <uses-sdk android:minSdkVersion="14"
......
contrib/mobile/drawContext.cpp
+ 0
− 6
View file @ d1c8df02
...@@ -60,12 +60,6 @@ void drawContext::load(std::string filename) ...@@ -60,12 +60,6 @@ void drawContext::load(std::string filename)
// reset onelab database // reset onelab database
onelab::server::instance()->clear(); 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 // restore default options
GmshRestoreDefaultOptions(); GmshRestoreDefaultOptions();
......
contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj
+ 4
− 8
View file @ d1c8df02
...@@ -399,7 +399,7 @@ ...@@ -399,7 +399,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
...@@ -433,7 +433,7 @@ ...@@ -433,7 +433,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE = "";
"PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
...@@ -451,8 +451,6 @@ ...@@ -451,8 +451,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Onelab/frameworks", "$(PROJECT_DIR)/Onelab/frameworks",
...@@ -460,7 +458,7 @@ ...@@ -460,7 +458,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch"; GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch";
INFOPLIST_FILE = "Onelab/Onelab-Info.plist"; INFOPLIST_FILE = "Onelab/Onelab-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Onelab/frameworks/petsc.framework", "$(PROJECT_DIR)/Onelab/frameworks/petsc.framework",
...@@ -481,8 +479,6 @@ ...@@ -481,8 +479,6 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_ARC = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Onelab/frameworks", "$(PROJECT_DIR)/Onelab/frameworks",
...@@ -490,7 +486,7 @@ ...@@ -490,7 +486,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch"; GCC_PREFIX_HEADER = "Onelab/Onelab-Prefix.pch";
INFOPLIST_FILE = "Onelab/Onelab-Info.plist"; INFOPLIST_FILE = "Onelab/Onelab-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 7.0; IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
"$(PROJECT_DIR)/Onelab/frameworks/petsc.framework", "$(PROJECT_DIR)/Onelab/frameworks/petsc.framework",
......
contrib/mobile/iOS/Onelab/Onelab-Info.plist
+ 2
− 2
View file @ d1c8df02
...@@ -35,11 +35,11 @@ ...@@ -35,11 +35,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.3.0</string> <string>1.3.1</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.3.0.1</string> <string>1.3.1.2</string>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>
<key>UIFileSharingEnabled</key> <key>UIFileSharingEnabled</key>
......
contrib/mobile/iOS/Onelab/ParametersViewController.mm
+ 2
− 0
View file @ d1c8df02
...@@ -216,6 +216,8 @@ NSString *GetSectionTitle(NSString *name) ...@@ -216,6 +216,8 @@ NSString *GetSectionTitle(NSString *name)
// check for new/updated parameters (number) // check for new/updated parameters (number)
for(int i = 0; i < number.size(); i++) { for(int i = 0; i < number.size(); i++) {
if(!number[i].getVisible()) continue; // do not add invisible parameter 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 *name = [Utils getStringFromCString:number[i].getName().c_str()];
NSString *sectiontitle = GetSectionTitle(name); NSString *sectiontitle = GetSectionTitle(name);
Boolean found = false; Boolean found = false;
......
contrib/mobile/utils/ios_build.sh
+ 2
− 2
View file @ d1c8df02
...@@ -34,7 +34,7 @@ mkdir -p $gmsh_svn/build_ios ...@@ -34,7 +34,7 @@ mkdir -p $gmsh_svn/build_ios
cd $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 .. 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 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 check
$headers_cmd $headers_cmd
mkdir -p $gmsh_framework/Headers mkdir -p $gmsh_framework/Headers
...@@ -49,7 +49,7 @@ mkdir -p $getdp_svn/build_ios ...@@ -49,7 +49,7 @@ mkdir -p $getdp_svn/build_ios
cd $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" .. 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 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 check
$headers_cmd $headers_cmd
mkdir -p $getdp_framework/Headers mkdir -p $getdp_framework/Headers
......
contrib/mobile/utils/iossimulator_build.sh
+ 2
− 2
View file @ d1c8df02
...@@ -34,7 +34,7 @@ mkdir -p $gmsh_svn/build_iossimulator ...@@ -34,7 +34,7 @@ mkdir -p $gmsh_svn/build_iossimulator
cd $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 .. 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 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 check
$headers_cmd $headers_cmd
mkdir -p $gmsh_framework/Headers mkdir -p $gmsh_framework/Headers
...@@ -49,7 +49,7 @@ mkdir -p $getdp_svn/build_iossimulator ...@@ -49,7 +49,7 @@ mkdir -p $getdp_svn/build_iossimulator
cd $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" .. 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 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 check
$headers_cmd $headers_cmd
mkdir -p $getdp_framework/Headers mkdir -p $getdp_framework/Headers
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment