Moving xcode project to the root of the folder, adding selenium-objec…

…tive-c as a submodule

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "submodules/selenium-objective-c"]
+	path = submodules/selenium-objective-c
+	url = git://github.com/appium/selenium-objective-c

obj-c/Appium/Appium.xcodeproj/project.pbxproj → Appium.xcodeproj/project.pbxproj

@@ -12,7 +12,6 @@
 		3612E5FC16E5B69C0050CF0A /* AppiumAppleScriptSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = 3612E5FB16E5B69C0050CF0A /* AppiumAppleScriptSupport.m */; };
 		3618718D171887CC0021D7F7 /* AppiumCodeMakerSwipePopOverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3618718C171887CC0021D7F7 /* AppiumCodeMakerSwipePopOverViewController.m */; };
 		362B5B651713B35A00F1B344 /* AppiumCodeMakerCSharpPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 362B5B641713B35A00F1B344 /* AppiumCodeMakerCSharpPlugin.m */; };
-		363782FC172ADA3A00A924F8 /* Selenium.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 363782F7172AD9F300A924F8 /* Selenium.framework */; };
 		364C076816E94B1A0093011E /* AppiumMenuBarManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 364C076716E94B1A0093011E /* AppiumMenuBarManager.m */; };
 		3652B34416E4287600BDE3E4 /* AppiumLaunchButtonTextTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3652B34316E4287600BDE3E4 /* AppiumLaunchButtonTextTransformer.m */; };
 		365A2D7E16E3C847007BADF9 /* Utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 365A2D7D16E3C847007BADF9 /* Utility.m */; };
