瀏覽代碼

Add more Xcode versions to the objc build script.

Thomas Van Lenten 7 年之前
父節點
當前提交
d52f2bb9e4
共有 1 個文件被更改,包括 14 次插入2 次删除
  1. 14 2
      objectivec/DevTools/full_mac_build.sh

+ 14 - 2
objectivec/DevTools/full_mac_build.sh

@@ -268,7 +268,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
           -disable-concurrent-testing
           -disable-concurrent-testing
       )
       )
       ;;
       ;;
-    9.3* )
+    9.[3-4]* )
       XCODEBUILD_TEST_BASE_IOS+=(
       XCODEBUILD_TEST_BASE_IOS+=(
           # Xcode 9.3 chokes targeting iOS 8.x - http://www.openradar.me/39335367
           # Xcode 9.3 chokes targeting iOS 8.x - http://www.openradar.me/39335367
           -destination "platform=iOS Simulator,name=iPhone 4s,OS=9.0" # 32bit
           -destination "platform=iOS Simulator,name=iPhone 4s,OS=9.0" # 32bit
@@ -277,11 +277,20 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then
           -disable-concurrent-testing
           -disable-concurrent-testing
       )
       )
       ;;
       ;;
+    10.[0-1]* )
+      XCODEBUILD_TEST_BASE_IOS+=(
+          -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit
+          -destination "platform=iOS Simulator,name=iPhone 7,OS=latest" # 64bit
+          # 10.x also seems to often fail running destinations in parallel (with
+          # 32bit one include atleast)
+          -disable-concurrent-destination-testing
+      )
+      ;;
     * )
     * )
       echo ""
       echo ""
       echo "ATTENTION: Time to update the simulator targets for Xcode ${XCODE_VERSION}"
       echo "ATTENTION: Time to update the simulator targets for Xcode ${XCODE_VERSION}"
       echo ""
       echo ""
-      echo "Build aborted!"
+      echo "ERROR: Build aborted!"
       exit 2
       exit 2
       ;;
       ;;
   esac
   esac
@@ -334,3 +343,6 @@ if [[ "${DO_OBJC_CONFORMANCE_TESTS}" == "yes" ]] ; then
   wrapped_make -j "${NUM_MAKE_JOBS}" test_objc
   wrapped_make -j "${NUM_MAKE_JOBS}" test_objc
   cd ..
   cd ..
 fi
 fi
+
+echo ""
+echo "$(basename "${0}"): Success!"