From 27acdfdf6c900b0e9bbd061f45c904c1d18fd21d Mon Sep 17 00:00:00 2001 From: hborders Date: Tue, 26 Oct 2010 11:55:12 -0500 Subject: [PATCH 1/8] Added ability to specify arguments and environment. Ignored user-specific xcode project files. --- Source/iPhoneSimulator.m | 90 +- iphonesim.xcodeproj/.gitignore | 4 + iphonesim.xcodeproj/jhaynie.pbxuser | 132 -- iphonesim.xcodeproj/jhaynie.perspectivev3 | 1492 --------------------- iphonesim.xcodeproj/project.pbxproj | 7 + 5 files changed, 66 insertions(+), 1659 deletions(-) create mode 100644 iphonesim.xcodeproj/.gitignore delete mode 100644 iphonesim.xcodeproj/jhaynie.pbxuser delete mode 100644 iphonesim.xcodeproj/jhaynie.perspectivev3 diff --git a/Source/iPhoneSimulator.m b/Source/iPhoneSimulator.m index 0c39f5d..c9ab635 100644 --- a/Source/iPhoneSimulator.m +++ b/Source/iPhoneSimulator.m @@ -45,7 +45,7 @@ - (void) printUsage { fprintf(stderr, "Usage: iphonesim ...\n"); fprintf(stderr, "Commands:\n"); fprintf(stderr, " showsdks\n"); - fprintf(stderr, " launch [sdkversion] [family] [uuid]\n"); + fprintf(stderr, " launch [-sdk ] [-family ] [-uuid ] [-env ] [-args ]\n"); } @@ -86,7 +86,7 @@ - (void) session: (DTiPhoneSimulatorSession *) session didStart: (BOOL) started /** * Launch the given Simulator binary. */ -- (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString*)uuid{ +- (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString*)uuid environment:(NSDictionary *) environment args: (NSArray *) args { DTiPhoneSimulatorApplicationSpecifier *appSpec; DTiPhoneSimulatorSessionConfig *config; DTiPhoneSimulatorSession *session; @@ -99,7 +99,7 @@ - (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString return EXIT_FAILURE; } nsprintf(@"App Spec: %@", appSpec); - + /* Load the default SDK root */ nsprintf(@"SDK Root: %@", sdkRoot); @@ -110,8 +110,8 @@ - (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString [config setSimulatedSystemRoot: sdkRoot]; [config setSimulatedApplicationShouldWaitForDebugger: NO]; - [config setSimulatedApplicationLaunchArgs: [NSArray array]]; - [config setSimulatedApplicationLaunchEnvironment: [NSDictionary dictionary]]; + [config setSimulatedApplicationLaunchArgs: args]; + [config setSimulatedApplicationLaunchEnvironment: environment]; [config setLocalizedClientName: @"TitaniumDeveloper"]; @@ -173,40 +173,60 @@ - (void) runWithArgc: (int) argc argv: (char **) argv { [self printUsage]; exit(EXIT_FAILURE); } - if (argc > 3) { - NSString* ver = [NSString stringWithCString:argv[3] encoding:NSUTF8StringEncoding]; - NSArray *roots = [DTiPhoneSimulatorSystemRoot knownRoots]; - for (DTiPhoneSimulatorSystemRoot *root in roots) { - NSString *v = [root sdkVersion]; - if ([v isEqualToString:ver]) - { - sdkRoot = root; - break; - } - } - if (sdkRoot == nil) - { - fprintf(stderr,"Unknown or unsupported SDK version: %s\n",argv[3]); - [self showSDKs]; - exit(EXIT_FAILURE); - } - } - else { - sdkRoot = [DTiPhoneSimulatorSystemRoot defaultRoot]; - } - - /* Don't exit, adds to runloop */ + NSString *family = nil; NSString *uuid = nil; - if (argc > 4) - { - family = [NSString stringWithUTF8String:argv[4]]; + NSDictionary *environment = [NSDictionary dictionary]; + int i = 3; + for (; i < argc; i++) { + if (strcmp(argv[i], "-sdk") == 0) { + i++; + NSString* ver = [NSString stringWithCString:argv[i] encoding:NSUTF8StringEncoding]; + NSArray *roots = [DTiPhoneSimulatorSystemRoot knownRoots]; + for (DTiPhoneSimulatorSystemRoot *root in roots) { + NSString *v = [root sdkVersion]; + if ([v isEqualToString:ver]) + { + sdkRoot = root; + break; + } + } + if (sdkRoot == nil) + { + fprintf(stderr,"Unknown or unsupported SDK version: %s\n",argv[i]); + [self showSDKs]; + exit(EXIT_FAILURE); + } + } else if (strcmp(argv[i], "-family") == 0) { + i++; + family = [NSString stringWithUTF8String:argv[i]]; + } else if (strcmp(argv[i], "-uuid") == 0) { + i++; + uuid = [NSString stringWithUTF8String:argv[i]]; + } else if (strcmp(argv[i], "-env") == 0) { + i++; + environment = [NSDictionary dictionaryWithContentsOfFile:[NSString stringWithUTF8String:argv[i]]]; + if (!environment) { + fprintf(stderr, "Could not read environment from file: %s\n", argv[i]); + [self printUsage]; + exit(EXIT_FAILURE); + } + } else if (strcmp(argv[i], "-args") == 0) { + i++; + break; + } } - if (argc > 5) - { - uuid = [NSString stringWithUTF8String:argv[5]]; + NSMutableArray *args = [NSMutableArray arrayWithCapacity:argc - i]; + for (; i < argc; i++) { + [args addObject:[NSString stringWithUTF8String:argv[i]]]; } - [self launchApp: [NSString stringWithUTF8String: argv[2]] withFamily:family uuid:uuid]; + + if (sdkRoot == nil) { + sdkRoot = [DTiPhoneSimulatorSystemRoot defaultRoot]; + } + + /* Don't exit, adds to runloop */ + [self launchApp: [NSString stringWithUTF8String: argv[2]] withFamily:family uuid:uuid environment:environment args:args]; } else { fprintf(stderr, "Unknown command\n"); [self printUsage]; diff --git a/iphonesim.xcodeproj/.gitignore b/iphonesim.xcodeproj/.gitignore new file mode 100644 index 0000000..f3324d4 --- /dev/null +++ b/iphonesim.xcodeproj/.gitignore @@ -0,0 +1,4 @@ +*.pbxuser +*.mode1v3 +*.perspectivev3 + diff --git a/iphonesim.xcodeproj/jhaynie.pbxuser b/iphonesim.xcodeproj/jhaynie.pbxuser deleted file mode 100644 index 79429a4..0000000 --- a/iphonesim.xcodeproj/jhaynie.pbxuser +++ /dev/null @@ -1,132 +0,0 @@ -// !$*UTF8*$! -{ - 08FB7793FE84155DC02AAC07 /* Project object */ = { - activeArchitecturePreference = i386; - activeBuildConfigurationName = Release; - activeExecutable = 2481362C115A72C200E3A9BA /* iphonesim */; - activeTarget = 8DD76F960486AA7600D96B5E /* iphonesim */; - addToTargets = ( - 8DD76F960486AA7600D96B5E /* iphonesim */, - ); - codeSenseManager = 2481363C115A72E200E3A9BA /* Code sense */; - executables = ( - 2481362C115A72C200E3A9BA /* iphonesim */, - ); - perUserDictionary = { - PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = { - PBXFileTableDataSourceColumnSortingDirectionKey = "-1"; - PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID; - PBXFileTableDataSourceColumnWidthsKey = ( - 20, - 994, - 20, - 48, - 43, - 43, - 20, - ); - PBXFileTableDataSourceColumnsKey = ( - PBXFileDataSource_FiletypeID, - PBXFileDataSource_Filename_ColumnID, - PBXFileDataSource_Built_ColumnID, - PBXFileDataSource_ObjectSize_ColumnID, - PBXFileDataSource_Errors_ColumnID, - PBXFileDataSource_Warnings_ColumnID, - PBXFileDataSource_Target_ColumnID, - ); - }; - PBXPerProjectTemplateStateSaveDate = 291140838; - PBXWorkspaceStateSaveDate = 291140838; - }; - perUserProjectItems = { - 2481363D115A74B600E3A9BA = 2481363D115A74B600E3A9BA /* PBXTextBookmark */; - 2481363E115A74B600E3A9BA = 2481363E115A74B600E3A9BA /* PBXTextBookmark */; - }; - sourceControlManager = 2481363B115A72E200E3A9BA /* Source Control */; - userBuildSettings = { - }; - }; - 08FB7796FE84155DC02AAC07 /* iphonesim.m */ = { - isa = PBXFileReference; - fileEncoding = 4; - lastKnownFileType = sourcecode.c.objc; - name = iphonesim.m; - path = /Users/jhaynie/work/iphonesim/iphonesim.m; - sourceTree = ""; - uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1172, 576}}"; - sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{0, 234}"; - }; - }; - 2481362C115A72C200E3A9BA /* iphonesim */ = { - isa = PBXExecutable; - activeArgIndices = ( - ); - argumentStrings = ( - ); - autoAttachOnCrash = 1; - breakpointsEnabled = 0; - configStateDict = { - }; - customDataFormattersEnabled = 1; - dataTipCustomDataFormattersEnabled = 1; - dataTipShowTypeColumn = 1; - dataTipSortType = 0; - debuggerPlugin = GDBDebugging; - disassemblyDisplayState = 0; - dylibVariantSuffix = ""; - enableDebugStr = 1; - environmentEntries = ( - ); - executableSystemSymbolLevel = 0; - executableUserSymbolLevel = 0; - libgmallocEnabled = 0; - name = iphonesim; - savedGlobals = { - }; - showTypeColumn = 0; - sourceDirectories = ( - ); - }; - 2481363B115A72E200E3A9BA /* Source Control */ = { - isa = PBXSourceControlManager; - fallbackIsa = XCSourceControlManager; - isSCMEnabled = 0; - scmConfiguration = { - repositoryNamesForRoots = { - "" = ""; - }; - }; - }; - 2481363C115A72E200E3A9BA /* Code sense */ = { - isa = PBXCodeSenseManager; - indexTemplatePath = ""; - }; - 2481363D115A74B600E3A9BA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 08FB7796FE84155DC02AAC07 /* iphonesim.m */; - name = "iphonesim.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 234; - vrLoc = 0; - }; - 2481363E115A74B600E3A9BA /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 08FB7796FE84155DC02AAC07 /* iphonesim.m */; - name = "iphonesim.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 234; - vrLoc = 0; - }; - 8DD76F960486AA7600D96B5E /* iphonesim */ = { - activeExec = 0; - executables = ( - 2481362C115A72C200E3A9BA /* iphonesim */, - ); - }; -} diff --git a/iphonesim.xcodeproj/jhaynie.perspectivev3 b/iphonesim.xcodeproj/jhaynie.perspectivev3 deleted file mode 100644 index 34cf9bd..0000000 --- a/iphonesim.xcodeproj/jhaynie.perspectivev3 +++ /dev/null @@ -1,1492 +0,0 @@ - - - - - ActivePerspectiveName - Project - AllowedModules - - - BundleLoadPath - - MaxInstances - n - Module - PBXSmartGroupTreeModule - Name - Groups and Files Outline View - - - BundleLoadPath - - MaxInstances - n - Module - PBXNavigatorGroup - Name - Editor - - - BundleLoadPath - - MaxInstances - n - Module - XCTaskListModule - Name - Task List - - - BundleLoadPath - - MaxInstances - n - Module - XCDetailModule - Name - File and Smart Group Detail Viewer - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXBuildResultsModule - Name - Detailed Build Results Viewer - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXProjectFindModule - Name - Project Batch Find Tool - - - BundleLoadPath - - MaxInstances - n - Module - XCProjectFormatConflictsModule - Name - Project Format Conflicts List - - - BundleLoadPath - - MaxInstances - n - Module - PBXBookmarksModule - Name - Bookmarks Tool - - - BundleLoadPath - - MaxInstances - n - Module - PBXClassBrowserModule - Name - Class Browser - - - BundleLoadPath - - MaxInstances - n - Module - PBXCVSModule - Name - Source Code Control Tool - - - BundleLoadPath - - MaxInstances - n - Module - PBXDebugBreakpointsModule - Name - Debug Breakpoints Tool - - - BundleLoadPath - - MaxInstances - n - Module - XCDockableInspector - Name - Inspector - - - BundleLoadPath - - MaxInstances - n - Module - PBXOpenQuicklyModule - Name - Open Quickly Tool - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXDebugSessionModule - Name - Debugger - - - BundleLoadPath - - MaxInstances - 1 - Module - PBXDebugCLIModule - Name - Debug Console - - - BundleLoadPath - - MaxInstances - n - Module - XCSnapshotModule - Name - Snapshots Tool - - - BundlePath - /Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources - Description - AIODescriptionKey - DockingSystemVisible - - Extension - perspectivev3 - FavBarConfig - - PBXProjectModuleGUID - 2481363A115A72E200E3A9BA - XCBarModuleItemNames - - XCBarModuleItems - - - FirstTimeWindowDisplayed - - Identifier - com.apple.perspectives.project.defaultV3 - MajorVersion - 34 - MinorVersion - 0 - Name - All-In-One - Notifications - - - XCObserverAutoDisconnectKey - - XCObserverDefintionKey - - PBXStatusErrorsKey - 0 - - XCObserverFactoryKey - XCPerspectivesSpecificationIdentifier - XCObserverGUIDKey - XCObserverProjectIdentifier - XCObserverNotificationKey - PBXStatusBuildStateMessageNotification - XCObserverTargetKey - XCMainBuildResultsModuleGUID - XCObserverTriggerKey - awakenModuleWithObserver: - XCObserverValidationKey - - PBXStatusErrorsKey - 2 - - - - OpenEditors - - PerspectiveWidths - - 1440 - 1440 - - Perspectives - - - ChosenToolbarItems - - XCToolbarPerspectiveControl - NSToolbarSeparatorItem - active-combo-popup - action - NSToolbarFlexibleSpaceItem - debugger-enable-breakpoints - build-and-go - com.apple.ide.PBXToolbarStopButton - get-info - NSToolbarFlexibleSpaceItem - com.apple.pbx.toolbar.searchfield - - ControllerClassBaseName - - IconName - WindowOfProject - Identifier - perspective.project - IsVertical - - Layout - - - BecomeActive - - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C37FBAC04509CD000000102 - 1C37FAAC04509CD000000102 - 1C37FABC05509CD000000102 - 1C37FABC05539CD112110102 - E2644B35053B69B200211256 - 1C37FABC04509CD000100104 - 1CC0EA4004350EF90044410B - 1CC0EA4004350EF90041110B - 1C77FABC04509CD000000102 - - PBXProjectModuleGUID - 1CA23ED40692098700951B8B - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - yes - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 307 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 08FB7794FE84155DC02AAC07 - 08FB7795FE84155DC02AAC07 - 08FB779DFE84155DC02AAC07 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {307, 760}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - - - GeometryConfiguration - - Frame - {{0, 0}, {324, 778}} - GroupTreeTableConfiguration - - MainColumn - 307 - - RubberWindowFrame - 0 59 1440 819 0 0 1440 878 - - Module - PBXSmartGroupTreeModule - Proportion - 324pt - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 24813635115A72E200E3A9BA - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 24813636115A72E200E3A9BA - - SplitCount - 1 - - StatusBarVisibility - - XCSharingToken - com.apple.Xcode.CommonNavigatorGroupSharingToken - - GeometryConfiguration - - Frame - {{0, 0}, {1111, 0}} - RubberWindowFrame - 0 59 1440 819 0 0 1440 878 - - Module - PBXNavigatorGroup - Proportion - 0pt - - - Proportion - 773pt - Tabs - - - ContentConfiguration - - PBXProjectModuleGUID - 1CA23EDF0692099D00951B8B - PBXProjectModuleLabel - Detail - - GeometryConfiguration - - Frame - {{10, 27}, {1233, 142}} - - Module - XCDetailModule - - - ContentConfiguration - - PBXProjectModuleGUID - 1CA23EE00692099D00951B8B - PBXProjectModuleLabel - Project Find - - GeometryConfiguration - - Frame - {{10, 31}, {603, 297}} - - Module - PBXProjectFindModule - - - ContentConfiguration - - PBXCVSModuleFilterTypeKey - 1032 - PBXProjectModuleGUID - 1CA23EE10692099D00951B8B - PBXProjectModuleLabel - SCM Results - - GeometryConfiguration - - Frame - {{10, 31}, {603, 297}} - - Module - PBXCVSModule - - - ContentConfiguration - - PBXProjectModuleGUID - XCMainBuildResultsModuleGUID - PBXProjectModuleLabel - Build Results - XCBuildResultsTrigger_Collapse - 1021 - XCBuildResultsTrigger_Open - 1012 - - GeometryConfiguration - - Frame - {{10, 27}, {1111, 746}} - RubberWindowFrame - 0 59 1440 819 0 0 1440 878 - - Module - PBXBuildResultsModule - - - - - Proportion - 1111pt - - - Name - Project - ServiceClasses - - XCModuleDock - PBXSmartGroupTreeModule - XCModuleDock - PBXNavigatorGroup - XCDockableTabModule - XCDetailModule - PBXProjectFindModule - PBXCVSModule - PBXBuildResultsModule - - TableOfContents - - 2481365C115A756D00E3A9BA - 1CA23ED40692098700951B8B - 2481365D115A756D00E3A9BA - 24813635115A72E200E3A9BA - 2481365E115A756D00E3A9BA - 1CA23EDF0692099D00951B8B - 1CA23EE00692099D00951B8B - 1CA23EE10692099D00951B8B - XCMainBuildResultsModuleGUID - - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarConfiguration - xcode.toolbar.config.defaultV3 - - - ChosenToolbarItems - - XCToolbarPerspectiveControl - NSToolbarSeparatorItem - active-combo-popup - NSToolbarFlexibleSpaceItem - debugger-enable-breakpoints - build-and-go - com.apple.ide.PBXToolbarStopButton - debugger-restart-executable - debugger-pause - debugger-step-over - debugger-step-into - debugger-step-out - NSToolbarFlexibleSpaceItem - servicesModulebreakpoints - debugger-show-console-window - - ControllerClassBaseName - PBXDebugSessionModule - IconName - DebugTabIcon - Identifier - perspective.debug - IsVertical - - Layout - - - ContentConfiguration - - PBXProjectModuleGUID - 1CCC7628064C1048000F2A68 - PBXProjectModuleLabel - Debugger Console - - GeometryConfiguration - - Frame - {{0, 0}, {1440, 330}} - - Module - PBXDebugCLIModule - Proportion - 330pt - - - ContentConfiguration - - Debugger - - HorizontalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {702, 215}} - {{702, 0}, {738, 215}} - - - VerticalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {1440, 215}} - {{0, 215}, {1440, 228}} - - - - LauncherConfigVersion - 8 - PBXProjectModuleGUID - 1CCC7629064C1048000F2A68 - PBXProjectModuleLabel - Debug - - GeometryConfiguration - - DebugConsoleVisible - None - DebugConsoleWindowFrame - {{200, 200}, {500, 300}} - DebugSTDIOWindowFrame - {{200, 200}, {500, 300}} - Frame - {{0, 335}, {1440, 443}} - PBXDebugSessionStackFrameViewKey - - DebugVariablesTableConfiguration - - Name - 120 - Value - 85 - Summary - 508 - - Frame - {{702, 0}, {738, 215}} - - - Module - PBXDebugSessionModule - Proportion - 443pt - - - Name - Debug - ServiceClasses - - XCModuleDock - PBXDebugCLIModule - PBXDebugSessionModule - PBXDebugProcessAndThreadModule - PBXDebugProcessViewModule - PBXDebugThreadViewModule - PBXDebugStackFrameViewModule - PBXNavigatorGroup - - TableOfContents - - 2481366D115A766F00E3A9BA - 1CCC7628064C1048000F2A68 - 1CCC7629064C1048000F2A68 - 2481366E115A766F00E3A9BA - 2481366F115A766F00E3A9BA - 24813670115A766F00E3A9BA - 24813671115A766F00E3A9BA - 24813672115A766F00E3A9BA - - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarConfiguration - xcode.toolbar.config.debugV3 - - - PerspectivesBarVisible - - ShelfIsVisible - - SourceDescription - file at '/Developer/Library/PrivateFrameworks/DevToolsInterface.framework/Resources/XCPerspectivesSpecification.xcperspec' - StatusbarIsVisible - - TimeStamp - 291141406.01175702 - ToolbarConfigUserDefaultsMinorVersion - 2 - ToolbarDisplayMode - 1 - ToolbarIsVisible - - ToolbarSizeMode - 1 - Type - Perspectives - UpdateMessage - - WindowJustification - 5 - WindowOrderList - - 24813673115A766F00E3A9BA - 24813674115A766F00E3A9BA - /Users/jhaynie/work/iphonesim/iphonesim.xcodeproj - - WindowString - 0 59 1440 819 0 0 1440 878 - WindowToolsV3 - - - Identifier - windowTool.debugger - Layout - - - Dock - - - ContentConfiguration - - Debugger - - HorizontalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {317, 164}} - {{317, 0}, {377, 164}} - - - VerticalSplitView - - _collapsingFrameDimension - 0.0 - _indexOfCollapsedView - 0 - _percentageOfCollapsedView - 0.0 - isCollapsed - yes - sizes - - {{0, 0}, {694, 164}} - {{0, 164}, {694, 216}} - - - - LauncherConfigVersion - 8 - PBXProjectModuleGUID - 1C162984064C10D400B95A72 - PBXProjectModuleLabel - Debug - GLUTExamples (Underwater) - - GeometryConfiguration - - DebugConsoleDrawerSize - {100, 120} - DebugConsoleVisible - None - DebugConsoleWindowFrame - {{200, 200}, {500, 300}} - DebugSTDIOWindowFrame - {{200, 200}, {500, 300}} - Frame - {{0, 0}, {694, 380}} - RubberWindowFrame - 321 238 694 422 0 0 1440 878 - - Module - PBXDebugSessionModule - Proportion - 100% - - - Proportion - 100% - - - Name - Debugger - ServiceClasses - - PBXDebugSessionModule - - StatusbarIsVisible - 1 - TableOfContents - - 1CD10A99069EF8BA00B06720 - 1C0AD2AB069F1E9B00FABCE6 - 1C162984064C10D400B95A72 - 1C0AD2AC069F1E9B00FABCE6 - - ToolbarConfiguration - xcode.toolbar.config.debugV3 - WindowString - 321 238 694 422 0 0 1440 878 - WindowToolGUID - 1CD10A99069EF8BA00B06720 - WindowToolIsVisible - 0 - - - Identifier - windowTool.build - Layout - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1CD0528F0623707200166675 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1CD052900623707200166675 - - SplitCount - 1 - - StatusBarVisibility - 1 - - GeometryConfiguration - - Frame - {{0, 0}, {500, 215}} - RubberWindowFrame - 192 257 500 500 0 0 1280 1002 - - Module - PBXNavigatorGroup - Proportion - 218pt - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - XCMainBuildResultsModuleGUID - PBXProjectModuleLabel - Build Results - - GeometryConfiguration - - Frame - {{0, 222}, {500, 236}} - RubberWindowFrame - 192 257 500 500 0 0 1280 1002 - - Module - PBXBuildResultsModule - Proportion - 236pt - - - Proportion - 458pt - - - Name - Build Results - ServiceClasses - - PBXBuildResultsModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C78EAA5065D492600B07095 - 1C78EAA6065D492600B07095 - 1CD0528F0623707200166675 - XCMainBuildResultsModuleGUID - - ToolbarConfiguration - xcode.toolbar.config.buildV3 - WindowString - 192 257 500 500 0 0 1280 1002 - - - Identifier - windowTool.find - Layout - - - Dock - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1CDD528C0622207200134675 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1CD0528D0623707200166675 - - SplitCount - 1 - - StatusBarVisibility - 1 - - GeometryConfiguration - - Frame - {{0, 0}, {781, 167}} - RubberWindowFrame - 62 385 781 470 0 0 1440 878 - - Module - PBXNavigatorGroup - Proportion - 781pt - - - Proportion - 50% - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1CD0528E0623707200166675 - PBXProjectModuleLabel - Project Find - - GeometryConfiguration - - Frame - {{8, 0}, {773, 254}} - RubberWindowFrame - 62 385 781 470 0 0 1440 878 - - Module - PBXProjectFindModule - Proportion - 50% - - - Proportion - 428pt - - - Name - Project Find - ServiceClasses - - PBXProjectFindModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C530D57069F1CE1000CFCEE - 1C530D58069F1CE1000CFCEE - 1C530D59069F1CE1000CFCEE - 1CDD528C0622207200134675 - 1C530D5A069F1CE1000CFCEE - 1CE0B1FE06471DED0097A5F4 - 1CD0528E0623707200166675 - - WindowString - 62 385 781 470 0 0 1440 878 - WindowToolGUID - 1C530D57069F1CE1000CFCEE - WindowToolIsVisible - 0 - - - Identifier - windowTool.snapshots - Layout - - - Dock - - - Module - XCSnapshotModule - Proportion - 100% - - - Proportion - 100% - - - Name - Snapshots - ServiceClasses - - XCSnapshotModule - - StatusbarIsVisible - Yes - ToolbarConfiguration - xcode.toolbar.config.snapshots - WindowString - 315 824 300 550 0 0 1440 878 - WindowToolIsVisible - Yes - - - Identifier - windowTool.debuggerConsole - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1C78EAAC065D492600B07095 - PBXProjectModuleLabel - Debugger Console - - GeometryConfiguration - - Frame - {{0, 0}, {700, 358}} - RubberWindowFrame - 149 87 700 400 0 0 1440 878 - - Module - PBXDebugCLIModule - Proportion - 358pt - - - Proportion - 358pt - - - Name - Debugger Console - ServiceClasses - - PBXDebugCLIModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C530D5B069F1CE1000CFCEE - 1C530D5C069F1CE1000CFCEE - 1C78EAAC065D492600B07095 - - ToolbarConfiguration - xcode.toolbar.config.consoleV3 - WindowString - 149 87 440 400 0 0 1440 878 - WindowToolGUID - 1C530D5B069F1CE1000CFCEE - WindowToolIsVisible - 0 - - - Identifier - windowTool.scm - Layout - - - Dock - - - ContentConfiguration - - PBXProjectModuleGUID - 1C78EAB2065D492600B07095 - PBXProjectModuleLabel - <No Editor> - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 1C78EAB3065D492600B07095 - - SplitCount - 1 - - StatusBarVisibility - 1 - - GeometryConfiguration - - Frame - {{0, 0}, {452, 0}} - RubberWindowFrame - 743 379 452 308 0 0 1280 1002 - - Module - PBXNavigatorGroup - Proportion - 0pt - - - BecomeActive - 1 - ContentConfiguration - - PBXProjectModuleGUID - 1CD052920623707200166675 - PBXProjectModuleLabel - SCM - - GeometryConfiguration - - ConsoleFrame - {{0, 259}, {452, 0}} - Frame - {{0, 7}, {452, 259}} - RubberWindowFrame - 743 379 452 308 0 0 1280 1002 - TableConfiguration - - Status - 30 - FileName - 199 - Path - 197.09500122070312 - - TableFrame - {{0, 0}, {452, 250}} - - Module - PBXCVSModule - Proportion - 262pt - - - Proportion - 266pt - - - Name - SCM - ServiceClasses - - PBXCVSModule - - StatusbarIsVisible - 1 - TableOfContents - - 1C78EAB4065D492600B07095 - 1C78EAB5065D492600B07095 - 1C78EAB2065D492600B07095 - 1CD052920623707200166675 - - ToolbarConfiguration - xcode.toolbar.config.scmV3 - WindowString - 743 379 452 308 0 0 1280 1002 - - - Identifier - windowTool.breakpoints - IsVertical - 0 - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - PBXBottomSmartGroupGIDs - - 1C77FABC04509CD000000102 - - PBXProjectModuleGUID - 1CE0B1FE06471DED0097A5F4 - PBXProjectModuleLabel - Files - PBXProjectStructureProvided - no - PBXSmartGroupTreeModuleColumnData - - PBXSmartGroupTreeModuleColumnWidthsKey - - 168 - - PBXSmartGroupTreeModuleColumnsKey_v4 - - MainColumn - - - PBXSmartGroupTreeModuleOutlineStateKey_v7 - - PBXSmartGroupTreeModuleOutlineStateExpansionKey - - 1C77FABC04509CD000000102 - - PBXSmartGroupTreeModuleOutlineStateSelectionKey - - - 0 - - - PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 0}, {168, 350}} - - PBXTopSmartGroupGIDs - - XCIncludePerspectivesSwitch - 0 - - GeometryConfiguration - - Frame - {{0, 0}, {185, 368}} - GroupTreeTableConfiguration - - MainColumn - 168 - - RubberWindowFrame - 315 424 744 409 0 0 1440 878 - - Module - PBXSmartGroupTreeModule - Proportion - 185pt - - - ContentConfiguration - - PBXProjectModuleGUID - 1CA1AED706398EBD00589147 - PBXProjectModuleLabel - Detail - - GeometryConfiguration - - Frame - {{190, 0}, {554, 368}} - RubberWindowFrame - 315 424 744 409 0 0 1440 878 - - Module - XCDetailModule - Proportion - 554pt - - - Proportion - 368pt - - - MajorVersion - 3 - MinorVersion - 0 - Name - Breakpoints - ServiceClasses - - PBXSmartGroupTreeModule - XCDetailModule - - StatusbarIsVisible - 1 - TableOfContents - - 1CDDB66807F98D9800BB5817 - 1CDDB66907F98D9800BB5817 - 1CE0B1FE06471DED0097A5F4 - 1CA1AED706398EBD00589147 - - ToolbarConfiguration - xcode.toolbar.config.breakpointsV3 - WindowString - 315 424 744 409 0 0 1440 878 - WindowToolGUID - 1CDDB66807F98D9800BB5817 - WindowToolIsVisible - 1 - - - Identifier - windowTool.debugAnimator - Layout - - - Dock - - - Module - PBXNavigatorGroup - Proportion - 100% - - - Proportion - 100% - - - Name - Debug Visualizer - ServiceClasses - - PBXNavigatorGroup - - StatusbarIsVisible - 1 - ToolbarConfiguration - xcode.toolbar.config.debugAnimatorV3 - WindowString - 100 100 700 500 0 0 1280 1002 - - - Identifier - windowTool.bookmarks - Layout - - - Dock - - - Module - PBXBookmarksModule - Proportion - 166pt - - - Proportion - 166pt - - - Name - Bookmarks - ServiceClasses - - PBXBookmarksModule - - StatusbarIsVisible - 0 - WindowString - 538 42 401 187 0 0 1280 1002 - - - Identifier - windowTool.projectFormatConflicts - Layout - - - Dock - - - Module - XCProjectFormatConflictsModule - Proportion - 100% - - - Proportion - 100% - - - Name - Project Format Conflicts - ServiceClasses - - XCProjectFormatConflictsModule - - StatusbarIsVisible - 0 - WindowContentMinSize - 450 300 - WindowString - 50 850 472 307 0 0 1440 877 - - - Identifier - windowTool.classBrowser - Layout - - - Dock - - - BecomeActive - 1 - ContentConfiguration - - OptionsSetName - Hierarchy, all classes - PBXProjectModuleGUID - 1CA6456E063B45B4001379D8 - PBXProjectModuleLabel - Class Browser - NSObject - - GeometryConfiguration - - ClassesFrame - {{0, 0}, {369, 96}} - ClassesTreeTableConfiguration - - PBXClassNameColumnIdentifier - 208 - PBXClassBookColumnIdentifier - 22 - - Frame - {{0, 0}, {616, 353}} - MembersFrame - {{0, 105}, {369, 395}} - MembersTreeTableConfiguration - - PBXMemberTypeIconColumnIdentifier - 22 - PBXMemberNameColumnIdentifier - 216 - PBXMemberTypeColumnIdentifier - 94 - PBXMemberBookColumnIdentifier - 22 - - PBXModuleWindowStatusBarHidden2 - 1 - RubberWindowFrame - 597 125 616 374 0 0 1280 1002 - - Module - PBXClassBrowserModule - Proportion - 354pt - - - Proportion - 354pt - - - Name - Class Browser - ServiceClasses - - PBXClassBrowserModule - - StatusbarIsVisible - 0 - TableOfContents - - 1C78EABA065D492600B07095 - 1C78EABB065D492600B07095 - 1CA6456E063B45B4001379D8 - - ToolbarConfiguration - xcode.toolbar.config.classbrowser - WindowString - 597 125 616 374 0 0 1280 1002 - - - Identifier - windowTool.refactoring - IncludeInToolsMenu - 0 - Layout - - - Dock - - - BecomeActive - 1 - GeometryConfiguration - - Frame - {0, 0}, {500, 335} - RubberWindowFrame - {0, 0}, {500, 335} - - Module - XCRefactoringModule - Proportion - 100% - - - Proportion - 100% - - - Name - Refactoring - ServiceClasses - - XCRefactoringModule - - WindowString - 200 200 500 356 0 0 1920 1200 - - - - diff --git a/iphonesim.xcodeproj/project.pbxproj b/iphonesim.xcodeproj/project.pbxproj index e717bfa..24961c4 100644 --- a/iphonesim.xcodeproj/project.pbxproj +++ b/iphonesim.xcodeproj/project.pbxproj @@ -115,7 +115,14 @@ isa = PBXProject; buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "iphonesim" */; compatibilityVersion = "Xcode 3.1"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08FB7794FE84155DC02AAC07 /* iphonesim */; projectDirPath = ""; projectRoot = ""; From 452d2fe1e8a418a448764649820ad8e9226ebfd6 Mon Sep 17 00:00:00 2001 From: hborders Date: Tue, 26 Oct 2010 13:49:34 -0500 Subject: [PATCH 2/8] Added stdout and stderr arguments. -Heath --- Source/iPhoneSimulator.m | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Source/iPhoneSimulator.m b/Source/iPhoneSimulator.m index c9ab635..6bc0142 100644 --- a/Source/iPhoneSimulator.m +++ b/Source/iPhoneSimulator.m @@ -45,7 +45,7 @@ - (void) printUsage { fprintf(stderr, "Usage: iphonesim ...\n"); fprintf(stderr, "Commands:\n"); fprintf(stderr, " showsdks\n"); - fprintf(stderr, " launch [-sdk ] [-family ] [-uuid ] [-env ] [-args ]\n"); + fprintf(stderr, " launch [-sdk ] [-family ] [-uuid ] [-env ] [-stdout ] [-stderr ] [-args ]\n"); } @@ -86,7 +86,7 @@ - (void) session: (DTiPhoneSimulatorSession *) session didStart: (BOOL) started /** * Launch the given Simulator binary. */ -- (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString*)uuid environment:(NSDictionary *) environment args: (NSArray *) args { +- (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString*)uuid environment:(NSDictionary *) environment stdoutPath: (NSString *) stdoutPath stderrPath: (NSString *) stderrPath args: (NSArray *) args{ DTiPhoneSimulatorApplicationSpecifier *appSpec; DTiPhoneSimulatorSessionConfig *config; DTiPhoneSimulatorSession *session; @@ -112,6 +112,14 @@ - (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString [config setSimulatedApplicationLaunchArgs: args]; [config setSimulatedApplicationLaunchEnvironment: environment]; + + if (stderrPath) { + [config setSimulatedApplicationStdErrPath:stderrPath]; + } + + if (stdoutPath) { + [config setSimulatedApplicationStdOutPath:stdoutPath]; + } [config setLocalizedClientName: @"TitaniumDeveloper"]; @@ -176,6 +184,8 @@ - (void) runWithArgc: (int) argc argv: (char **) argv { NSString *family = nil; NSString *uuid = nil; + NSString *stdoutPath = nil; + NSString *stderrPath = nil; NSDictionary *environment = [NSDictionary dictionary]; int i = 3; for (; i < argc; i++) { @@ -211,6 +221,12 @@ - (void) runWithArgc: (int) argc argv: (char **) argv { [self printUsage]; exit(EXIT_FAILURE); } + } else if (strcmp(argv[i], "-stdout") == 0) { + i++; + stdoutPath = [NSString stringWithUTF8String:argv[i]]; + } else if (strcmp(argv[i], "-stderr") == 0) { + i++; + stderrPath = [NSString stringWithUTF8String:argv[i]]; } else if (strcmp(argv[i], "-args") == 0) { i++; break; @@ -226,7 +242,7 @@ - (void) runWithArgc: (int) argc argv: (char **) argv { } /* Don't exit, adds to runloop */ - [self launchApp: [NSString stringWithUTF8String: argv[2]] withFamily:family uuid:uuid environment:environment args:args]; + [self launchApp: [NSString stringWithUTF8String: argv[2]] withFamily:family uuid:uuid environment:environment stdoutPath:stdoutPath stderrPath:stderrPath args:args]; } else { fprintf(stderr, "Unknown command\n"); [self printUsage]; From 1be209449e08069b7d83a569ebd01a2fb6c8acde Mon Sep 17 00:00:00 2001 From: hborders Date: Wed, 27 Oct 2010 10:25:02 -0500 Subject: [PATCH 3/8] Removed debug output unless -verbose is passed. --- Source/iPhoneSimulator.h | 1 + Source/iPhoneSimulator.m | 35 +++++++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/Source/iPhoneSimulator.h b/Source/iPhoneSimulator.h index 7148716..f5431ca 100644 --- a/Source/iPhoneSimulator.h +++ b/Source/iPhoneSimulator.h @@ -36,6 +36,7 @@ @interface iPhoneSimulator : NSObject { @private DTiPhoneSimulatorSystemRoot *sdkRoot; + BOOL verbose; } - (void) runWithArgc: (int) argc argv: (char **) argv; diff --git a/Source/iPhoneSimulator.m b/Source/iPhoneSimulator.m index 6bc0142..13453db 100644 --- a/Source/iPhoneSimulator.m +++ b/Source/iPhoneSimulator.m @@ -45,7 +45,7 @@ - (void) printUsage { fprintf(stderr, "Usage: iphonesim ...\n"); fprintf(stderr, "Commands:\n"); fprintf(stderr, " showsdks\n"); - fprintf(stderr, " launch [-sdk ] [-family ] [-uuid ] [-env ] [-stdout ] [-stderr ] [-args ]\n"); + fprintf(stderr, " launch [-verbose] [-sdk ] [-family ] [-uuid ] [-env ] [-stdout ] [-stderr ] [-args ]\n"); } @@ -64,7 +64,9 @@ - (int) showSDKs { } - (void) session: (DTiPhoneSimulatorSession *) session didEndWithError: (NSError *) error { - nsprintf(@"Session did end with error %@", error); + if (verbose) { + nsprintf(@"Session did end with error %@", error); + } if (error != nil) exit(EXIT_FAILURE); @@ -75,7 +77,9 @@ - (void) session: (DTiPhoneSimulatorSession *) session didEndWithError: (NSError - (void) session: (DTiPhoneSimulatorSession *) session didStart: (BOOL) started withError: (NSError *) error { if (started) { - nsprintf(@"Session started"); + if (verbose) { + nsprintf(@"Session started"); + } } else { nsprintf(@"Session could not be started: %@", error); exit(EXIT_FAILURE); @@ -98,11 +102,13 @@ - (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString nsprintf(@"Could not load application specification for %s", path); return EXIT_FAILURE; } - nsprintf(@"App Spec: %@", appSpec); - - /* Load the default SDK root */ - - nsprintf(@"SDK Root: %@", sdkRoot); + if (verbose) { + nsprintf(@"App Spec: %@", appSpec); + + /* Load the default SDK root */ + + nsprintf(@"SDK Root: %@", sdkRoot); + } /* Set up the session configuration */ config = [[[DTiPhoneSimulatorSessionConfig alloc] init] autorelease]; @@ -131,7 +137,9 @@ - (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString family = @"iphone"; } - nsprintf(@"using device family %@",family); + if (verbose) { + nsprintf(@"using device family %@",family); + } if ([family isEqualToString:@"ipad"]) { @@ -189,7 +197,10 @@ - (void) runWithArgc: (int) argc argv: (char **) argv { NSDictionary *environment = [NSDictionary dictionary]; int i = 3; for (; i < argc; i++) { - if (strcmp(argv[i], "-sdk") == 0) { + if (strcmp(argv[i], "-verbose") ==0) { + verbose = YES; + } + else if (strcmp(argv[i], "-sdk") == 0) { i++; NSString* ver = [NSString stringWithCString:argv[i] encoding:NSUTF8StringEncoding]; NSArray *roots = [DTiPhoneSimulatorSystemRoot knownRoots]; @@ -230,6 +241,10 @@ - (void) runWithArgc: (int) argc argv: (char **) argv { } else if (strcmp(argv[i], "-args") == 0) { i++; break; + } else { + fprintf(stderr, "unrecognized argument:%s\n", argv[i]); + [self printUsage]; + exit(EXIT_FAILURE); } } NSMutableArray *args = [NSMutableArray arrayWithCapacity:argc - i]; From 8afcd23a62f58398ed8967045c7a597ef944d1fe Mon Sep 17 00:00:00 2001 From: hborders Date: Thu, 6 Jan 2011 21:22:29 -0600 Subject: [PATCH 4/8] Made ipad launcher option clearer. --- Source/iPhoneSimulator.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/iPhoneSimulator.m b/Source/iPhoneSimulator.m index 13453db..d9c00d8 100644 --- a/Source/iPhoneSimulator.m +++ b/Source/iPhoneSimulator.m @@ -45,7 +45,7 @@ - (void) printUsage { fprintf(stderr, "Usage: iphonesim ...\n"); fprintf(stderr, "Commands:\n"); fprintf(stderr, " showsdks\n"); - fprintf(stderr, " launch [-verbose] [-sdk ] [-family ] [-uuid ] [-env ] [-stdout ] [-stderr ] [-args ]\n"); + fprintf(stderr, " launch [-verbose] [-sdk ] [-family ipad] [-uuid ] [-env ] [-stdout ] [-stderr ] [-args ]\n"); } From f6fdd0a1673824212fd85ffbf7576454b8e06569 Mon Sep 17 00:00:00 2001 From: hborders Date: Tue, 19 Apr 2011 11:08:20 -0500 Subject: [PATCH 5/8] Improved error message output by dumping userInfo dictionaries and walking the NSUnderlyingError stack. --- Source/iPhoneSimulator.m | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/iPhoneSimulator.m b/Source/iPhoneSimulator.m index d9c00d8..efc2eab 100644 --- a/Source/iPhoneSimulator.m +++ b/Source/iPhoneSimulator.m @@ -81,7 +81,16 @@ - (void) session: (DTiPhoneSimulatorSession *) session didStart: (BOOL) started nsprintf(@"Session started"); } } else { - nsprintf(@"Session could not be started: %@", error); + NSMutableArray *errorLines = [NSMutableArray arrayWithObject:@"Session could not be started (errors below):"]; + for (NSError *innerError = error; innerError != nil; innerError = [[innerError userInfo] objectForKey:NSUnderlyingErrorKey]) { + [errorLines addObject:[NSString stringWithFormat: + @"%@ %@ %@", + innerError, + [innerError localizedDescription], + [innerError userInfo]]]; + } + NSString *errorMessage = [errorLines componentsJoinedByString:@"\n"]; + nsprintf(errorMessage); exit(EXIT_FAILURE); } } From c4ee6b2b188e0f7b88a2d7d72b4e316e957cf2b3 Mon Sep 17 00:00:00 2001 From: hborders Date: Tue, 19 Apr 2011 11:08:56 -0500 Subject: [PATCH 6/8] Fixed memory leak. --- Source/main.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/main.m b/Source/main.m index 06be63c..3a0067d 100644 --- a/Source/main.m +++ b/Source/main.m @@ -39,7 +39,7 @@ */ int main (int argc, char *argv[]) { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - iPhoneSimulator *sim = [[iPhoneSimulator alloc] init]; + iPhoneSimulator *sim = [[[iPhoneSimulator alloc] init] autorelease]; /* Execute command line handler */ [sim runWithArgc: argc argv: argv]; From a6e4959c0ee5803520b2595890dc64427e051078 Mon Sep 17 00:00:00 2001 From: hborders Date: Fri, 24 Feb 2012 10:35:21 -0600 Subject: [PATCH 7/8] Ignored Xcode4 files. --- .gitignore | 1 + iphonesim.xcodeproj/.gitignore | 1 + iphonesim.xcodeproj/project.xcworkspace/.gitignore | 1 + .../project.xcworkspace/contents.xcworkspacedata | 7 +++++++ 4 files changed, 10 insertions(+) create mode 100644 iphonesim.xcodeproj/project.xcworkspace/.gitignore create mode 100644 iphonesim.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/.gitignore b/.gitignore index 6e1d081..5680e12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build iphonesim +.DS_Store diff --git a/iphonesim.xcodeproj/.gitignore b/iphonesim.xcodeproj/.gitignore index f3324d4..e976f15 100644 --- a/iphonesim.xcodeproj/.gitignore +++ b/iphonesim.xcodeproj/.gitignore @@ -2,3 +2,4 @@ *.mode1v3 *.perspectivev3 +xcuserdata diff --git a/iphonesim.xcodeproj/project.xcworkspace/.gitignore b/iphonesim.xcodeproj/project.xcworkspace/.gitignore new file mode 100644 index 0000000..9bce6af --- /dev/null +++ b/iphonesim.xcodeproj/project.xcworkspace/.gitignore @@ -0,0 +1 @@ +xcuserdata diff --git a/iphonesim.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iphonesim.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..df2e14e --- /dev/null +++ b/iphonesim.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + From ce250e504215ddc7bc2c97c4f781e2acad51d43c Mon Sep 17 00:00:00 2001 From: hborders Date: Fri, 24 Feb 2012 10:32:39 -0600 Subject: [PATCH 8/8] Changed to use Xcode 4.3 tools and OSX 10.7 --- .gitignore | 1 + iphonesim.xcodeproj/.gitignore | 1 + iphonesim.xcodeproj/project.pbxproj | 38 +++++++++---------- .../project.xcworkspace/.gitiginore | 1 + .../contents.xcworkspacedata | 7 ++++ 5 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 iphonesim.xcodeproj/project.xcworkspace/.gitiginore create mode 100644 iphonesim.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/.gitignore b/.gitignore index 6e1d081..5680e12 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build iphonesim +.DS_Store diff --git a/iphonesim.xcodeproj/.gitignore b/iphonesim.xcodeproj/.gitignore index f3324d4..f0e3bea 100644 --- a/iphonesim.xcodeproj/.gitignore +++ b/iphonesim.xcodeproj/.gitignore @@ -1,4 +1,5 @@ *.pbxuser *.mode1v3 *.perspectivev3 +xcuserdata diff --git a/iphonesim.xcodeproj/project.pbxproj b/iphonesim.xcodeproj/project.pbxproj index 24961c4..5cffd56 100644 --- a/iphonesim.xcodeproj/project.pbxproj +++ b/iphonesim.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 45; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ @@ -113,8 +113,11 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0430; + }; buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "iphonesim" */; - compatibilityVersion = "Xcode 3.1"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -151,12 +154,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks\"", - ); GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -171,10 +169,6 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "\"$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks\"", - ); GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = iphonesim_Prefix.pch; @@ -187,7 +181,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - FRAMEWORK_SEARCH_PATHS = /Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks; + FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_DIR)\"/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -197,14 +191,15 @@ OTHER_LDFLAGS = ( "-framework", AppKit, - "-F/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks", + "-F\"$(DEVELOPER_DIR)\"/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks", "-framework", iPhoneSimulatorRemoteClient, "-Wl,-rpath", - "-Wl,/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks", + "-Wl,\"$(DEVELOPER_DIR)\"/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks", + "-Wl,-rpath", + "-Wl,\"$(DEVELOPER_DIR)\"/../OtherFrameworks", ); - PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 x86_64"; }; name = Debug; @@ -213,7 +208,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - FRAMEWORK_SEARCH_PATHS = /Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks; + FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_DIR)\"/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -222,14 +217,15 @@ OTHER_LDFLAGS = ( "-framework", AppKit, - "-F/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks", + "-F\"$(DEVELOPER_DIR)\"/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks", "-framework", iPhoneSimulatorRemoteClient, "-Wl,-rpath", - "-Wl,/Developer/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks", + "-Wl,\"$(DEVELOPER_DIR)\"/Platforms/iPhoneSimulator.platform/Developer/Library/PrivateFrameworks", + "-Wl,-rpath", + "-Wl,\"$(DEVELOPER_DIR)\"/../OtherFrameworks", ); - PREBINDING = NO; - SDKROOT = macosx10.6; + SDKROOT = macosx; VALID_ARCHS = "i386 x86_64"; }; name = Release; diff --git a/iphonesim.xcodeproj/project.xcworkspace/.gitiginore b/iphonesim.xcodeproj/project.xcworkspace/.gitiginore new file mode 100644 index 0000000..9bce6af --- /dev/null +++ b/iphonesim.xcodeproj/project.xcworkspace/.gitiginore @@ -0,0 +1 @@ +xcuserdata diff --git a/iphonesim.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iphonesim.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..df2e14e --- /dev/null +++ b/iphonesim.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + +