diff options
| author | Timofey <t.danshin@corp.mail.ru> | 2016-11-28 20:08:21 +0300 |
|---|---|---|
| committer | Timofey <t.danshin@corp.mail.ru> | 2016-11-30 15:45:42 +0300 |
| commit | d36d371501195833d8b94f368226891c2d307722 (patch) | |
| tree | 0cf67c40fc4b7f0c14dfde4dbca01f243aac6f9b /tools | |
| parent | 7ff477ba4c846d7dd36f82ff7448cd42487cce16 (diff) | |
Changed the path to the compiled libraries directory
Got rid of "production" and "simulator"
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/autobuild/ios_cmake.sh | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/tools/autobuild/ios_cmake.sh b/tools/autobuild/ios_cmake.sh index c90f8eeae6..919278f980 100755 --- a/tools/autobuild/ios_cmake.sh +++ b/tools/autobuild/ios_cmake.sh @@ -10,9 +10,24 @@ if [[ $# < 1 ]]; then fi CONFIGURATION="$1" -source "$MY_PATH/build.sh" source "$MY_PATH/detect_xcode.sh" +GetCPUCores() { + case "$OSTYPE" in + # it's GitBash under Windows + cygwin) echo $NUMBER_OF_PROCESSORS + ;; + linux-gnu) grep -c ^processor /proc/cpuinfo 2>/dev/null + ;; + darwin*) sysctl -n hw.ncpu + ;; + *) echo "Unsupported platform in $0" + exit 1 + ;; + esac + return 0 +} + BuildCmake() { ( SHADOW_DIR="$1" @@ -22,7 +37,7 @@ BuildCmake() { cd "$SHADOW_DIR" pwd echo "Launching cmake..." - CC=$CC CXX=$CXX cmake -r "$BUILD_TYPE" -DCMAKE_OSX_ARCHITECTURES=$ARCH -DNO_TESTS=TRUE -DPLATFORM=$PLATFORM "$(StripCygwinPrefix $MY_PATH)/../.." + CC=$CC CXX=$CXX cmake -r "$BUILD_TYPE" -DCMAKE_OSX_ARCHITECTURES=$ARCH -DNO_TESTS=TRUE -DPLATFORM=$PLATFORM "$MY_PATH/../.." # make clean > /dev/null || true make -j $(GetCPUCores) VERBOSE=1 ) @@ -39,10 +54,10 @@ export SDK_ROOT FINAL_PATH_COMPONENT="debug" SHADOW_DIR="$MY_PATH/../../../omim-iphone-cmake" -if [[ $CONFIGURATION == *release* || $CONFIGURATION == *production* ]]; then +if [[ $CONFIGURATION == *release* ]]; then BUILD_TYPE="Release" FINAL_PATH_COMPONENT="release" -elif [[ $CONFIGURATION == *debug* || $CONFIGURATION == "simulator" ]]; then +elif [[ $CONFIGURATION == *debug* ]]; then BUILD_TYPE="Debug" FINAL_PATH_COMPONENT="debug" else |