@@ -73,27 +72,20 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		363782F6172AD9F300A924F8 /* PBXContainerItemProxy */ = {
+		36A19FFF173FFF34002717C2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 363782F1172AD9F200A924F8 /* Selenium.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 36BB380116F268C2003A46FD;
 			remoteInfo = Selenium;
 		};
-		363782F8172AD9F300A924F8 /* PBXContainerItemProxy */ = {
+		36A1A001173FFF34002717C2 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 363782F1172AD9F200A924F8 /* Selenium.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = 36BB381916F268C2003A46FD;
 			remoteInfo = SeleniumTests;
 		};
-		363782FA172ADA1100A924F8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 363782F1172AD9F200A924F8 /* Selenium.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = 36BB380016F268C2003A46FD;
-			remoteInfo = Selenium;
-		};
 		36CEB7EC16E3662E00B5B100 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 36CEB7C016E3662E00B5B100 /* Project object */;
@@ -110,7 +102,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				363782FC172ADA3A00A924F8 /* Selenium.framework in CopyFiles */,
 				369ED812171DA83F000A7A4E /* MGSFragaria.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -130,7 +121,7 @@
 		362B5B641713B35A00F1B344 /* AppiumCodeMakerCSharpPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppiumCodeMakerCSharpPlugin.m; path = Plugins/AppiumCodeMakerCSharpPlugin.m; sourceTree = "<group>"; };
 		362DF1E4170F4350001CAD1D /* AppiumGlobals.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppiumGlobals.h; sourceTree = "<group>"; };
 		363236791713B2470088FFBC /* AppiumCodeMakerPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppiumCodeMakerPlugin.h; path = Plugins/AppiumCodeMakerPlugin.h; sourceTree = "<group>"; };
-		363782F1172AD9F200A924F8 /* Selenium.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Selenium.xcodeproj; path = "../../../selenium-objective-c/Selenium/Selenium.xcodeproj"; sourceTree = "<group>"; };
+		363782F1172AD9F200A924F8 /* Selenium.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Selenium.xcodeproj; path = "submodules/selenium-objective-c/Selenium/Selenium.xcodeproj"; sourceTree = "<group>"; };
 		364C076616E94B1A0093011E /* AppiumMenuBarManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppiumMenuBarManager.h; sourceTree = "<group>"; };
 		364C076716E94B1A0093011E /* AppiumMenuBarManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppiumMenuBarManager.m; sourceTree = "<group>"; };
 		3652B34216E4287600BDE3E4 /* AppiumLaunchButtonTextTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppiumLaunchButtonTextTransformer.h; sourceTree = "<group>"; };
@@ -382,15 +373,6 @@
 			path = CodeMaker;
 			sourceTree = "<group>";
 		};
-		363782F2172AD9F200A924F8 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				363782F7172AD9F300A924F8 /* Selenium.framework */,
-				363782F9172AD9F300A924F8 /* SeleniumTests.octest */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		3652B34116E4285900BDE3E4 /* NSValueTransformers */ = {
 			isa = PBXGroup;
 			children = (
@@ -448,6 +430,15 @@
 			name = Utility;
 			sourceTree = "<group>";
 		};
+		36A19FFB173FFF34002717C2 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				36A1A000173FFF34002717C2 /* Selenium.framework */,
+				36A1A002173FFF34002717C2 /* SeleniumTests.octest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		36BF1D63171B432E00C2CF01 /* Actions */ = {
 			isa = PBXGroup;
 			children = (
@@ -598,7 +589,6 @@
 			buildRules = (
 			);
 			dependencies = (
-				363782FB172ADA1100A924F8 /* PBXTargetDependency */,
 			);
 			name = Appium;
 			productName = Appium;
@@ -646,7 +636,7 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = 363782F2172AD9F200A924F8 /* Products */;
+					ProductGroup = 36A19FFB173FFF34002717C2 /* Products */;
 					ProjectRef = 363782F1172AD9F200A924F8 /* Selenium.xcodeproj */;
 				},
 			);
@@ -659,18 +649,18 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		363782F7172AD9F300A924F8 /* Selenium.framework */ = {
+		36A1A000173FFF34002717C2 /* Selenium.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
 			path = Selenium.framework;
-			remoteRef = 363782F6172AD9F300A924F8 /* PBXContainerItemProxy */;
+			remoteRef = 36A19FFF173FFF34002717C2 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		363782F9172AD9F300A924F8 /* SeleniumTests.octest */ = {
+		36A1A002173FFF34002717C2 /* SeleniumTests.octest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
 			path = SeleniumTests.octest;
-			remoteRef = 363782F8172AD9F300A924F8 /* PBXContainerItemProxy */;
+			remoteRef = 36A1A001173FFF34002717C2 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -781,11 +771,6 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		363782FB172ADA1100A924F8 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = Selenium;
-			targetProxy = 363782FA172ADA1100A924F8 /* PBXContainerItemProxy */;
-		};
 		36CEB7ED16E3662E00B5B100 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = 36CEB7C716E3662E00B5B100 /* Appium */;

Appium.xcodeproj/xcuserdata/danc.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,27 @@
+<?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>SchemeUserState</key>
+	<dict>
+		<key>Appium.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>36CEB7C716E3662E00B5B100</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>36CEB7E716E3662E00B5B100</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>

obj-c/Appium/Appium/Server/AppiumAppDelegate.m → Appium/Server/AppiumAppDelegate.m

@@ -104,14 +104,6 @@ -(void) install
         [[installationWindow messageLabel] performSelectorOnMainThread:@selector(setStringValue:) withObject:@"Installing Appium..." waitUntilDone:YES];
         [[[self mainWindowController] node] installPackage:@"appium" forceInstall:NO];
         [[installationWindow window] performSelectorOnMainThread:@selector(close) withObject:nil waitUntilDone:YES];
-
-		NSString *iwdPath = [NSString stringWithFormat:@"%@/submodules/instruments-without-delay/build", [[self.mainWindowController node] pathtoPackage:@"appium"]];
-		if (![[NSFileManager defaultManager] fileExistsAtPath:iwdPath])
-		{
-			NSString *submodulesPath = [NSString stringWithFormat:@"%@/submodules", [[self.mainWindowController node] pathtoPackage:@"appium"]];
-			[[installationWindow messageLabel] performSelectorOnMainThread:@selector(setStringValue:) withObject:@"Building \"Instruments Without Delay\"..." waitUntilDone:YES];
-			[Utility runTaskWithBinary:@"/bin/sh" arguments:[NSArray arrayWithObjects:@"./build.sh", nil] path:[NSString stringWithFormat:@"%@/%@", submodulesPath, @"instruments-without-delay"]];
-		}
     }
     else
     {

Frameworks/MGSFragaria.framework/Versions/A/Headers/MGSBreakpointDelegate.h

@@ -0,0 +1,16 @@
+//
+//  MGSBreakpointDelegate.h
+//  Fragaria
+//
+//  Created by Viktor Lidholt on 3/5/13.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol MGSBreakpointDelegate <NSObject>
+
+- (void) toggleBreakpointForFile:(NSString*)file onLine:(int)line;
+- (NSSet*) breakpointsForFile:(NSString*)file;
+
+@end

Frameworks/MGSFragaria.framework/Versions/A/Headers/MGSExtraInterfaceController.h

@@ -0,0 +1,65 @@
+/*
+ 
+ MGSFragaria
+ Written by Jonathan Mitchell, [email protected]
+ Find the latest version at https://github.com/mugginsoft/Fragaria
+ 
+Smultron version 3.6b1, 2009-09-12
+Written by Peter Borg, [email protected]
+Find the latest version at http://smultron.sourceforge.net
+
+Copyright 2004-2009 Peter Borg
+ 
+Licensed 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.
+*/
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface MGSExtraInterfaceController : NSObject {
+
+	IBOutlet NSTextField *spacesTextFieldEntabWindow;
+	IBOutlet NSTextField *spacesTextFieldDetabWindow;
+	IBOutlet NSTextField *lineTextFieldGoToLineWindow;
+	IBOutlet NSWindow *entabWindow;
+	IBOutlet NSWindow *detabWindow;
+	IBOutlet NSWindow *goToLineWindow;
+
+	IBOutlet NSView *openPanelAccessoryView;
+	IBOutlet NSPopUpButton *openPanelEncodingsPopUp;
+	//IBOutlet NSView *printAccessoryView;
+
+	IBOutlet NSWindow *commandResultWindow;
+	IBOutlet NSTextView *commandResultTextView;
+
+	IBOutlet NSWindow *projectWindow;
+	IBOutlet NSPanel *regularExpressionsHelpPanel;
+}
+
+
+@property (readonly) IBOutlet NSView *openPanelAccessoryView;
+@property (readonly) IBOutlet NSPopUpButton *openPanelEncodingsPopUp;
+@property (readonly) IBOutlet NSWindow *commandResultWindow;
+@property (readonly) IBOutlet NSTextView *commandResultTextView;
+@property (readonly) IBOutlet NSWindow *projectWindow;
+
+- (void)displayEntab;
+- (void)displayDetab;
+- (IBAction)entabButtonEntabWindowAction:(id)sender;
+- (IBAction)detabButtonDetabWindowAction:(id)sender;
+- (IBAction)cancelButtonEntabDetabGoToLineWindowsAction:(id)sender;
+- (void)displayGoToLine;
+- (IBAction)goButtonGoToLineWindowAction:(id)sender;
+
+- (NSPopUpButton *)openPanelEncodingsPopUp;
+- (NSView *)openPanelAccessoryView;
+- (NSWindow *)commandResultWindow;
+- (NSTextView *)commandResultTextView;
+- (void)showCommandResultWindow;
+- (void)showRegularExpressionsHelpPanel;
+
+@end

Frameworks/MGSFragaria.framework/Versions/A/Headers/MGSFragaria.h

@@ -0,0 +1,103 @@
+/*
+ *  MGSFragaria.h
+ *  Fragaria
+ *
+ *  Created by Jonathan on 30/04/2010.
+ *  Copyright 2010 mugginsoft.com. All rights reserved.
+ *
+ */
+
+// valid keys for 
+// - (void)setObject:(id)object forKey:(id)key;
+// - (id)objectForKey:(id)key;
+
+// BOOL
+extern NSString * const MGSFOIsSyntaxColoured;
+extern NSString * const MGSFOShowLineNumberGutter;
+extern NSString * const MGSFOIsEdited;
+
+// string
+extern NSString * const MGSFOSyntaxDefinitionName;
+extern NSString * const MGSFODocumentName;
+
+// integer
+extern NSString * const MGSFOGutterWidth;
+
+// NSView *
+extern NSString * const ro_MGSFOTextView; // readonly
+extern NSString * const ro_MGSFOScrollView; // readonly
+extern NSString * const ro_MGSFOGutterScrollView; // readonly
+
+// NSObject
+extern NSString * const MGSFODelegate;
+extern NSString * const MGSFOBreakpointDelegate;
+extern NSString * const MGSFOAutoCompleteDelegate;
+extern NSString * const MGSFOSyntaxColouringDelegate;
+extern NSString * const ro_MGSFOLineNumbers; // readonly
+extern NSString * const ro_MGSFOSyntaxColouring; // readonly
+
+@class MGSTextMenuController;
+@class MGSExtraInterfaceController;
+
+#import "MGSFragariaPreferences.h"
+#import "MGSBreakpointDelegate.h"
+#import "SMLSyntaxError.h"
+#import "SMLSyntaxColouringDelegate.h"
+
+@protocol MGSFragariaTextViewDelegate <NSObject>
+@optional
+- (void)mgsTextDidPaste:(NSNotification *)note;
+@end
+
+@interface MGSFragaria : NSObject
+{
+	@private
+	MGSExtraInterfaceController *extraInterfaceController;
+    id docSpec;
+    NSSet* objectGetterKeys;
+    NSSet* objectSetterKeys;
+}
+
+@property (nonatomic, readonly, assign) MGSExtraInterfaceController *extraInterfaceController;
+@property (nonatomic, retain) id docSpec;
+
++ (id)currentInstance;
++ (void)setCurrentInstance:(MGSFragaria *)anInstance;
+
++ (void)initializeFramework;
++ (id)createDocSpec;
++ (void)docSpec:(id)docSpec setString:(NSString *)string;
++ (void)docSpec:(id)docSpec setString:(NSString *)string options:(NSDictionary *)options;
++ (void)docSpec:(id)docSpec setAttributedString:(NSAttributedString *)string;
++ (void)docSpec:(id)docSpec setAttributedString:(NSAttributedString *)string options:(NSDictionary *)options;
+
++ (NSString *)stringForDocSpec:(id)docSpec;
++ (NSAttributedString *)attributedStringForDocSpec:(id)docSpec;
++ (NSAttributedString *)attributedStringWithTemporaryAttributesAppliedForDocSpec:(id)docSpec;
+
+- (id)initWithObject:(id)object;
+- (void)setObject:(id)object forKey:(id)key;
+- (id)objectForKey:(id)key;
+- (void)embedInView:(NSView *)view;
+- (void)setString:(NSString *)aString;
+- (void)setString:(NSString *)aString options:(NSDictionary *)options;
+- (void)setAttributedString:(NSAttributedString *)aString;
+- (void)setAttributedString:(NSAttributedString *)aString options:(NSDictionary *)options;
+- (NSAttributedString *)attributedString;
+- (NSAttributedString *)attributedStringWithTemporaryAttributesApplied;
+- (NSString *)string;
+
+- (NSTextView *)textView;
+- (MGSTextMenuController *)textMenuController;
+- (void)setSyntaxColoured:(BOOL)value;
+- (BOOL)isSyntaxColoured;
+- (void)setShowsLineNumbers:(BOOL)value;
+- (BOOL)showsLineNumbers;
+- (void)reloadString;
+
+- (void)setSyntaxErrors:(NSArray *)errors;
+- (NSArray *)syntaxErrors;
+
++ (NSImage *) imageNamed:(NSString *)name;
+
+@end

Frameworks/MGSFragaria.framework/Versions/A/Headers/MGSFragariaFontsAndColoursPrefsViewController.h

@@ -0,0 +1,16 @@
+//
+//  MGSFragariaFontsAndColoursPrefsViewController.h
+//  Fragaria
+//
+//  Created by Jonathan on 14/09/2012.
+//
+//
+
+#import <Cocoa/Cocoa.h>
+#import "MGSFragariaPrefsViewController.h"
+
+@interface MGSFragariaFontsAndColoursPrefsViewController : MGSFragariaPrefsViewController
+
+- (IBAction)setFontAction:(id)sender;
+- (void)changeFont:(id)sender;
+@end