diff --git a/contrib/mobile/CMakeLists.txt b/contrib/mobile/CMakeLists.txt index d3effcd3ede73a36653e9d82a6301652753d365d..457a27b7c37765042bb4d55eaab3884aac65e9c1 100644 --- a/contrib/mobile/CMakeLists.txt +++ b/contrib/mobile/CMakeLists.txt @@ -13,10 +13,16 @@ if(APPNAME) else(APPNAME) set(APPNAME Onelab) endif(APPNAME) - + # find all benchmarks who provide infos.xml -find_path(BENCHMARKSDIR benchmarks/) -file(GLOB BENCHMARKSDIR ${BENCHMARKSDIR}/benchmarks/*) +if("${APPNAME}" STREQUAL "BBEMG") + find_path(BENCHMARKSDIR benchmarks_private/) + file(GLOB BENCHMARKSDIR ${BENCHMARKSDIR}/benchmarks_private/bbemg*) +else("${APPNAME}" STREQUAL "BBEMG") + find_path(BENCHMARKSDIR benchmarks/) + file(GLOB BENCHMARKSDIR ${BENCHMARKSDIR}/benchmarks/*) +endif("${APPNAME}" STREQUAL "BBEMG") + foreach(SUBDIR ${BENCHMARKSDIR}) if(IS_DIRECTORY ${SUBDIR}) file(GLOB INFOSFILE ${SUBDIR}/infos.xml) @@ -117,13 +123,20 @@ if(ENABLE_BUILD_IOS_EMULATOR OR ENABLE_BUILD_IOS) endforeach(IMG) endforeach(DIR) - # if(APPNAME NOT EQUAL Onelab) - # add custom command in target xcodeProject that: - # modifies project.pbxproj - # modifies ipad/iphone story board - # using sed - # copies new image assets - # endif() + if("${APPNAME}" STREQUAL "BBEMG") + add_custom_command(TARGET xcodeProject POST_BUILD COMMAND + sed -e \"s|Onelab|BBEMG|\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG.xcodeproj/project.pbxproj") + add_custom_command(TARGET xcodeProject POST_BUILD COMMAND + sed -e \"s|Images.xcassets|ImagesBBEMG.xcassets|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG.xcodeproj/project.pbxproj") + add_custom_command(TARGET xcodeProject POST_BUILD COMMAND + sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/en.lproj/iPhoneiPodStoryboard.storyboard") + add_custom_command(TARGET xcodeProject POST_BUILD COMMAND + sed -e \"s|ONELAB|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/en.lproj/iPadStoryboard.storyboard") + add_custom_command(TARGET xcodeProject POST_BUILD COMMAND + sed -e \"s|Onelab/Mobile|BBEMG|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/AboutViewController.mm") + add_custom_command(TARGET xcodeProject POST_BUILD COMMAND + sed -e \"s|onelab.info|www.bbemg.be|g\" -i \"\" "${CMAKE_CURRENT_BINARY_DIR}/BBEMG/BBEMG/AboutViewController.mm") + endif("${APPNAME}" STREQUAL "BBEMG") message(STATUS "") message(STATUS "${APPNAME} for iOS successfully configured:") diff --git a/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj b/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj index 9387ffc61f17b15c1502f80b8723a74ee6540113..5617224b2c0398730ef325fba3d280adb9710ce7 100644 --- a/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj +++ b/contrib/mobile/iOS/Onelab.xcodeproj/project.pbxproj @@ -275,7 +275,7 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0500; - ORGANIZATIONNAME = "Maxime Graulich"; + ORGANIZATIONNAME = "Christophe Geuzaine"; TargetAttributes = { 9C9608351712C16300E1D4A0 = { DevelopmentTeam = 7KGA566932; diff --git a/contrib/mobile/utils/make_icon_ios.sh b/contrib/mobile/utils/make_icon_ios.sh index 64338fd265b71b91696503202f975fcd08cd1046..5a85cb76342a8f867a8fea193028b009563d13ad 100755 --- a/contrib/mobile/utils/make_icon_ios.sh +++ b/contrib/mobile/utils/make_icon_ios.sh @@ -1,9 +1,12 @@ #!/bin/sh +source=../../../utils/icons/gmsh_mobile_master.png +#source=../../../utils/icons/bbemg-twitter.png + mkdir -p ios.iconset # App icons (iPad) -convert -scale 152 ../../../utils/icons/gmsh_mobile_master.png ios.iconset/icon_app_ipad_retina.png -convert -scale 76 ../../../utils/icons/gmsh_mobile_master.png ios.iconset/icon_app_ipad.png +convert -scale 152 ${source} ios.iconset/icon_app_ipad_retina.png +convert -scale 76 ${source} ios.iconset/icon_app_ipad.png # App icon (iPhone) -convert -scale 120 ../../../utils/icons/gmsh_mobile_master.png ios.iconset/icon_app_iphone_retina.png +convert -scale 120 ${source} ios.iconset/icon_app_iphone_retina.png