Updates for Xcode 4.2, iOS 5.0 SDK and better Xcode 4 workflow in a w…

…orkspace.
davidmorford · Oct 9, 2011 · c9f0b89 · c9f0b89
1 parent 873017f
commit c9f0b89
Show file tree

Hide file tree

Showing 35 changed files with 451 additions and 71 deletions.
diff --git a/Configurations/Compiler.xcconfig b/Configurations/Compiler.xcconfig
@@ -5,12 +5,22 @@
 
 ALWAYS_SEARCH_USER_PATHS = NO
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
-GCC_C_LANGUAGE_STANDARD = c99
-GCC_WARN_ABOUT_RETURN_TYPE = YES
-GCC_WARN_UNUSED_VARIABLE = YES
-GCC_ENABLE_OBJC_EXCEPTIONS = YES
-GCC_ENABLE_FIX_AND_CONTINUE = NO
 PREBINDING = NO
 ZERO_LINK = NO
 
+// Clang
+
+CLANG_ENABLE_OBJC_ARC = NO
+
+// LLVM
+
+//LLVM_LTO = NO
+
+// Legacy GCC
+
+GCC_C_LANGUAGE_STANDARD = c99 // compiler-default?
+GCC_ENABLE_OBJC_EXCEPTIONS = YES
+GCC_ENABLE_FIX_AND_CONTINUE = NO
+GCC_WARN_ABOUT_RETURN_TYPE = YES
+GCC_WARN_UNUSED_VARIABLE = YES
 GCC_VERSION = com.apple.compilers.llvm.clang.1_0
diff --git a/Configurations/DeploymentTarget.xcconfig b/Configurations/DeploymentTarget.xcconfig
@@ -3,4 +3,4 @@
 // DeploymentTarget.xcconfig
 //
 
-IPHONEOS_DEPLOYMENT_TARGET = 4.2 //latest_iphoneos
+IPHONEOS_DEPLOYMENT_TARGET = 4.3 //latest_iphoneos?
diff --git a/Configurations/Platform.xcconfig b/Configurations/Platform.xcconfig
@@ -11,3 +11,6 @@
 
 SDKROOT = iphoneos
 ARCHS = $(ARCHS_STANDARD_32_BIT)
+
+// 5.0 SDK defines armv7 as the 'standard' arch now. Does this do anything?
+//VALID_ARCHS = armv6 armv7
diff --git a/Projects/Applications/Stuff.xcworkspace/contents.xcworkspacedata b/Projects/Applications/Stuff.xcworkspace/contents.xcworkspacedata
diff --git a/Projects/Applications/Stuff.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Projects/Applications/Stuff.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+	<false/>
+</dict>
+</plist>
diff --git a/Projects/Applications/Stuff/Stuff.xcodeproj/project.pbxproj b/Projects/Applications/Stuff/Stuff.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		6344DD7B14424DD900D3437C /* AdHoc.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 6344DD7914424DD900D3437C /* AdHoc.xcconfig */; };
+		6344DD7C14424DD900D3437C /* Distribution.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 6344DD7A14424DD900D3437C /* Distribution.xcconfig */; };
 		63C080B71373AEA100352C94 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63C080B61373AEA100352C94 /* CoreData.framework */; };
 		63C080B91373AEA100352C94 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63C080B81373AEA100352C94 /* CoreGraphics.framework */; };
 		63C080BB1373AEA100352C94 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63C080BA1373AEA100352C94 /* Foundation.framework */; };
