Index: third_party/protobuf/objectivec/DevTools/full_mac_build.sh |
diff --git a/third_party/protobuf/objectivec/DevTools/full_mac_build.sh b/third_party/protobuf/objectivec/DevTools/full_mac_build.sh |
index 709aae0a4935baf99479159aced657c82e06f369..ff51d9f01699a1d716500212f19a916a93dfefe5 100755 |
--- a/third_party/protobuf/objectivec/DevTools/full_mac_build.sh |
+++ b/third_party/protobuf/objectivec/DevTools/full_mac_build.sh |
@@ -26,8 +26,9 @@ OPTIONS: |
Issue a clean before the normal build. |
-a, --autogen |
Start by rerunning autogen & configure. |
- -r, --regenerate-cpp-descriptors |
- The descriptor.proto is checked in generated, cause it to regenerate. |
+ -r, --regenerate-descriptors |
+ Run generate_descriptor_proto.sh to regenerate all the checked in |
+ proto sources. |
-j #, --jobs # |
Force the number of parallel jobs (useful for debugging build issues). |
--core-only |
@@ -71,7 +72,7 @@ fi |
DO_AUTOGEN=no |
DO_CLEAN=no |
-REGEN_CPP_DESCRIPTORS=no |
+REGEN_DESCRIPTORS=no |
CORE_ONLY=no |
DO_XCODE_IOS_TESTS=yes |
DO_XCODE_OSX_TESTS=yes |
@@ -88,8 +89,8 @@ while [[ $# != 0 ]]; do |
-a | --autogen ) |
DO_AUTOGEN=yes |
;; |
- -r | --regenerate-cpp-descriptors ) |
- REGEN_CPP_DESCRIPTORS=yes |
+ -r | --regenerate-descriptors ) |
+ REGEN_DESCRIPTORS=yes |
;; |
-j | --jobs ) |
shift |
@@ -164,8 +165,8 @@ if [[ "${DO_CLEAN}" == "yes" ]] ; then |
fi |
fi |
-if [[ "${REGEN_CPP_DESCRIPTORS}" == "yes" ]] ; then |
- header "Regenerating the C++ descriptor sources." |
+if [[ "${REGEN_DESCRIPTORS}" == "yes" ]] ; then |
+ header "Regenerating the descriptor sources." |
./generate_descriptor_proto.sh -j "${NUM_MAKE_JOBS}" |
fi |
@@ -184,29 +185,8 @@ else |
cd .. |
fi |
-header "Ensuring the ObjC descriptors are current." |
-# Find the newest input file (protos, compiler, and the generator script). |
-# (these patterns catch some extra stuff, but better to over sample than under) |
-readonly NewestInput=$(find \ |
- src/google/protobuf/*.proto \ |
- src/.libs src/*.la src/protoc \ |
- objectivec/generate_descriptors_proto.sh \ |
- -type f -print0 \ |
- | xargs -0 stat -f "%m %N" \ |
- | sort -n | tail -n1 | cut -f2- -d" ") |
-# Find the oldest output file. |
-readonly OldestOutput=$(find \ |
- "${ProtoRootDir}/objectivec/google" \ |
- -type f -print0 \ |
- | xargs -0 stat -f "%m %N" \ |
- | sort -n -r | tail -n1 | cut -f2- -d" ") |
-# If the newest input is newer than the oldest output, regenerate. |
-if [[ "${NewestInput}" -nt "${OldestOutput}" ]] ; then |
- echo ">> Newest input is newer than oldest output, regenerating." |
- objectivec/generate_descriptors_proto.sh -j "${NUM_MAKE_JOBS}" |
-else |
- echo ">> Newest input is older than oldest output, no need to regenerating." |
-fi |
+# Ensure the WKT sources checked in are current. |
+objectivec/generate_well_known_types.sh --check-only -j "${NUM_MAKE_JOBS}" |
header "Checking on the ObjC Runtime Code" |
objectivec/DevTools/pddm_tests.py |
@@ -234,7 +214,7 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then |
echo "ERROR: Xcode 6.3/6.4 no longer supported for building, please use 7.0 or higher." 1>&2 |
exit 10 |
;; |
- 7.* ) |
+ 7.1* ) |
XCODEBUILD_TEST_BASE_IOS+=( |
-destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit |
-destination "platform=iOS Simulator,name=iPhone 6,OS=9.0" # 64bit |
@@ -242,6 +222,22 @@ if [[ "${DO_XCODE_IOS_TESTS}" == "yes" ]] ; then |
-destination "platform=iOS Simulator,name=iPad Air,OS=9.0" # 64bit |
) |
;; |
+ 7.3* ) |
+ XCODEBUILD_TEST_BASE_IOS+=( |
+ -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit |
+ -destination "platform=iOS Simulator,name=iPhone 6,OS=9.3" # 64bit |
+ -destination "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit |
+ -destination "platform=iOS Simulator,name=iPad Air,OS=9.3" # 64bit |
+ ) |
+ ;; |
+ 7.* ) |
+ XCODEBUILD_TEST_BASE_IOS+=( |
+ -destination "platform=iOS Simulator,name=iPhone 4s,OS=8.1" # 32bit |
+ -destination "platform=iOS Simulator,name=iPhone 6,OS=9.2" # 64bit |
+ -destination "platform=iOS Simulator,name=iPad 2,OS=8.1" # 32bit |
+ -destination "platform=iOS Simulator,name=iPad Air,OS=9.2" # 64bit |
+ ) |
+ ;; |
* ) |
echo "Time to update the simulator targets for Xcode ${XCODE_VERSION}" |
exit 2 |