Permalink
Browse files

- convert to ARC

  • Loading branch information...
HunterHillegas committed Mar 2, 2012
1 parent 5fadec6 commit c949e4a28a9d63dad5f52240b4e3c10fa5faf4fb
@@ -9,14 +9,14 @@
/* Begin PBXBuildFile section */
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
256AC3DA0F4B6AC300CF3369 /* BetaBuilderAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 256AC3D90F4B6AC300CF3369 /* BetaBuilderAppDelegate.m */; };
- 5A23434A1211AB1F0098AAB8 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343401211AB1F0098AAB8 /* ioapi.c */; };
- 5A23434B1211AB1F0098AAB8 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343421211AB1F0098AAB8 /* mztools.c */; };
- 5A23434C1211AB1F0098AAB8 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343441211AB1F0098AAB8 /* unzip.c */; };
- 5A23434D1211AB1F0098AAB8 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343461211AB1F0098AAB8 /* zip.c */; };
- 5A23434E1211AB1F0098AAB8 /* ZipArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343491211AB1F0098AAB8 /* ZipArchive.mm */; };
+ 5A23434A1211AB1F0098AAB8 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343401211AB1F0098AAB8 /* ioapi.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 5A23434B1211AB1F0098AAB8 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343421211AB1F0098AAB8 /* mztools.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 5A23434C1211AB1F0098AAB8 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343441211AB1F0098AAB8 /* unzip.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 5A23434D1211AB1F0098AAB8 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343461211AB1F0098AAB8 /* zip.c */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
+ 5A23434E1211AB1F0098AAB8 /* ZipArchive.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5A2343491211AB1F0098AAB8 /* ZipArchive.mm */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5A3D919113B2468900FD85A2 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A3D919013B2468900FD85A2 /* libz.dylib */; };
5A6C75B812E4C65C0050AA2B /* HISTORY in Resources */ = {isa = PBXBuildFile; fileRef = 5A6C75B712E4C65C0050AA2B /* HISTORY */; };
- 5A8F042612E613040087F51C /* NSFileManager+DirectoryLocations.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A8F042512E613040087F51C /* NSFileManager+DirectoryLocations.m */; };
+ 5A8F042612E613040087F51C /* NSFileManager+DirectoryLocations.m in Sources */ = {isa = PBXBuildFile; fileRef = 5A8F042512E613040087F51C /* NSFileManager+DirectoryLocations.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5AA4E39D120DE13300385530 /* BuilderController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AA4E39C120DE13300385530 /* BuilderController.m */; };
5AA4E409120DE84F00385530 /* index_template.html in Resources */ = {isa = PBXBuildFile; fileRef = 5AA4E408120DE84F00385530 /* index_template.html */; };
5AA4E491120DF21D00385530 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 5AA4E490120DF21D00385530 /* README */; };
@@ -310,14 +310,16 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "";
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_OBJC_GC = required;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = BetaBuilder_Prefix.pch;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "BetaBuilder-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.6;
@@ -329,17 +331,18 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Mac Developer: Hunter Hillegas (LNUUFFK3WN)";
+ ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ CLANG_ENABLE_OBJC_ARC = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
- GCC_ENABLE_OBJC_GC = required;
+ GCC_ENABLE_OBJC_GC = unsupported;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = BetaBuilder_Prefix.pch;
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "BetaBuilder-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.6;
PRODUCT_NAME = "BetaBuilder for iOS Apps";
- PROVISIONING_PROFILE = "30168D9E-8F02-4C53-A174-65A71A9C2942";
};
name = Release;
};
View
@@ -33,21 +33,12 @@
@class BuilderController;
-@interface BetaBuilderAppDelegate : NSObject <NSApplicationDelegate> {
- NSWindow *window;
-
- NSPanel *deploymentHelpPanel;
- NSPanel *archiveIPAHelpPanel;
-
- BuilderController *builderController;
-}
+@interface BetaBuilderAppDelegate : NSObject <NSApplicationDelegate>
-@property (assign) IBOutlet NSWindow *window;
-
-@property (nonatomic, retain) IBOutlet NSPanel *deploymentHelpPanel;
-@property (nonatomic, retain) IBOutlet NSPanel *archiveIPAHelpPanel;
-
-@property (nonatomic, retain) IBOutlet BuilderController *builderController;
+@property IBOutlet NSWindow *window;
+@property (nonatomic) IBOutlet NSPanel *deploymentHelpPanel;
+@property (nonatomic) IBOutlet NSPanel *archiveIPAHelpPanel;
+@property (nonatomic) IBOutlet BuilderController *builderController;
- (NSString *)htmlTemplatePath;
- (NSString *)defaultTemplatePath;
View
@@ -36,14 +36,14 @@
@implementation BetaBuilderAppDelegate
-@synthesize window;
-@synthesize deploymentHelpPanel;
-@synthesize archiveIPAHelpPanel;
-@synthesize builderController;
+@synthesize window = _window;
+@synthesize deploymentHelpPanel = _deploymentHelpPanel;
+@synthesize archiveIPAHelpPanel = _archiveIPAHelpPanel;
+@synthesize builderController = _builderController;
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
//Setup Drag Target for IPA Files
- [window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil]];
+ [self.window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, nil]];
//Process Command Line Arguments, If Any
NSArray *commandLineArgs = [[NSProcessInfo processInfo] arguments];
@@ -67,7 +67,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
if ([commandLineArgs count] == 0) { //only present this if we have no command line args
NSString *infoText = [NSString stringWithFormat:@"The template index file used to create the HTML output has been updated to include new functionality. It appears you alread have a version of this file in place (%@). Would you like to replace this file? Any customizations will be lost - you may want to backup the file first.", [self htmlTemplatePath]];
- NSAlert *indexTemplateAlert = [[NSAlert alertWithMessageText:@"A Newer Index Template File Exists" defaultButton:@"Do Nothing" alternateButton:@"Replace File" otherButton:nil informativeTextWithFormat:infoText] autorelease];
+ NSAlert *indexTemplateAlert = [NSAlert alertWithMessageText:@"A Newer Index Template File Exists" defaultButton:@"Do Nothing" alternateButton:@"Replace File" otherButton:nil informativeTextWithFormat:infoText];
[indexTemplateAlert beginSheetModalForWindow:self.window modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:nil];
}
}
@@ -134,11 +134,11 @@ - (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInf
}
- (IBAction)showDeploymentHelpPanel:(id)sender {
- [deploymentHelpPanel setIsVisible:YES];
+ [self.deploymentHelpPanel setIsVisible:YES];
}
- (IBAction)showArchiveHelpPanel:(id)sender {
- [archiveIPAHelpPanel setIsVisible:YES];
+ [self.archiveIPAHelpPanel setIsVisible:YES];
}
- (BOOL)application:(NSApplication *)theApplication openFile:(NSString *)filename {
View
@@ -8,10 +8,8 @@
#import <Foundation/Foundation.h>
-
@interface BetaBuilderWindow : NSWindow {
@private
-
}
@end
View
@@ -32,37 +32,18 @@
#import <Cocoa/Cocoa.h>
-@interface BuilderController : NSObject <NSFileManagerDelegate> {
- NSTextField *bundleIdentifierField;
- NSTextField *bundleVersionField;
- NSTextField *bundleNameField;
- NSTextField *webserverDirectoryField;
- NSTextField *archiveIPAFilenameField;
-
- NSButton *overwriteFilesButton;
- NSButton *generateFilesButton;
- NSButton *openInFinderButton;
-
- NSString *mobileProvisionFilePath;
- NSString *appIconFilePath;
-
- NSURL *destinationPath;
- NSString *previousDestinationPathAsString;
-}
-
-@property (nonatomic, retain) IBOutlet NSTextField *bundleIdentifierField;
-@property (nonatomic, retain) IBOutlet NSTextField *bundleVersionField;
-@property (nonatomic, retain) IBOutlet NSTextField *bundleNameField;
-@property (nonatomic, retain) IBOutlet NSTextField *webserverDirectoryField;
-@property (nonatomic, retain) IBOutlet NSTextField *archiveIPAFilenameField;
-
-@property (nonatomic, retain) IBOutlet NSButton *overwriteFilesButton;
-@property (nonatomic, retain) IBOutlet NSButton *generateFilesButton;
-@property (nonatomic, retain) IBOutlet NSButton *openInFinderButton;
-
+@interface BuilderController : NSObject <NSFileManagerDelegate>
+
+@property (nonatomic) IBOutlet NSTextField *bundleIdentifierField;
+@property (nonatomic) IBOutlet NSTextField *bundleVersionField;
+@property (nonatomic) IBOutlet NSTextField *bundleNameField;
+@property (nonatomic) IBOutlet NSTextField *webserverDirectoryField;
+@property (nonatomic) IBOutlet NSTextField *archiveIPAFilenameField;
+@property (nonatomic) IBOutlet NSButton *overwriteFilesButton;
+@property (nonatomic) IBOutlet NSButton *generateFilesButton;
+@property (nonatomic) IBOutlet NSButton *openInFinderButton;
@property (nonatomic, copy) NSString *mobileProvisionFilePath;
@property (nonatomic, copy) NSString *appIconFilePath;
-
@property (nonatomic, copy) NSURL *destinationPath;
@property (nonatomic, copy) NSString *previousDestinationPathAsString;
Oops, something went wrong.

0 comments on commit c949e4a

Please sign in to comment.