@@ -30,6 +32,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		6344DD7914424DD900D3437C /* AdHoc.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = AdHoc.xcconfig; path = Configurations/AdHoc.xcconfig; sourceTree = "<group>"; };
+		6344DD7A14424DD900D3437C /* Distribution.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Distribution.xcconfig; path = Configurations/Distribution.xcconfig; sourceTree = "<group>"; };
 		63C080B21373AEA100352C94 /* Stuff.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Stuff.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		63C080B61373AEA100352C94 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		63C080B81373AEA100352C94 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -171,11 +175,13 @@
 		63C080D61373AEA100352C94 /* Configurations */ = {
 			isa = PBXGroup;
 			children = (
-				63C080D71373AEA100352C94 /* Application.xcconfig */,
 				63C080D81373AEA100352C94 /* Project.xcconfig */,
+				63C080DB1373AEA100352C94 /* Version.xcconfig */,
+				63C080D71373AEA100352C94 /* Application.xcconfig */,
 				63C080D91373AEA100352C94 /* Debug.xcconfig */,
 				63C080DA1373AEA100352C94 /* Release.xcconfig */,
-				63C080DB1373AEA100352C94 /* Version.xcconfig */,
+				6344DD7914424DD900D3437C /* AdHoc.xcconfig */,
+				6344DD7A14424DD900D3437C /* Distribution.xcconfig */,
 			);
 			name = Configurations;
 			sourceTree = "<group>";
@@ -193,8 +199,8 @@
 			isa = PBXGroup;
 			children = (
 				63C080DE1373AEA100352C94 /* StuffApplicationDelegate.h */,
-				63C080DF1373AEA100352C94 /* StuffApplicationDelegate.m */,
 				63C080E11373AEA100352C94 /* StuffUserDefaults.h */,
+				63C080DF1373AEA100352C94 /* StuffApplicationDelegate.m */,
 				63C080E21373AEA100352C94 /* StuffUserDefaults.m */,
 			);
 			name = ApplicationDelegate;
@@ -203,10 +209,10 @@
 		63C080E41373AEA100352C94 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				63C080E51373AEA100352C94 /* StuffMasterViewController.h */,
-				63C080E61373AEA100352C94 /* StuffMasterViewController.m */,
 				63C080E81373AEA100352C94 /* StuffDetailViewController.h */,
+				63C080E51373AEA100352C94 /* StuffMasterViewController.h */,
 				63C080E91373AEA100352C94 /* StuffDetailViewController.m */,
+				63C080E61373AEA100352C94 /* StuffMasterViewController.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -331,6 +337,8 @@
 				63C081021373AEA100352C94 /* Default~iphone.png in Resources */,
 				63C081041373AEA100352C94 /* Default@2x~iphone.png in Resources */,
 				63C081081373AEA100352C94 /* UserDefaults.plist in Resources */,
+				6344DD7B14424DD900D3437C /* AdHoc.xcconfig in Resources */,
+				6344DD7C14424DD900D3437C /* Distribution.xcconfig in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -368,6 +376,36 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
+		6344DD7F14424E4300D3437C /* AdHoc */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 63C080D81373AEA100352C94 /* Project.xcconfig */;
+			buildSettings = {
+				SDKROOT = iphoneos;
+			};
+			name = AdHoc;
+		};
+		6344DD8014424E4300D3437C /* AdHoc */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 6344DD7914424DD900D3437C /* AdHoc.xcconfig */;
+			buildSettings = {
+			};
+			name = AdHoc;
+		};
+		6344DD8114424E4C00D3437C /* Distribution */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 63C080D81373AEA100352C94 /* Project.xcconfig */;
+			buildSettings = {
+				SDKROOT = iphoneos;
+			};
+			name = Distribution;
+		};
+		6344DD8214424E4C00D3437C /* Distribution */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 6344DD7A14424DD900D3437C /* Distribution.xcconfig */;
+			buildSettings = {
+			};
+			name = Distribution;
+		};
 		63C081091373AEA100352C94 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 63C080D81373AEA100352C94 /* Project.xcconfig */;
