aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xBuildScripts/BuildAllSDKs.sh113
-rw-r--r--GTM.xcodeproj/project.pbxproj94
-rw-r--r--GTMiPhone.xcodeproj/project.pbxproj95
3 files changed, 4 insertions, 298 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"
diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj
index a136b54..9c14e81 100644
--- a/GTM.xcodeproj/project.pbxproj
+++ b/GTM.xcodeproj/project.pbxproj
@@ -1769,20 +1769,6 @@
/* End PBXHeadersBuildPhase section */
/* Begin PBXLegacyTarget section */
- 8B4514A011BEC29100A9EE64 /* All UnitTests All SDKs All Platforms */ = {
- isa = PBXLegacyTarget;
- buildArgumentsString = "\"All UnitTests\" \"All UnitTests\"";
- buildConfigurationList = 8B4514A111BEC29100A9EE64 /* Build configuration list for PBXLegacyTarget "All UnitTests All SDKs All Platforms" */;
- buildPhases = (
- );
- buildToolPath = BuildScripts/BuildAllSDKs.sh;
- buildWorkingDirectory = "$(SRCROOT)";
- dependencies = (
- );
- name = "All UnitTests All SDKs All Platforms";
- passBuildSettingsInEnvironment = 1;
- productName = "All UnitTests All SDKs";
- };
F41A6EE00E02DB4F00788A6C /* Build GTM All SDKs */ = {
isa = PBXLegacyTarget;
buildArgumentsString = GTM;
@@ -1996,7 +1982,6 @@
8B45A2890DA49B99001148C5 /* UIUnitTestingHarness */,
F41A6EE00E02DB4F00788A6C /* Build GTM All SDKs */,
F41A6EF80E02DCFC00788A6C /* All UnitTests All SDKs */,
- 8B4514A011BEC29100A9EE64 /* All UnitTests All SDKs All Platforms */,
);
};
/* End PBXProject section */
@@ -2927,69 +2912,6 @@
};
name = "SnowLeopardOrLater-Release";
};
- 8B4514A211BEC29100A9EE64 /* TigerOrLater-Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs";
- };
- name = "TigerOrLater-Debug";
- };
- 8B4514A311BEC29100A9EE64 /* TigerOrLater-Debug-gcov */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs";
- };
- name = "TigerOrLater-Debug-gcov";
- };
- 8B4514A411BEC29100A9EE64 /* TigerOrLater-Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs";
- };
- name = "TigerOrLater-Release";
- };
- 8B4514A511BEC29100A9EE64 /* LeopardOrLater-Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs";
- };
- name = "LeopardOrLater-Debug";
- };
- 8B4514A611BEC29100A9EE64 /* LeopardOrLater-Debug-gcov */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs";
- };
- name = "LeopardOrLater-Debug-gcov";
- };
- 8B4514A711BEC29100A9EE64 /* LeopardOrLater-Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs";
- };
- name = "LeopardOrLater-Release";
- };
- 8B4514A811BEC29100A9EE64 /* SnowLeopardOrLater-Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs All Platforms";
- };
- name = "SnowLeopardOrLater-Debug";
- };
- 8B4514A911BEC29100A9EE64 /* SnowLeopardOrLater-Debug-gcov */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs";
- };
- name = "SnowLeopardOrLater-Debug-gcov";
- };
- 8B4514AA11BEC29100A9EE64 /* SnowLeopardOrLater-Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests All SDKs";
- };
- name = "SnowLeopardOrLater-Release";
- };
8B45A02A0DA4696D001148C5 /* TigerOrLater-Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F48FE2420D197F9A009257D2 /* DebugUnittest.xcconfig */;
@@ -3784,22 +3706,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = "TigerOrLater-Release";
};
- 8B4514A111BEC29100A9EE64 /* Build configuration list for PBXLegacyTarget "All UnitTests All SDKs All Platforms" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 8B4514A211BEC29100A9EE64 /* TigerOrLater-Debug */,
- 8B4514A311BEC29100A9EE64 /* TigerOrLater-Debug-gcov */,
- 8B4514A411BEC29100A9EE64 /* TigerOrLater-Release */,
- 8B4514A511BEC29100A9EE64 /* LeopardOrLater-Debug */,
- 8B4514A611BEC29100A9EE64 /* LeopardOrLater-Debug-gcov */,
- 8B4514A711BEC29100A9EE64 /* LeopardOrLater-Release */,
- 8B4514A811BEC29100A9EE64 /* SnowLeopardOrLater-Debug */,
- 8B4514A911BEC29100A9EE64 /* SnowLeopardOrLater-Debug-gcov */,
- 8B4514AA11BEC29100A9EE64 /* SnowLeopardOrLater-Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = "TigerOrLater-Release";
- };
8B45A02D0DA4696D001148C5 /* Build configuration list for PBXNativeTarget "UnitTest - UnitTesting" */ = {
isa = XCConfigurationList;
buildConfigurations = (
diff --git a/GTMiPhone.xcodeproj/project.pbxproj b/GTMiPhone.xcodeproj/project.pbxproj
index aeaa7a9..2823d1b 100644
--- a/GTMiPhone.xcodeproj/project.pbxproj
+++ b/GTMiPhone.xcodeproj/project.pbxproj
@@ -638,37 +638,6 @@
};
/* End PBXGroup section */
-/* Begin PBXLegacyTarget section */
- 8B4514EB11BEC38900A9EE64 /* All UnitTests All SDKs All Platforms */ = {
- isa = PBXLegacyTarget;
- buildArgumentsString = "\"All UnitTests\" \"All UnitTests\"";
- buildConfigurationList = 8B4514EC11BEC38900A9EE64 /* Build configuration list for PBXLegacyTarget "All UnitTests All SDKs All Platforms" */;
- buildPhases = (
- );
- buildToolPath = BuildScripts/BuildAllSDKs.sh;
- buildWorkingDirectory = "$(SRCROOT)";
- dependencies = (
- );
- name = "All UnitTests All SDKs All Platforms";
- passBuildSettingsInEnvironment = 1;
- productName = "All UnitTests all SDKs";
- };
- F4B541440E7F022B004738EC /* All UnitTests All SDKs */ = {
- isa = PBXLegacyTarget;
- buildArgumentsString = "\"\" \"All UnitTests\"";
- buildConfigurationList = F4B5414A0E7F025F004738EC /* Build configuration list for PBXLegacyTarget "All UnitTests All SDKs" */;
- buildPhases = (
- );
- buildToolPath = BuildScripts/BuildAllSDKs.sh;
- buildWorkingDirectory = "$(SRCROOT)";
- dependencies = (
- );
- name = "All UnitTests All SDKs";
- passBuildSettingsInEnvironment = 1;
- productName = "All UnitTests all SDKs";
- };
-/* End PBXLegacyTarget section */
-
/* Begin PBXNativeTarget section */
1D6058900D05DD3D006BFB54 /* GTMiPhoneUnitTesting */ = {
isa = PBXNativeTarget;
@@ -709,8 +678,6 @@
targets = (
F4C7F9BF0DC62EC8009BEE5B /* All UnitTests */,
1D6058900D05DD3D006BFB54 /* GTMiPhoneUnitTesting */,
- F4B541440E7F022B004738EC /* All UnitTests All SDKs */,
- 8B4514EB11BEC38900A9EE64 /* All UnitTests All SDKs All Platforms */,
);
};
/* End PBXProject section */
@@ -896,20 +863,6 @@
};
name = Debug;
};
- F4A0A965140438D50010B64B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests all SDKs";
- };
- name = Debug;
- };
- F4A0A966140438D50010B64B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests all SDKs";
- };
- name = Debug;
- };
F4A0A967140438E40010B64B /* Debug-gcov */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F4A0A95E140438B90010B64B /* DebugiOS.xcconfig */;
@@ -940,20 +893,6 @@
};
name = "Debug-gcov";
};
- F4A0A96A140438E40010B64B /* Debug-gcov */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests all SDKs";
- };
- name = "Debug-gcov";
- };
- F4A0A96B140438E40010B64B /* Debug-gcov */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests all SDKs";
- };
- name = "Debug-gcov";
- };
F4A0A96C140438ED0010B64B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = F4A0A95F140438B90010B64B /* ReleaseiOS.xcconfig */;
@@ -982,20 +921,6 @@
};
name = Release;
};
- F4A0A96F140438ED0010B64B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests all SDKs";
- };
- name = Release;
- };
- F4A0A970140438ED0010B64B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "All UnitTests all SDKs";
- };
- name = Release;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -1009,16 +934,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- 8B4514EC11BEC38900A9EE64 /* Build configuration list for PBXLegacyTarget "All UnitTests All SDKs All Platforms" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- F4A0A966140438D50010B64B /* Debug */,
- F4A0A96B140438E40010B64B /* Debug-gcov */,
- F4A0A970140438ED0010B64B /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
C01FCF4E08A954540054247B /* Build configuration list for PBXProject "GTMiPhone" */ = {
isa = XCConfigurationList;
buildConfigurations = (
@@ -1029,16 +944,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- F4B5414A0E7F025F004738EC /* Build configuration list for PBXLegacyTarget "All UnitTests All SDKs" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- F4A0A965140438D50010B64B /* Debug */,
- F4A0A96A140438E40010B64B /* Debug-gcov */,
- F4A0A96F140438ED0010B64B /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Debug;
- };
F4C7F9C50DC62F0C009BEE5B /* Build configuration list for PBXAggregateTarget "All UnitTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 11:03:50 +0000