[Author: thomasvl]

Remove the targets and script support for causing builds in both projects.
Limit the script to just cycling through the Mac configs.

TBR=dmaclach

1 files changed, 4 insertions, 109 deletions

diff --git a/BuildScripts/BuildAllSDKs.sh b/BuildScripts/BuildAllSDKs.sh
index 81710b0..ff5a4ec 100755
--- a/BuildScripts/BuildAllSDKs.sh
+++ b/BuildScripts/BuildAllSDKs.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # BuildAllSDKs.sh
 #
-# This script builds the Tiger, Leopard, SnowLeopard and iPhone versions of the
+# This script builds the Tiger, Leopard, and SnowLeopard versions of the
 # requested target in the current basic config (debug, release, debug-gcov).
 #
-# Copyright 2006-2009 Google Inc.
+# Copyright 2006-2011 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License.  You may obtain a copy
@@ -24,11 +24,10 @@
 # everything done.
 
 GTM_PROJECT_TARGET="$1"
-GTMIPHONE_PROJECT_TARGET="$2"
 STARTING_TARGET="${TARGET_NAME}"
 SCRIPT_APP="${TMPDIR}DoBuild.app"
 
-REQUESTED_BUILD_STYLE=$(echo "${BUILD_STYLE}" | sed -E "s/((iPhone.*)|(.*OrLater))-(.*)/\4/")
+REQUESTED_BUILD_STYLE=$(echo "${BUILD_STYLE}" | sed -E "s/(.*OrLater)-(.*)/\2/")
 # See if we were told to clean instead of build.
 PROJECT_ACTION="build"
 if [ "${ACTION}" == "clean" ]; then
@@ -39,112 +38,10 @@ fi
 AVAILABLE_MACOS_SDKS=`eval ls ${DEVELOPER_SDK_DIR}`
 AVAILABLE_PLATFORMS=`eval ls ${DEVELOPER_DIR}/Platforms`
 
-GTMIPHONE_OPEN_EXTRAS=""
-GTMIPHONE_BUILD_EXTRAS=""
 GTM_OPEN_EXTRAS=""
 GTM_BUILD_EXTRAS=""
 
-# build up our GTMiPhone parts
-if [ "${GTMIPHONE_PROJECT_TARGET}" != "" ]; then
-  AVAILABLE_IPHONE_SDKS=`eval ls ${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs`
-  GTMIPHONE_OPEN_EXTRAS="
-    if \"${AVAILABLE_PLATFORMS}\" contains \"iPhoneSimulator.platform\" then
-      -- make sure both project files are open
-      open posix file \"${SRCROOT}/GTMiPhone.xcodeproj\"
-    end if"
-  GTMIPHONE_BUILD_EXTRAS="
-    if \"${AVAILABLE_PLATFORMS}\" contains \"iPhoneSimulator.platform\" then
-      tell project \"GTMiPhone\"
-        -- wait for stub build to finish before kicking off the real builds.
-        set x to 0
-        repeat while currently building
-          delay 0.5
-          set x to x + 1
-          if x > 6 then
-            display alert \"GTMiPhone is still building, can't start.\"
-            return
-          end if
-        end repeat
-        -- do the GTMiPhone builds
-        with timeout of 9999 seconds
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator2.0.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone2.0-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator2.1.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone2.1-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator2.2.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone2.2-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator2.2.1.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone2.2.1-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator3.0.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone3.0-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator3.1.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone3.1-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator3.1.2.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone3.1.2-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator3.1.3.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone3.1.3-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator3.2.sdk\" then
-            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
-            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone3.2-${REQUESTED_BUILD_STYLE}\"
-            set active target to target \"${STARTING_TARGET}\"
-            if buildResult is not equal to \"Build succeeded\" then
-              return
-            end if
-          end if
-        end timeout
-      end tell
-    end if"
-fi
-
-# build up our GTMiPhone parts
+# build up our GTMi parts
 if [ "${GTM_PROJECT_TARGET}" != "" ]; then
   GTM_OPEN_EXTRAS="
     if \"${AVAILABLE_PLATFORMS}\" contains \"MacOSX.platform\" then
@@ -198,9 +95,7 @@ fi
 OUR_BUILD_SCRIPT="on run
   tell application \"Xcode\"
     activate
-    ${GTMIPHONE_OPEN_EXTRAS}
     ${GTM_OPEN_EXTRAS}
-    ${GTMIPHONE_BUILD_EXTRAS}
     ${GTM_BUILD_EXTRAS}
   end tell
 end run"