@@ -406,6 +444,8 @@
 			buildConfigurations = (
 				63C081091373AEA100352C94 /* Debug */,
 				63C0810A1373AEA100352C94 /* Release */,
+				6344DD7F14424E4300D3437C /* AdHoc */,
+				6344DD8114424E4C00D3437C /* Distribution */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -415,6 +455,8 @@
 			buildConfigurations = (
 				63C0810C1373AEA100352C94 /* Debug */,
 				63C0810D1373AEA100352C94 /* Release */,
+				6344DD8014424E4300D3437C /* AdHoc */,
+				6344DD8214424E4C00D3437C /* Distribution */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

diff --git a/Projects/Applications/Stuff/Stuff.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Projects/Applications/Stuff/Stuff.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Projects/Applications/Stuff/Stuff/Classes/ApplicationDelegate/StuffApplicationDelegate.h b/Projects/Applications/Stuff/Stuff/Classes/ApplicationDelegate/StuffApplicationDelegate.h
@@ -2,8 +2,7 @@
 /*!
 @project	Stuff
 @header		StuffApplicationDelegate.h
-@copyright	(c) 2011, Semantap
-@created	5/5/11 – David
+@copyright	(c) 2011, Corporation 9592
 */
 
 #import <UIKit/UIKit.h>

diff --git a/Projects/Applications/Stuff/Stuff/Classes/ApplicationDelegate/StuffApplicationDelegate.m b/Projects/Applications/Stuff/Stuff/Classes/ApplicationDelegate/StuffApplicationDelegate.m
@@ -18,17 +18,17 @@ +(StuffApplicationDelegate *) sharedApplicationDelegate {
 #pragma mark <UIApplicationDelegate>
 
 -(BOOL) application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-	self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-	self.window.userInteractionEnabled = TRUE;
-	self.window.backgroundColor = [UIColor blackColor];
-	self.window.contentMode = UIViewContentModeScaleToFill;
-	self.window.autoresizesSubviews = TRUE;
+    window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+	window.userInteractionEnabled = TRUE;
+	window.backgroundColor = [UIColor blackColor];
+	window.contentMode = UIViewContentModeScaleToFill;
+	window.autoresizesSubviews = TRUE;
 
     StuffMasterViewController *masterViewController = [[StuffMasterViewController alloc] init];
-    self.navigationController = [[UINavigationController alloc] initWithRootViewController:masterViewController];
-    self.window.rootViewController = self.navigationController;
+    navigationController = [[UINavigationController alloc] initWithRootViewController:masterViewController];
+    window.rootViewController = navigationController;
     [masterViewController release];
-	[self.window makeKeyAndVisible];
+	[window makeKeyAndVisible];
 
 	return TRUE;
 }

diff --git a/Projects/Applications/Stuff/Stuff/Classes/ApplicationDelegate/StuffUserDefaults.h b/Projects/Applications/Stuff/Stuff/Classes/ApplicationDelegate/StuffUserDefaults.h
@@ -2,8 +2,7 @@
 /*!
 @project	Stuff
 @header		StuffUserDefaults.h
-@copyright	(c) 2011, Semantap
-@created	5/5/11 - David
+@copyright	(c) 2011, Corporation 9592
 */
 
 @class NSString;

diff --git a/Projects/Applications/Stuff/Stuff/Classes/Controllers/StuffMasterViewController.h b/Projects/Applications/Stuff/Stuff/Classes/Controllers/StuffMasterViewController.h
@@ -2,7 +2,6 @@
 /*!
 @project	Stuff
 @header		StuffMasterViewController.h
-@created	5/5/11
 */
 
 #import <UIKit/UIKit.h>

diff --git a/Projects/Applications/Stuff/Stuff/Configurations/AdHoc.xcconfig b/Projects/Applications/Stuff/Stuff/Configurations/AdHoc.xcconfig
@@ -2,13 +2,16 @@
 //
 // Stuff/Configurations/AdHoc.xcconfig
 //
-// Customize with AdHoc Build settings. Uses Release.xcconfig
+// Customize with AdHoc or OTA Build settings. Uses Release.xcconfig
 //
 
-#include "Release.xcconfig"
+#include "Application.xcconfig"
+#include "../../../Configurations/Release.xcconfig"
 
-// AdHoc Code Sign Identity and Entitlements
-
-//CODE_SIGN_IDENTITY = iPhone Distribution: 
-//CODE_SIGN_ENTITLEMENTS = $(APPLICATIONDELEGATE_INFOPLIST_PATH)/Entitlements.plist
-//VALIDATE_PRODUCT = NO
+BUILD_PLATFORM_NAME_PATH        = $(BUILD_SHARED_LIBRARIES_PATH)/Release/$(SDK_NAME)
+//CODE_SIGN_ENTITLEMENTS        = $(PROJECT_TREE_CLASSES_PATH)/ApplicationDelegate/Resources/PropertyLists/Entitlements.plist
+CODE_SIGN_IDENTITY              = iPhone Distribution
+CURRENT_PROJECT_VERSION         = $(BUILD_APPLICATION_VERSION)
+GCC_PREPROCESSOR_DEFINITIONS    = NDEBUG
+GCC_OPTIMIZATION_LEVEL          = s
+VALIDATE_PRODUCT                = NO
diff --git a/Projects/Applications/Stuff/Stuff/Configurations/Distribution.xcconfig b/Projects/Applications/Stuff/Stuff/Configurations/Distribution.xcconfig
@@ -2,13 +2,16 @@
 //
 // Stuff/Configurations/Distribution.xcconfig
 //
-// Customize with Distribution Build settings. Uses Release.xcconfig
-//
-
-#include "Release.xcconfig"
+// Customize with Distribution Code Sign Identity and entitlements settings. Uses Release.xcconfig
+// 
 
-// Distribution Code Sign Identity and Entitlements
+#include "Application.xcconfig"
+#include "../../../Configurations/Release.xcconfig"
 
-//CODE_SIGN_IDENTITY = iPhone Distribution: 
-//CODE_SIGN_ENTITLEMENTS = $(APPLICATIONDELEGATE_INFOPLIST_PATH)/Entitlements.plist
-//VALIDATE_PRODUCT = YES
+BUILD_PLATFORM_NAME_PATH        = $(BUILD_SHARED_LIBRARIES_PATH)/Release/$(SDK_NAME)
+//CODE_SIGN_ENTITLEMENTS        = $(APPLICATIONDELEGATE_INFOPLIST_PATH)/Entitlements.plist
+CODE_SIGN_IDENTITY              = iPhone Distribution
+CURRENT_PROJECT_VERSION         = $(BUILD_APPLICATION_VERSION)
+GCC_PREPROCESSOR_DEFINITIONS    = NDEBUG
+GCC_OPTIMIZATION_LEVEL          = s
+VALIDATE_PRODUCT                = YES
diff --git a/Projects/Applications/Stuff/Stuff/Configurations/Project.xcconfig b/Projects/Applications/Stuff/Stuff/Configurations/Project.xcconfig
@@ -7,5 +7,5 @@
 #include "../../../Configurations/Platform.xcconfig"
 #include "../../../Configurations/Project.xcconfig"
 
-INFOPLIST_ORGANIZATION_NAME	= Semantap
+INFOPLIST_ORGANIZATION_NAME	= Corporation9592
 CODE_SIGN_IDENTITY = iPhone Developer
diff --git a/Projects/Applications/Stuff/Stuff/Project/Stuff.pch b/Projects/Applications/Stuff/Stuff/Project/Stuff.pch
@@ -1,5 +1,5 @@
 
 #ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-    #import <UIKit/UIKit.h>
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #endif
diff --git a/Projects/Applications/Stuff/Stuff/Project/main.m b/Projects/Applications/Stuff/Stuff/Project/main.m
@@ -2,16 +2,16 @@
 /*!
 @file		main.m
 @project	Stuff
-@copyright	(c) 2011, Semantap
-@created	5/5/11 - David
+@copyright	(c) 2011, Corporation 9592
 */
 
 #import <UIKit/UIKit.h>
+#import "StuffApplicationDelegate.h"
 
 int 
 main(int argc, char *argv[]) {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	int retVal = UIApplicationMain(argc, argv, nil, @"StuffApplicationDelegate");
+	int retVal = UIApplicationMain(argc, argv, nil, NSStringFromClass([StuffApplicationDelegate class]));
 	[pool release];
 	return retVal;
 }