diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 22:06:13 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-10 22:06:13 +0000 |
commit | fc6ff4229344bf1a799a13c8aa651c657c2e9bbd (patch) | |
tree | 79bc4dd0a4eff782a54bf70d42693a14d13f521e | |
parent | 480e1292b1020e47ab9486d4a0f3b1f0f2ddec81 (diff) | |
download | chromium_src-fc6ff4229344bf1a799a13c8aa651c657c2e9bbd.zip chromium_src-fc6ff4229344bf1a799a13c8aa651c657c2e9bbd.tar.gz chromium_src-fc6ff4229344bf1a799a13c8aa651c657c2e9bbd.tar.bz2 |
Updating the All target to include test_shell_tests and ipc_tests, and to add the strip-if-needed phase to these executables
Review URL: http://codereview.chromium.org/13357
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6739 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | build/all.xcodeproj/project.pbxproj | 115 | ||||
-rw-r--r-- | chrome/chrome.xcodeproj/project.pbxproj | 35 | ||||
-rw-r--r-- | webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj | 76 |
3 files changed, 187 insertions, 39 deletions
diff --git a/build/all.xcodeproj/project.pbxproj b/build/all.xcodeproj/project.pbxproj index 35a38cb..78f1e2d 100644 --- a/build/all.xcodeproj/project.pbxproj +++ b/build/all.xcodeproj/project.pbxproj @@ -14,9 +14,11 @@ ); dependencies = ( 7B82FA6E0E75DD23008F45CF /* PBXTargetDependency */, - 4D7B02580E9D5833009A6919 /* PBXTargetDependency */, 7B82FA720E75DD23008F45CF /* PBXTargetDependency */, + 4DCE997C0EF060B100682526 /* PBXTargetDependency */, 7B82FA700E75DD23008F45CF /* PBXTargetDependency */, + 4DCE997A0EF0609E00682526 /* PBXTargetDependency */, + 4D7B02580E9D5833009A6919 /* PBXTargetDependency */, ); name = run_all_unittests; productName = run_all_unittests; @@ -44,7 +46,7 @@ 7BA363940E8C40400023C8B9 /* PBXTargetDependency */, 7BF8964E0E75D705000BAF8A /* PBXTargetDependency */, 4D7B02320E9D57E4009A6919 /* PBXTargetDependency */, - 4DB045250EB165B800A5633C /* PBXTargetDependency */, + 4DCE99760EF0608200682526 /* PBXTargetDependency */, 7BF895DE0E75D5FB000BAF8A /* PBXTargetDependency */, 4DB042C40EB1536A00A5633C /* PBXTargetDependency */, 7BF896440E75D705000BAF8A /* PBXTargetDependency */, @@ -118,13 +120,6 @@ remoteGlobalIDString = E45627B70E2691D0005E4685; remoteInfo = All; }; - 4DB045240EB165B800A5633C /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = E45628C30E26B4FE005E4685; - remoteInfo = TestShell; - }; 4DB6807E0EAF88B000AB2128 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */; @@ -146,12 +141,47 @@ remoteGlobalIDString = 4DB684920EAFDF7000AB2128; remoteInfo = xslt; }; - 531CBD1B0ECB66670084F32D /* PBXContainerItemProxy */ = { + 4DCE994F0EF0603800682526 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 531CBD140ECB66670084F32D /* dmg_fp.xcodeproj */; + containerPortal = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */; proxyType = 2; - remoteGlobalIDString = D2AAC046055464E500DB518D; - remoteInfo = dmg_fp; + remoteGlobalIDString = E45060E40EE87B86003BE099; + remoteInfo = app; + }; + 4DCE99510EF0603800682526 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = B5FDBFAE0EE4623000BEC6E6; + remoteInfo = ipc_tests; + }; + 4DCE99660EF0603800682526 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = E45067A80EEF2776003BE099; + remoteInfo = test_shell_tests; + }; + 4DCE99750EF0608200682526 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 4DCE98940EF0600700682526; + remoteInfo = All; + }; + 4DCE99790EF0609E00682526 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = E4506A340EF020E4003BE099; + remoteInfo = run_test_shell_tests; + }; + 4DCE997B0EF060B100682526 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = E4F325930EE837BF002533CE; + remoteInfo = run_ipc_tests; }; 7B262E390E82E508001CE27F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -565,7 +595,6 @@ 4D7B021C0E9D57D9009A6919 /* sqlite.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sqlite.xcodeproj; path = sqlite/sqlite.xcodeproj; sourceTree = "<group>"; }; 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = chrome.xcodeproj; path = chrome/chrome.xcodeproj; sourceTree = "<group>"; }; 4DB686590EAFE60400AB2128 /* libxslt.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libxslt.xcodeproj; path = libxslt/libxslt.xcodeproj; sourceTree = "<group>"; }; - 531CBD140ECB66670084F32D /* dmg_fp.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = dmg_fp.xcodeproj; path = dmg_fp/dmg_fp.xcodeproj; sourceTree = "<group>"; }; 7B262FE50E82F18D001CE27F /* libevent.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libevent.xcodeproj; path = libevent/libevent.xcodeproj; sourceTree = "<group>"; }; 7BA3548E0E89784F0023C8B9 /* TestShell.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = TestShell.xcodeproj; path = webkit/tools/test_shell/mac/TestShell.xcodeproj; sourceTree = "<group>"; }; 7BA3638D0E8C402F0023C8B9 /* sdch.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sdch.xcodeproj; path = sdch/sdch.xcodeproj; sourceTree = "<group>"; }; @@ -603,9 +632,11 @@ 4D7B02390E9D5816009A6919 /* Products */ = { isa = PBXGroup; children = ( + 4DCE99500EF0603800682526 /* Chromium.app */, 4D7B02500E9D5816009A6919 /* libbrowser.a */, 4D7B02520E9D5816009A6919 /* libcommon.a */, 4DB6807F0EAF88B000AB2128 /* librenderer.a */, + 4DCE99520EF0603800682526 /* ipc_tests */, 4D7B02540E9D5816009A6919 /* unit_tests */, ); name = Products; @@ -619,14 +650,6 @@ name = Products; sourceTree = "<group>"; }; - 531CBD150ECB66670084F32D /* Products */ = { - isa = PBXGroup; - children = ( - 531CBD1C0ECB66670084F32D /* libdmg_fp.a */, - ); - name = Products; - sourceTree = "<group>"; - }; 7B262FE60E82F18D001CE27F /* Products */ = { isa = PBXGroup; children = ( @@ -639,6 +662,7 @@ isa = PBXGroup; children = ( 7BA354A50E89784F0023C8B9 /* TestShell.app */, + 4DCE99670EF0603800682526 /* test_shell_tests */, ); name = Products; sourceTree = "<group>"; @@ -764,7 +788,6 @@ isa = PBXGroup; children = ( 7BF895E90E75D666000BAF8A /* bzip2.xcodeproj */, - 531CBD140ECB66670084F32D /* dmg_fp.xcodeproj */, 7BF895EF0E75D673000BAF8A /* icu.xcodeproj */, 7B262FE50E82F18D001CE27F /* libevent.xcodeproj */, 7BF896080E75D68B000BAF8A /* libjpeg.xcodeproj */, @@ -875,10 +898,6 @@ ProjectRef = 4D7B02380E9D5816009A6919 /* chrome.xcodeproj */; }, { - ProductGroup = 531CBD150ECB66670084F32D /* Products */; - ProjectRef = 531CBD140ECB66670084F32D /* dmg_fp.xcodeproj */; - }, - { ProductGroup = 7BF895A10E75D5DA000BAF8A /* Products */; ProjectRef = 7BF895A00E75D5DA000BAF8A /* googleurl.xcodeproj */; }, @@ -1009,11 +1028,25 @@ remoteRef = 4DB686620EAFE60400AB2128 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 531CBD1C0ECB66670084F32D /* libdmg_fp.a */ = { + 4DCE99500EF0603800682526 /* Chromium.app */ = { isa = PBXReferenceProxy; - fileType = archive.ar; - path = libdmg_fp.a; - remoteRef = 531CBD1B0ECB66670084F32D /* PBXContainerItemProxy */; + fileType = wrapper.application; + path = Chromium.app; + remoteRef = 4DCE994F0EF0603800682526 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DCE99520EF0603800682526 /* ipc_tests */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = ipc_tests; + remoteRef = 4DCE99510EF0603800682526 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4DCE99670EF0603800682526 /* test_shell_tests */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = test_shell_tests; + remoteRef = 4DCE99660EF0603800682526 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; 7B262E3A0E82E508001CE27F /* libv8-arm.a */ = { @@ -1312,16 +1345,26 @@ name = All; targetProxy = 4DB042C30EB1536A00A5633C /* PBXContainerItemProxy */; }; - 4DB045250EB165B800A5633C /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = TestShell; - targetProxy = 4DB045240EB165B800A5633C /* PBXContainerItemProxy */; - }; 4DB686790EAFE61A00AB2128 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = xslt; targetProxy = 4DB686780EAFE61A00AB2128 /* PBXContainerItemProxy */; }; + 4DCE99760EF0608200682526 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = All; + targetProxy = 4DCE99750EF0608200682526 /* PBXContainerItemProxy */; + }; + 4DCE997A0EF0609E00682526 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = run_test_shell_tests; + targetProxy = 4DCE99790EF0609E00682526 /* PBXContainerItemProxy */; + }; + 4DCE997C0EF060B100682526 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = run_ipc_tests; + targetProxy = 4DCE997B0EF060B100682526 /* PBXContainerItemProxy */; + }; 7B2630020E82F19B001CE27F /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = libevent; diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj index ff6b45c..230c961 100644 --- a/chrome/chrome.xcodeproj/project.pbxproj +++ b/chrome/chrome.xcodeproj/project.pbxproj @@ -29,6 +29,7 @@ 4D7BFB080E9D4B98009A6919 /* PBXTargetDependency */, 4D7BFC200E9D4CD4009A6919 /* PBXTargetDependency */, 4D640CF20EAE86D800EBCFC0 /* PBXTargetDependency */, + 4DCE999B0EF060D100682526 /* PBXTargetDependency */, 4D7BFB320E9D4BFB009A6919 /* PBXTargetDependency */, ); name = All; @@ -543,6 +544,13 @@ remoteGlobalIDString = 7BA018350E5A28DB00044150; remoteInfo = googleurl; }; + 4DCE999A0EF060D100682526 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4D7BF2E90E9D46A4009A6919 /* Project object */; + proxyType = 1; + remoteGlobalIDString = B5FDBFAD0EE4623000BEC6E6; + remoteInfo = ipc_tests; + }; 4DDC64490EAE38F500FB5EBE /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 4D7BFB0B0E9D4BBF009A6919 /* libxml.xcodeproj */; @@ -1662,8 +1670,8 @@ 4D7BF3060E9D477E009A6919 /* libbrowser.a */, 4D7BFC1A0E9D4CB9009A6919 /* libcommon.a */, 4D640CEB0EAE86BD00EBCFC0 /* librenderer.a */, - 4D7BFB2D0E9D4BE5009A6919 /* unit_tests */, B5FDBFAE0EE4623000BEC6E6 /* ipc_tests */, + 4D7BFB2D0E9D4BE5009A6919 /* unit_tests */, E45060E40EE87B86003BE099 /* Chromium.app */, ); name = Products; @@ -2716,6 +2724,7 @@ buildPhases = ( B5FDBFAB0EE4623000BEC6E6 /* Sources */, B5FDBFAC0EE4623000BEC6E6 /* Frameworks */, + 4DCE999E0EF0611100682526 /* Strip If Needed */, ); buildRules = ( ); @@ -2831,10 +2840,10 @@ 4D7BF3050E9D477E009A6919 /* browser */, 4D7BFC190E9D4CB9009A6919 /* common */, 4D640CEA0EAE86BD00EBCFC0 /* renderer */, - 4D7BFB2C0E9D4BE5009A6919 /* unit_tests */, - 4D7B014C0E9D572C009A6919 /* run_unit_tests */, B5FDBFAD0EE4623000BEC6E6 /* ipc_tests */, E4F325930EE837BF002533CE /* run_ipc_tests */, + 4D7BFB2C0E9D4BE5009A6919 /* unit_tests */, + 4D7B014C0E9D572C009A6919 /* run_unit_tests */, ); }; /* End PBXProject section */ @@ -3059,6 +3068,21 @@ shellScript = "set -ex\nRUNNABLE_PRODUCT=$(echo \"${PRODUCT_NAME}\" | sed -e s/^run_//)\nexec \"${BUILT_PRODUCTS_DIR}/${RUNNABLE_PRODUCT}\"\n"; showEnvVarsInLog = 0; }; + 4DCE999E0EF0611100682526 /* Strip If Needed */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Strip If Needed"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "exec \"${XCODEPROJ_DEPTH}/build/mac/strip_from_xcode\""; + showEnvVarsInLog = 0; + }; E4F325960EE837BF002533CE /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -3352,6 +3376,11 @@ name = googleurl; targetProxy = 4D7BFF710E9D5416009A6919 /* PBXContainerItemProxy */; }; + 4DCE999B0EF060D100682526 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B5FDBFAD0EE4623000BEC6E6 /* ipc_tests */; + targetProxy = 4DCE999A0EF060D100682526 /* PBXContainerItemProxy */; + }; 4DDC644A0EAE38F500FB5EBE /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = xml; diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj index 54534c1..7225205 100644 --- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj +++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj @@ -7,6 +7,18 @@ objects = { /* Begin PBXAggregateTarget section */ + 4DCE98940EF0600700682526 /* All */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 4DCE98AF0EF0602400682526 /* Build configuration list for PBXAggregateTarget "All" */; + buildPhases = ( + ); + dependencies = ( + 4DCE98A20EF0601E00682526 /* PBXTargetDependency */, + 4DCE98A40EF0601E00682526 /* PBXTargetDependency */, + ); + name = All; + productName = All; + }; E4506A340EF020E4003BE099 /* run_test_shell_tests */ = { isa = PBXAggregateTarget; buildConfigurationList = E4506A390EF02118003BE099 /* Build configuration list for PBXAggregateTarget "run_test_shell_tests" */; @@ -225,6 +237,20 @@ remoteGlobalIDString = 4DB7FE6E0E9BF6AC00C66CE0; remoteInfo = webcoresysteminterface; }; + 4DCE98A10EF0601E00682526 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = E45628C30E26B4FE005E4685; + remoteInfo = TestShell; + }; + 4DCE98A30EF0601E00682526 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = E45067A70EEF2776003BE099; + remoteInfo = test_shell_tests; + }; 7B779D3B0E82FF2200C2971E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 7B42A4C40DE20F1700659DE0 /* v8.xcodeproj */; @@ -1281,6 +1307,7 @@ buildPhases = ( E45067A50EEF2776003BE099 /* Sources */, E45067A60EEF2776003BE099 /* Frameworks */, + 4DCE99A60EF0612C00682526 /* Strip If Needed */, ); buildRules = ( ); @@ -1424,6 +1451,7 @@ ); projectRoot = ""; targets = ( + 4DCE98940EF0600700682526 /* All */, E45628C30E26B4FE005E4685 /* TestShell */, E45067A70EEF2776003BE099 /* test_shell_tests */, E4506A340EF020E4003BE099 /* run_test_shell_tests */, @@ -1773,6 +1801,21 @@ shellScript = "exec \"${XCODEPROJ_DEPTH}/build/mac/strip_from_xcode\"\n"; showEnvVarsInLog = 0; }; + 4DCE99A60EF0612C00682526 /* Strip If Needed */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Strip If Needed"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "exec \"${XCODEPROJ_DEPTH}/build/mac/strip_from_xcode\""; + showEnvVarsInLog = 0; + }; E4506A3B0EF02137003BE099 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1877,6 +1920,16 @@ name = webcoresysteminterface; targetProxy = 4DB7FEA20E9BF90A00C66CE0 /* PBXContainerItemProxy */; }; + 4DCE98A20EF0601E00682526 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = E45628C30E26B4FE005E4685 /* TestShell */; + targetProxy = 4DCE98A10EF0601E00682526 /* PBXContainerItemProxy */; + }; + 4DCE98A40EF0601E00682526 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = E45067A70EEF2776003BE099 /* test_shell_tests */; + targetProxy = 4DCE98A30EF0601E00682526 /* PBXContainerItemProxy */; + }; 7B779D530E83002A00C2971E /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = libevent; @@ -2029,6 +2082,20 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 4DCE98950EF0600700682526 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = All; + }; + name = Debug; + }; + 4DCE98960EF0600700682526 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = All; + }; + name = Release; + }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7B8200960E76FDA1008F45CF /* debug.xcconfig */; @@ -2262,6 +2329,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 4DCE98AF0EF0602400682526 /* Build configuration list for PBXAggregateTarget "All" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 4DCE98950EF0600700682526 /* Debug */, + 4DCE98960EF0600700682526 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TestShell" */ = { isa = XCConfigurationList; buildConfigurations = ( |