incubator-callback-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaz...@apache.org
Subject ios commit: Default GCC_VERSION is com.apple.compilers.llvm.clang.1_0 now
Date Wed, 22 Feb 2012 23:01:29 GMT
Updated Branches:
  refs/heads/master b01f563c8 -> 0f984eac1


Default GCC_VERSION is com.apple.compilers.llvm.clang.1_0 now


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/0f984eac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/0f984eac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/0f984eac

Branch: refs/heads/master
Commit: 0f984eac165583dbe1bdd36a95970fc2013e409b
Parents: b01f563
Author: Shazron Abdullah <shazron@apache.org>
Authored: Wed Feb 22 15:01:20 2012 -0800
Committer: Shazron Abdullah <shazron@apache.org>
Committed: Wed Feb 22 15:01:20 2012 -0800

----------------------------------------------------------------------
 .../TemplateInfo.plist                             |    4 +-
 .../___PROJECTNAME___.xcodeproj/project.pbxproj    |   17 ++++++++-------
 2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/0f984eac/Cordova-based Application.xctemplate/TemplateInfo.plist
----------------------------------------------------------------------
diff --git a/Cordova-based Application.xctemplate/TemplateInfo.plist b/Cordova-based Application.xctemplate/TemplateInfo.plist
index ae16720..304f14b 100644
--- a/Cordova-based Application.xctemplate/TemplateInfo.plist	
+++ b/Cordova-based Application.xctemplate/TemplateInfo.plist	
@@ -318,11 +318,11 @@
 		<key>SharedSettings</key>
 		<dict>
 			<key>ARCHS</key>
-			<string>$(ARCHS_STANDARD_32_BIT)</string>
+			<string>armv6 $(ARCHS_STANDARD_32_BIT)</string>
 			<key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key>
 			<string>iPhone Developer</string>
 			<key>GCC_VERSION</key>
-			<string>com.apple.compilers.llvmgcc42</string>
+			<string>com.apple.compilers.llvm.clang.1_0</string>
 			<key>IPHONEOS_DEPLOYMENT_TARGET</key>
 			<string>3.0</string>
 		</dict>

http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/0f984eac/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj b/Cordova-based
Application/___PROJECTNAME___.xcodeproj/project.pbxproj
index db833ac..197c1bb 100755
--- a/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj	
+++ b/Cordova-based Application/___PROJECTNAME___.xcodeproj/project.pbxproj	
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -30,7 +30,6 @@
 		3053AC6F109B7857006FCFE7 /* VERSION in Resources */ = {isa = PBXBuildFile; fileRef = 3053AC6E109B7857006FCFE7
/* VERSION */; };
 		305D5FD1115AB8F900A74A75 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile;
fileRef = 305D5FD0115AB8F900A74A75 /* MobileCoreServices.framework */; };
 		3072F99713A8081B00425683 /* Capture.bundle in Resources */ = {isa = PBXBuildFile; fileRef
= 3072F99613A8081B00425683 /* Capture.bundle */; };
-		307D28A2123043360040C0FA /* CordovaBuildSettings.xcconfig in Resources */ = {isa = PBXBuildFile;
fileRef = 307D28A1123043350040C0FA /* CordovaBuildSettings.xcconfig */; };
 		308D05371370CCF300D202BF /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef
= 308D052E1370CCF300D202BF /* icon-72.png */; };
 		308D05381370CCF300D202BF /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 308D052F1370CCF300D202BF
/* icon.png */; };
 		308D05391370CCF300D202BF /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef
= 308D05301370CCF300D202BF /* icon@2x.png */; };
@@ -330,8 +329,11 @@
 /* Begin PBXProject section */
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject
"___PROJECTNAME___" */;
-			compatibilityVersion = "Xcode 3.1";
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
@@ -391,7 +393,6 @@
 				301BF570109A69640062928A /* www in Resources */,
 				3053AC6F109B7857006FCFE7 /* VERSION in Resources */,
 				30E1352710E2C1420031B30D /* Cordova.plist in Resources */,
-				307D28A2123043360040C0FA /* CordovaBuildSettings.xcconfig in Resources */,
 				308D05371370CCF300D202BF /* icon-72.png in Resources */,
 				308D05381370CCF300D202BF /* icon.png in Resources */,
 				308D05391370CCF300D202BF /* icon@2x.png in Resources */,
@@ -493,6 +494,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "___PROJECTNAMEASIDENTIFIER___-Prefix.pch";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "___PROJECTNAMEASIDENTIFIER___-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				PRODUCT_NAME = "___PROJECTNAME___";
@@ -507,6 +509,7 @@
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "___PROJECTNAMEASIDENTIFIER___-Prefix.pch";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				INFOPLIST_FILE = "___PROJECTNAMEASIDENTIFIER___-Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				PRODUCT_NAME = "___PROJECTNAME___";
@@ -521,7 +524,7 @@
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
@@ -537,7 +540,6 @@
 					"-all_load",
 					"-Obj-C",
 				);
-				PREBINDING = NO;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = NO;
 				USER_HEADER_SEARCH_PATHS = "\"$(CORDOVALIB)/Classes/JSON\" \"$(CORDOVALIB)/Classes\"";
@@ -551,7 +553,7 @@
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_C_LANGUAGE_STANDARD = c99;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
@@ -567,7 +569,6 @@
 					"-all_load",
 					"-Obj-C",
 				);
-				PREBINDING = NO;
 				SDKROOT = iphoneos;
 				SKIP_INSTALL = NO;
 				USER_HEADER_SEARCH_PATHS = "\"$(CORDOVALIB)/Classes/JSON\" \"$(CORDOVALIB)/Classes\"";


Mime
View raw message