gigantic ass reorg. let me know if this breaks.

This commit is contained in:
Chris Wanstrath 2011-08-27 03:48:00 -07:00
parent 6708f52280
commit 409a77c485
250 changed files with 221 additions and 180 deletions

16
Cocoa/.gitignore vendored Normal file
View File

@ -0,0 +1,16 @@
# Xcode
build/*
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
profile
*.moved-aside

View File

@ -7,59 +7,62 @@
objects = {
/* Begin PBXBuildFile section */
044A1F0314080A510006B340 /* class.js in Resources */ = {isa = PBXBuildFile; fileRef = 8359A6FA13FE270F00AC37E3 /* class.js */; };
044A1F0514080A540006B340 /* jslint-jscocoa.js in Resources */ = {isa = PBXBuildFile; fileRef = 8359A72113FE270F00AC37E3 /* jslint-jscocoa.js */; };
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
8321C5F11404ADE60029952E /* AtomWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8321C5F01404ADE60029952E /* AtomWindow.xib */; };
8321C5F61404ADF00029952E /* AtomicityAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8321C5F31404ADF00029952E /* AtomicityAppDelegate.m */; };
8321C5F71404ADF00029952E /* AtomWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8321C5F51404ADF00029952E /* AtomWindowController.m */; };
8321C5FB1404AE0C0029952E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8321C5FA1404AE0C0029952E /* main.m */; };
832BA38413FE674C00516BD7 /* APPL.icns in Resources */ = {isa = PBXBuildFile; fileRef = 832BA38313FE674C00516BD7 /* APPL.icns */; };
83599F9B13FE0F8400AC37E3 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 83599F9A13FE0F8400AC37E3 /* WebKit.framework */; };
8359A6EE13FE26DA00AC37E3 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8359A6ED13FE26DA00AC37E3 /* JavaScriptCore.framework */; };
8359A72213FE270F00AC37E3 /* BridgeSupportController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A6F913FE270F00AC37E3 /* BridgeSupportController.m */; };
8359A72F13FE270F00AC37E3 /* JSCocoaController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A71813FE270F00AC37E3 /* JSCocoaController.m */; };
8359A73013FE270F00AC37E3 /* JSCocoaFFIArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A71A13FE270F00AC37E3 /* JSCocoaFFIArgument.m */; };
8359A73113FE270F00AC37E3 /* JSCocoaFFIClosure.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A71C13FE270F00AC37E3 /* JSCocoaFFIClosure.m */; };
8359A73213FE270F00AC37E3 /* JSCocoaLib.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A71E13FE270F00AC37E3 /* JSCocoaLib.m */; };
8359A73313FE270F00AC37E3 /* JSCocoaPrivateObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 8359A72013FE270F00AC37E3 /* JSCocoaPrivateObject.m */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
837D8BA81408FAAA009B6DFA /* AtomicityAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BA51408FAAA009B6DFA /* AtomicityAppDelegate.m */; };
837D8BA91408FAAA009B6DFA /* AtomWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BA71408FAAA009B6DFA /* AtomWindowController.m */; };
837D8BAC1408FAB4009B6DFA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BAB1408FAB4009B6DFA /* main.m */; };
837D8BB41408FAC3009B6DFA /* APPL.icns in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BAD1408FAC3009B6DFA /* APPL.icns */; };
837D8BB51408FAC3009B6DFA /* Atomicity-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BAE1408FAC3009B6DFA /* Atomicity-Info.plist */; };
837D8BB61408FAC3009B6DFA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BB01408FAC3009B6DFA /* InfoPlist.strings */; };
837D8BB71408FAC3009B6DFA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BB21408FAC3009B6DFA /* MainMenu.xib */; };
837D8BD51408FAD4009B6DFA /* BridgeSupportController.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BC71408FAD4009B6DFA /* BridgeSupportController.m */; };
837D8BD61408FAD4009B6DFA /* class.js in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BC81408FAD4009B6DFA /* class.js */; };
837D8BD71408FAD4009B6DFA /* JSCocoaController.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BCB1408FAD4009B6DFA /* JSCocoaController.m */; };
837D8BD81408FAD4009B6DFA /* JSCocoaFFIArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BCD1408FAD4009B6DFA /* JSCocoaFFIArgument.m */; };
837D8BD91408FAD4009B6DFA /* JSCocoaFFIClosure.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BCF1408FAD4009B6DFA /* JSCocoaFFIClosure.m */; };
837D8BDA1408FAD4009B6DFA /* JSCocoaLib.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BD11408FAD4009B6DFA /* JSCocoaLib.m */; };
837D8BDB1408FAD4009B6DFA /* JSCocoaPrivateObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BD31408FAD4009B6DFA /* JSCocoaPrivateObject.m */; };
837D8BDC1408FAD4009B6DFA /* jslint-jscocoa.js in Sources */ = {isa = PBXBuildFile; fileRef = 837D8BD41408FAD4009B6DFA /* jslint-jscocoa.js */; };
837D8BE11408FAF5009B6DFA /* AtomWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BE01408FAF5009B6DFA /* AtomWindow.xib */; };
837D8BE91408FB15009B6DFA /* Rakefile in Resources */ = {isa = PBXBuildFile; fileRef = 837D8BE81408FB15009B6DFA /* Rakefile */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
256AC3F00F4B6AF500CF3369 /* Atomicity_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomicity_Prefix.pch; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
8321C5F01404ADE60029952E /* AtomWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = AtomWindow.xib; path = ../Atomicity/xibs/AtomWindow.xib; sourceTree = SOURCE_ROOT; };
8321C5F21404ADF00029952E /* AtomicityAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicityAppDelegate.h; path = ../Atomicity/Classes/AtomicityAppDelegate.h; sourceTree = SOURCE_ROOT; };
8321C5F31404ADF00029952E /* AtomicityAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AtomicityAppDelegate.m; path = ../Atomicity/Classes/AtomicityAppDelegate.m; sourceTree = SOURCE_ROOT; };
8321C5F41404ADF00029952E /* AtomWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomWindowController.h; path = ../Atomicity/Classes/AtomWindowController.h; sourceTree = SOURCE_ROOT; };
8321C5F51404ADF00029952E /* AtomWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AtomWindowController.m; path = ../Atomicity/Classes/AtomWindowController.m; sourceTree = SOURCE_ROOT; };
8321C5FA1404AE0C0029952E /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../Atomicity/main.m; sourceTree = SOURCE_ROOT; };
832BA38313FE674C00516BD7 /* APPL.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = APPL.icns; sourceTree = "<group>"; };
83599F9A13FE0F8400AC37E3 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
8359A6ED13FE26DA00AC37E3 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
8359A6F813FE270F00AC37E3 /* BridgeSupportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgeSupportController.h; sourceTree = "<group>"; };
8359A6F913FE270F00AC37E3 /* BridgeSupportController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BridgeSupportController.m; sourceTree = "<group>"; };
8359A6FA13FE270F00AC37E3 /* class.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = class.js; sourceTree = "<group>"; };
8359A71313FE270F00AC37E3 /* JSCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoa.h; sourceTree = "<group>"; };
8359A71713FE270F00AC37E3 /* JSCocoaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaController.h; sourceTree = "<group>"; };
8359A71813FE270F00AC37E3 /* JSCocoaController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaController.m; sourceTree = "<group>"; };
8359A71913FE270F00AC37E3 /* JSCocoaFFIArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaFFIArgument.h; sourceTree = "<group>"; };
8359A71A13FE270F00AC37E3 /* JSCocoaFFIArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaFFIArgument.m; sourceTree = "<group>"; };
8359A71B13FE270F00AC37E3 /* JSCocoaFFIClosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaFFIClosure.h; sourceTree = "<group>"; };
8359A71C13FE270F00AC37E3 /* JSCocoaFFIClosure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaFFIClosure.m; sourceTree = "<group>"; };
8359A71D13FE270F00AC37E3 /* JSCocoaLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaLib.h; sourceTree = "<group>"; };
8359A71E13FE270F00AC37E3 /* JSCocoaLib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaLib.m; sourceTree = "<group>"; };
8359A71F13FE270F00AC37E3 /* JSCocoaPrivateObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaPrivateObject.h; sourceTree = "<group>"; };
8359A72013FE270F00AC37E3 /* JSCocoaPrivateObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaPrivateObject.m; sourceTree = "<group>"; };
8359A72113FE270F00AC37E3 /* jslint-jscocoa.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "jslint-jscocoa.js"; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Atomicity-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Atomicity-Info.plist"; sourceTree = "<group>"; };
837D8BA41408FAAA009B6DFA /* AtomicityAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomicityAppDelegate.h; path = ../../Atomicity/Cocoa/Classes/AtomicityAppDelegate.h; sourceTree = SOURCE_ROOT; };
837D8BA51408FAAA009B6DFA /* AtomicityAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AtomicityAppDelegate.m; path = ../../Atomicity/Cocoa/Classes/AtomicityAppDelegate.m; sourceTree = SOURCE_ROOT; };
837D8BA61408FAAA009B6DFA /* AtomWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AtomWindowController.h; path = ../../Atomicity/Cocoa/Classes/AtomWindowController.h; sourceTree = SOURCE_ROOT; };
837D8BA71408FAAA009B6DFA /* AtomWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AtomWindowController.m; path = ../../Atomicity/Cocoa/Classes/AtomWindowController.m; sourceTree = SOURCE_ROOT; };
837D8BAA1408FAB4009B6DFA /* Atomicity_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Atomicity_Prefix.pch; path = ../../Atomicity/Cocoa/Atomicity_Prefix.pch; sourceTree = SOURCE_ROOT; };
837D8BAB1408FAB4009B6DFA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ../../Atomicity/Cocoa/main.m; sourceTree = SOURCE_ROOT; };
837D8BAD1408FAC3009B6DFA /* APPL.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = APPL.icns; path = ../../Atomicity/Cocoa/APPL.icns; sourceTree = SOURCE_ROOT; };
837D8BAE1408FAC3009B6DFA /* Atomicity-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Atomicity-Info.plist"; path = "../../Atomicity/Cocoa/Atomicity-Info.plist"; sourceTree = SOURCE_ROOT; };
837D8BB11408FAC3009B6DFA /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
837D8BB31408FAC3009B6DFA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = MainMenu.xib; sourceTree = "<group>"; };
837D8BC61408FAD4009B6DFA /* BridgeSupportController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgeSupportController.h; sourceTree = "<group>"; };
837D8BC71408FAD4009B6DFA /* BridgeSupportController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BridgeSupportController.m; sourceTree = "<group>"; };
837D8BC81408FAD4009B6DFA /* class.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = class.js; sourceTree = "<group>"; };
837D8BC91408FAD4009B6DFA /* JSCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoa.h; sourceTree = "<group>"; };
837D8BCA1408FAD4009B6DFA /* JSCocoaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaController.h; sourceTree = "<group>"; };
837D8BCB1408FAD4009B6DFA /* JSCocoaController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaController.m; sourceTree = "<group>"; };
837D8BCC1408FAD4009B6DFA /* JSCocoaFFIArgument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaFFIArgument.h; sourceTree = "<group>"; };
837D8BCD1408FAD4009B6DFA /* JSCocoaFFIArgument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaFFIArgument.m; sourceTree = "<group>"; };
837D8BCE1408FAD4009B6DFA /* JSCocoaFFIClosure.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaFFIClosure.h; sourceTree = "<group>"; };
837D8BCF1408FAD4009B6DFA /* JSCocoaFFIClosure.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaFFIClosure.m; sourceTree = "<group>"; };
837D8BD01408FAD4009B6DFA /* JSCocoaLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaLib.h; sourceTree = "<group>"; };
837D8BD11408FAD4009B6DFA /* JSCocoaLib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaLib.m; sourceTree = "<group>"; };
837D8BD21408FAD4009B6DFA /* JSCocoaPrivateObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCocoaPrivateObject.h; sourceTree = "<group>"; };
837D8BD31408FAD4009B6DFA /* JSCocoaPrivateObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSCocoaPrivateObject.m; sourceTree = "<group>"; };
837D8BD41408FAD4009B6DFA /* jslint-jscocoa.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "jslint-jscocoa.js"; sourceTree = "<group>"; };
837D8BE01408FAF5009B6DFA /* AtomWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = AtomWindow.xib; path = ../../Atomicity/Cocoa/xibs/AtomWindow.xib; sourceTree = SOURCE_ROOT; };
837D8BE81408FB15009B6DFA /* Rakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Rakefile; path = ../../Atomicity/Rakefile; sourceTree = SOURCE_ROOT; };
8D1107320486CEB800E47090 /* Atomicity.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Atomicity.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */
@ -80,10 +83,10 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
8321C5F21404ADF00029952E /* AtomicityAppDelegate.h */,
8321C5F31404ADF00029952E /* AtomicityAppDelegate.m */,
8321C5F41404ADF00029952E /* AtomWindowController.h */,
8321C5F51404ADF00029952E /* AtomWindowController.m */,
837D8BA41408FAAA009B6DFA /* AtomicityAppDelegate.h */,
837D8BA51408FAAA009B6DFA /* AtomicityAppDelegate.m */,
837D8BA61408FAAA009B6DFA /* AtomWindowController.h */,
837D8BA71408FAAA009B6DFA /* AtomWindowController.m */,
29B97315FDCFA39411CA2CEA /* Other Sources */,
);
name = Classes;
@ -122,7 +125,7 @@
children = (
080E96DDFE201D6D7F000001 /* Classes */,
29B97317FDCFA39411CA2CEA /* Resources */,
8359A6F713FE270F00AC37E3 /* JSCocoa */,
837D8BC51408FAD4009B6DFA /* JSCocoa */,
29B97323FDCFA39411CA2CEA /* Frameworks */,
19C28FACFE9D520D11CA2CBB /* Products */,
);
@ -132,8 +135,9 @@
29B97315FDCFA39411CA2CEA /* Other Sources */ = {
isa = PBXGroup;
children = (
256AC3F00F4B6AF500CF3369 /* Atomicity_Prefix.pch */,
8321C5FA1404AE0C0029952E /* main.m */,
837D8BE81408FB15009B6DFA /* Rakefile */,
837D8BAA1408FAB4009B6DFA /* Atomicity_Prefix.pch */,
837D8BAB1408FAB4009B6DFA /* main.m */,
);
name = "Other Sources";
sourceTree = "<group>";
@ -141,11 +145,11 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
832BA38313FE674C00516BD7 /* APPL.icns */,
8D1107310486CEB800E47090 /* Atomicity-Info.plist */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
8321C5F01404ADE60029952E /* AtomWindow.xib */,
837D8BAD1408FAC3009B6DFA /* APPL.icns */,
837D8BAE1408FAC3009B6DFA /* Atomicity-Info.plist */,
837D8BB01408FAC3009B6DFA /* InfoPlist.strings */,
837D8BE01408FAF5009B6DFA /* AtomWindow.xib */,
837D8BB21408FAC3009B6DFA /* MainMenu.xib */,
);
name = Resources;
sourceTree = "<group>";
@ -159,27 +163,28 @@
name = Frameworks;
sourceTree = "<group>";
};
8359A6F713FE270F00AC37E3 /* JSCocoa */ = {
837D8BC51408FAD4009B6DFA /* JSCocoa */ = {
isa = PBXGroup;
children = (
8359A6F813FE270F00AC37E3 /* BridgeSupportController.h */,
8359A6F913FE270F00AC37E3 /* BridgeSupportController.m */,
8359A6FA13FE270F00AC37E3 /* class.js */,
8359A71313FE270F00AC37E3 /* JSCocoa.h */,
8359A71713FE270F00AC37E3 /* JSCocoaController.h */,
8359A71813FE270F00AC37E3 /* JSCocoaController.m */,
8359A71913FE270F00AC37E3 /* JSCocoaFFIArgument.h */,
8359A71A13FE270F00AC37E3 /* JSCocoaFFIArgument.m */,
8359A71B13FE270F00AC37E3 /* JSCocoaFFIClosure.h */,
8359A71C13FE270F00AC37E3 /* JSCocoaFFIClosure.m */,
8359A71D13FE270F00AC37E3 /* JSCocoaLib.h */,
8359A71E13FE270F00AC37E3 /* JSCocoaLib.m */,
8359A71F13FE270F00AC37E3 /* JSCocoaPrivateObject.h */,
8359A72013FE270F00AC37E3 /* JSCocoaPrivateObject.m */,
8359A72113FE270F00AC37E3 /* jslint-jscocoa.js */,
837D8BC61408FAD4009B6DFA /* BridgeSupportController.h */,
837D8BC71408FAD4009B6DFA /* BridgeSupportController.m */,
837D8BC81408FAD4009B6DFA /* class.js */,
837D8BC91408FAD4009B6DFA /* JSCocoa.h */,
837D8BCA1408FAD4009B6DFA /* JSCocoaController.h */,
837D8BCB1408FAD4009B6DFA /* JSCocoaController.m */,
837D8BCC1408FAD4009B6DFA /* JSCocoaFFIArgument.h */,
837D8BCD1408FAD4009B6DFA /* JSCocoaFFIArgument.m */,
837D8BCE1408FAD4009B6DFA /* JSCocoaFFIClosure.h */,
837D8BCF1408FAD4009B6DFA /* JSCocoaFFIClosure.m */,
837D8BD01408FAD4009B6DFA /* JSCocoaLib.h */,
837D8BD11408FAD4009B6DFA /* JSCocoaLib.m */,
837D8BD21408FAD4009B6DFA /* JSCocoaPrivateObject.h */,
837D8BD31408FAD4009B6DFA /* JSCocoaPrivateObject.m */,
837D8BD41408FAD4009B6DFA /* jslint-jscocoa.js */,
);
path = JSCocoa;
sourceTree = "<group>";
name = JSCocoa;
path = ../../Atomicity/Cocoa/JSCocoa;
sourceTree = SOURCE_ROOT;
};
/* End PBXGroup section */
@ -220,7 +225,7 @@
);
mainGroup = 29B97314FDCFA39411CA2CEA /* Atomicity */;
projectDirPath = "";
projectRoot = "";
projectRoot = Cocoa;
targets = (
8D1107260486CEB800E47090 /* Atomicity */,
);
@ -232,12 +237,12 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
832BA38413FE674C00516BD7 /* APPL.icns in Resources */,
8321C5F11404ADE60029952E /* AtomWindow.xib in Resources */,
044A1F0314080A510006B340 /* class.js in Resources */,
044A1F0514080A540006B340 /* jslint-jscocoa.js in Resources */,
837D8BB41408FAC3009B6DFA /* APPL.icns in Resources */,
837D8BB51408FAC3009B6DFA /* Atomicity-Info.plist in Resources */,
837D8BB61408FAC3009B6DFA /* InfoPlist.strings in Resources */,
837D8BB71408FAC3009B6DFA /* MainMenu.xib in Resources */,
837D8BE11408FAF5009B6DFA /* AtomWindow.xib in Resources */,
837D8BE91408FB15009B6DFA /* Rakefile in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -256,7 +261,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"$PROJECT_DIR/script/compile.sh\" ";
shellScript = "rake build";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@ -266,35 +271,39 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8359A72213FE270F00AC37E3 /* BridgeSupportController.m in Sources */,
8359A72F13FE270F00AC37E3 /* JSCocoaController.m in Sources */,
8359A73013FE270F00AC37E3 /* JSCocoaFFIArgument.m in Sources */,
8359A73113FE270F00AC37E3 /* JSCocoaFFIClosure.m in Sources */,
8359A73213FE270F00AC37E3 /* JSCocoaLib.m in Sources */,
8359A73313FE270F00AC37E3 /* JSCocoaPrivateObject.m in Sources */,
8321C5F61404ADF00029952E /* AtomicityAppDelegate.m in Sources */,
8321C5F71404ADF00029952E /* AtomWindowController.m in Sources */,
8321C5FB1404AE0C0029952E /* main.m in Sources */,
837D8BA81408FAAA009B6DFA /* AtomicityAppDelegate.m in Sources */,
837D8BA91408FAAA009B6DFA /* AtomWindowController.m in Sources */,
837D8BAC1408FAB4009B6DFA /* main.m in Sources */,
837D8BD51408FAD4009B6DFA /* BridgeSupportController.m in Sources */,
837D8BD61408FAD4009B6DFA /* class.js in Sources */,
837D8BD71408FAD4009B6DFA /* JSCocoaController.m in Sources */,
837D8BD81408FAD4009B6DFA /* JSCocoaFFIArgument.m in Sources */,
837D8BD91408FAD4009B6DFA /* JSCocoaFFIClosure.m in Sources */,
837D8BDA1408FAD4009B6DFA /* JSCocoaLib.m in Sources */,
837D8BDB1408FAD4009B6DFA /* JSCocoaPrivateObject.m in Sources */,
837D8BDC1408FAD4009B6DFA /* jslint-jscocoa.js in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
837D8BB01408FAC3009B6DFA /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
089C165DFE840E0CC02AAC07 /* English */,
837D8BB11408FAC3009B6DFA /* English */,
);
name = InfoPlist.strings;
path = ../../Atomicity/Cocoa/English.lproj;
sourceTree = "<group>";
};
1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = {
837D8BB21408FAC3009B6DFA /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
1DDD58150DA1D0A300B32029 /* English */,
837D8BB31408FAC3009B6DFA /* English */,
);
name = MainMenu.xib;
path = ../../Atomicity/Cocoa/English.lproj;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
@ -347,13 +356,13 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"-lxml2",
"-lffi",
);
PREBINDING = NO;
SDKROOT = macosx10.6;
};
name = Debug;
};
@ -364,12 +373,12 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = "";
OTHER_LDFLAGS = (
"-lxml2",
"-lffi",
);
PREBINDING = NO;
SDKROOT = macosx10.6;
};
name = Release;
};

View File

@ -32,13 +32,13 @@
}
else {
NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
NSString *bootstrapPath = [resourcePath stringByAppendingString:@"/HTML/lib/bootstrap.js"];
NSString *bootstrapPath = [resourcePath stringByAppendingString:@"/src/bootstrap.js"];
JSCocoa* jsc = [[JSCocoa alloc] initWithGlobalContext:[[webView mainFrame] globalContext]];
[jsc setObject:self withName:@"WindowController"];
[jsc evalJSFile:bootstrapPath];
NSURL *resourceURL = [[NSBundle mainBundle] resourceURL];
NSURL *htmlURL = [resourceURL URLByAppendingPathComponent:@"HTML"];
NSURL *htmlURL = [resourceURL URLByAppendingPathComponent:@"static"];
NSURL *indexURL = [htmlURL URLByAppendingPathComponent:@"index.html"];
NSString *html = [NSString stringWithContentsOfURL:indexURL encoding:NSUTF8StringEncoding error:nil];
[[webView mainFrame] loadHTMLString:html baseURL:htmlURL];

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.0 KiB

View File

@ -1,37 +0,0 @@
# This file is the first thing loaded on startup.
console.log = (thing) -> OSX.NSLog thing.toString()
modules = {}
this.require = (path) ->
# hack for stupid requirejs
if path.indexOf('ace/requirejs/text!') > -1
path = path.replace 'ace/requirejs/text!', ''
text = true
return modules[path] if modules[path]
root = OSX.NSBundle.mainBundle.resourcePath + '/HTML/'
filename = if text then "#{root}/#{path}" else "#{root}/#{path}.js"
file = OSX.NSString.stringWithContentsOfFile filename
if text
modules[path] = file.toString()
return modules[path]
exports = {}
module = exports: exports
src = "function define(cb){cb.call(this,require,exports)};"
src += """(function(exports, define, module){
#{file}
}).call(exports, exports, define, module);
"""
eval src
modules[path] = module.exports or exports
modules[path]
this.require.nameToUrl = (path) -> "#{path}.js"
this._ = require 'vendor/underscore'

View File

@ -1,26 +0,0 @@
<style>
ul {
margin: 0;
padding: 0;
}
li {
list-style-type: none;
}
li:hover {
background-color: grey;
}
</style>
<script src="ace/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="underscore.js" type="text/javascript" charset="utf-8"></script>
<script src="jquery.js" type="text/javascript" charset="utf-8"></script>
<script src="coffee-script.js" type="text/javascript" charset="utf-8"></script>
<script src="osx.js" type="text/javascript" charset="utf-8"></script>
<script src="project.js" type="text/javascript" charset="utf-8"></script>
<div id='cwd'></div>
<ul id='files'></ul>

25
Rakefile Normal file
View File

@ -0,0 +1,25 @@
ENV['PATH'] = "#{ENV['PATH']}:/usr/local/bin/"
desc "Build the shit."
task :build do
project_dir = ENV['PROJECT_DIR'] || '.'
built_dir = ENV['BUILT_PRODUCTS_DIR'] || '.'
contents_dir = ENV['CONTENTS_FOLDER_PATH'].to_s
dest = File.join(built_dir, contents_dir, "Resources")
%w( src docs static vendor ).each do |dir|
rm_rf File.join(dest, dir)
cp_r dir, File.join(dest, dir)
end
Dir['src/**/*.coffee'].each do |file|
sh "coffee -c #{dest}/src"
end
end
desc "Install the app in /Applications"
task :install do
rm_rf "/Applications/Atomicity.app"
cp_r "Cocoa/build/Debug/Atomicity.app /Applications"
end

View File

@ -1,10 +0,0 @@
#!/bin/sh
SOURCE_SCRIPTS_DIR="$PROJECT_DIR/html"
DESTINATION_SCRIPTS_DIR="$BUILT_PRODUCTS_DIR/$CONTENTS_FOLDER_PATH/Resources/"
PATH="$PATH:/usr/local/bin/"
hash coffee 2>&- || { echo >&2 "error: Coffee is required but it's not installed (http://jashkenas.github.com/coffee-script/)."; exit 1; }
coffee -o "$DESTINATION_SCRIPTS_DIR/HTML/lib/" HTML/lib/*.coffee
cp -r "$SOURCE_SCRIPTS_DIR" "$DESTINATION_SCRIPTS_DIR"

View File

@ -1,3 +0,0 @@
#!/bin/sh
rm -rf /Applications/Atomicity.app
cp -r build/Debug/Atomicity.app /Applications

View File

@ -1,12 +1,12 @@
# nice!
{Chrome, File, Process, Dir} = require 'lib/osx'
{Chrome, File, Process, Dir} = require 'osx'
ace = require 'ace/ace'
canon = require 'pilot/canon'
$ = require 'vendor/jquery'
{CoffeeScript} = require 'vendor/coffee-script'
$ = require 'jquery'
{CoffeeScript} = require 'coffee-script'
Chrome.addPane 'main', '<div id="editor"></div>'

43
src/bootstrap.coffee Normal file
View File

@ -0,0 +1,43 @@
# This file is the first thing loaded on startup.
console.log = (thing) -> OSX.NSLog thing.toString()
modules = {}
paths = ['src', 'vendor']
this.require = (file) ->
# hack for stupid requirejs
if file.indexOf('ace/requirejs/text!') > -1
file = file.replace 'ace/requirejs/text!', ''
text = true
return modules[file] if modules[file]
code = null
paths.forEach (path) ->
return code if code
root = OSX.NSBundle.mainBundle.resourcePath + "/#{path}"
fullpath = if text then "#{root}/#{file}" else "#{root}/#{file}.js"
code = OSX.NSString.stringWithContentsOfFile fullpath
if text
modules[file] = code.toString()
return modules[file]
exports = {}
module = exports: exports
src = "function define(cb){cb.call(this,require,exports)};"
src += """(function(exports, define, module){
#{code}
}).call(exports, exports, define, module);
"""
eval src
modules[file] = module.exports or exports
modules[file]
this.require.paths = paths
this.require.nameToUrl = (path) -> "#{path}.js"
this._ = require 'underscore'

View File

@ -1,6 +1,6 @@
# This is the CoffeeScript API that wraps all of Cocoa.
$ = require 'vendor/jquery'
$ = require 'jquery'
# Handles the UI chrome
Chrome =

View File

@ -1,3 +1,5 @@
$ = require 'jquery'
$ ->
dir = OSX.NSFileManager.defaultManager.currentDirectoryPath
$('#cwd').text(dir)

View File

@ -1,6 +1,6 @@
$ = require 'vendor/jquery'
$ = require 'jquery'
{Chrome, File, Dir, Process} = require 'lib/osx'
{Chrome, File, Dir, Process} = require 'osx'
exports.show = ->
root = OSX.NSBundle.mainBundle.resourcePath + '/HTML/'

View File

@ -15,5 +15,5 @@
<div id="editor"></div>
<script>
require('lib/atomicity');
require('atomicity');
</script>

View File

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 91 KiB

View File

@ -71,7 +71,7 @@
</style>
<script>
require('lib/atomicity');
require('atomicity');
</script>
</html>

22
static/project.html Normal file
View File

@ -0,0 +1,22 @@
<style>
ul {
margin: 0;
padding: 0;
}
li {
list-style-type: none;
}
li:hover {
background-color: grey;
}
</style>
<div id='cwd'></div>
<ul id='files'></ul>
<script>
require('project');
</script>

Some files were not shown because too many files have changed in this diff Show More