Updated Branches: refs/heads/master f3cc1058d -> 4aea2d5a9
Delete unused CordovaBuildSettings.xcconfig from project template. Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/4aea2d5a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/4aea2d5a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/4aea2d5a Branch: refs/heads/master Commit: 4aea2d5a94ddb4a67d2be191a9e8e0e23957b903 Parents: f3cc105 Author: Andrew Grieve <agri...@chromium.org> Authored: Mon Oct 1 14:29:43 2012 -0400 Committer: Andrew Grieve <agri...@chromium.org> Committed: Mon Oct 1 14:29:43 2012 -0400 ---------------------------------------------------------------------- .../project/__TESTING__.xcodeproj/project.pbxproj | 50 +++------------ .../__TESTING__/CordovaBuildSettings.xcconfig | 26 -------- 2 files changed, 9 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4aea2d5a/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj b/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj index bc11d3b..4f44052 100755 --- a/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj +++ b/bin/templates/project/__TESTING__.xcodeproj/project.pbxproj @@ -78,27 +78,13 @@ remoteGlobalIDString = D2AAC07D0554694100DB518D; remoteInfo = CordovaLib; }; - 302D95EB14D23909003F00A1 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 686357A9141002F100DF4CF2; - remoteInfo = CordovaLibTests; - }; - 3088BBB4154F38EF009F9C59 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 301BF52D109A57CC0062928A /* CordovaLib.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 303A4068152124BB00182201; - remoteInfo = CordovaLibApp; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D3623240D0F684500981E51 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 1D3623250D0F684500981E51 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; - 1D6058910D05DD3D006BFB54 /* __TESTING__.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "__TESTING__.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D6058910D05DD3D006BFB54 /* __TESTING__.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = __TESTING__.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 1F766FDD13BBADB100FB74C0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Localizable.strings; sourceTree = "<group>"; }; 1F766FE013BBADB100FB74C0 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = Localizable.strings; sourceTree = "<group>"; }; @@ -175,7 +161,7 @@ 1D3623250D0F684500981E51 /* AppDelegate.m */, ); name = Classes; - path = "__TESTING__/Classes"; + path = __TESTING__/Classes; sourceTree = SOURCE_ROOT; }; 19C28FACFE9D520D11CA2CBB /* Products */ = { @@ -224,7 +210,7 @@ 29B97316FDCFA39411CA2CEA /* main.m */, ); name = "Other Sources"; - path = "__TESTING__"; + path = __TESTING__; sourceTree = "<group>"; }; 29B97317FDCFA39411CA2CEA /* Resources */ = { @@ -242,7 +228,7 @@ 307D28A1123043350040C0FA /* CordovaBuildSettings.xcconfig */, ); name = Resources; - path = "__TESTING__/Resources"; + path = __TESTING__/Resources; sourceTree = "<group>"; }; 29B97323FDCFA39411CA2CEA /* Frameworks */ = { @@ -270,8 +256,6 @@ isa = PBXGroup; children = ( 301BF535109A57CC0062928A /* libCordova.a */, - 302D95EC14D23909003F00A1 /* CordovaLibTests.octest */, - 3088BBB5154F38EF009F9C59 /* CordovaLibApp.app */, ); name = Products; sourceTree = "<group>"; @@ -281,7 +265,7 @@ children = ( ); name = Plugins; - path = "__TESTING__/Plugins"; + path = __TESTING__/Plugins; sourceTree = SOURCE_ROOT; }; 308D052D1370CCF300D202BF /* icons */ = { @@ -341,8 +325,8 @@ dependencies = ( 301BF551109A68C00062928A /* PBXTargetDependency */, ); - name = "__TESTING__"; - productName = "__TESTING__"; + name = __TESTING__; + productName = __TESTING__; productReference = 1D6058910D05DD3D006BFB54 /* __TESTING__.app */; productType = "com.apple.product-type.application"; }; @@ -391,20 +375,6 @@ remoteRef = 301BF534109A57CC0062928A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 302D95EC14D23909003F00A1 /* CordovaLibTests.octest */ = { - isa = PBXReferenceProxy; - fileType = wrapper.cfbundle; - path = CordovaLibTests.octest; - remoteRef = 302D95EB14D23909003F00A1 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 3088BBB5154F38EF009F9C59 /* CordovaLibApp.app */ = { - isa = PBXReferenceProxy; - fileType = wrapper.application; - path = CordovaLibApp.app; - remoteRef = 3088BBB4154F38EF009F9C59 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -524,7 +494,7 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "__TESTING__/__TESTING__-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.2; - PRODUCT_NAME = "__TESTING__"; + PRODUCT_NAME = __TESTING__; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -542,14 +512,13 @@ GCC_VERSION = com.apple.compilers.llvm.clang.1_0; INFOPLIST_FILE = "__TESTING__/__TESTING__-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 4.2; - PRODUCT_NAME = "__TESTING__"; + PRODUCT_NAME = __TESTING__; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 307D28A1123043350040C0FA /* CordovaBuildSettings.xcconfig */; buildSettings = { ARCHS = ( armv6, @@ -588,7 +557,6 @@ }; C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 307D28A1123043350040C0FA /* CordovaBuildSettings.xcconfig */; buildSettings = { ARCHS = ( armv6, http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/4aea2d5a/bin/templates/project/__TESTING__/CordovaBuildSettings.xcconfig ---------------------------------------------------------------------- diff --git a/bin/templates/project/__TESTING__/CordovaBuildSettings.xcconfig b/bin/templates/project/__TESTING__/CordovaBuildSettings.xcconfig deleted file mode 100644 index c70086c..0000000 --- a/bin/templates/project/__TESTING__/CordovaBuildSettings.xcconfig +++ /dev/null @@ -1,26 +0,0 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you 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 of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// - -// Cordova.xcconfig -// __TESTING__ -// - -// Override this to use your project specific CORDOVALIB. -// You can base it off the current project path, $(PROJECT_DIR) -CORDOVALIB = $(CORDOVALIB)
