Fix for http://cappuccino.lighthouseapp.com/projects/16499/tickets/30…

…-make-nib2cib-work-with-new-build-system#ticket-30-1.

[cappuccino#30 state:resolved]

Reviewed by tom.

AppKit/AppKit.steam

@@ -7,20 +7,32 @@
 	<key>Targets</key>
 	<array>
         <dict>
-            <key>name</key>
+            <key>Name</key>
             <string>AppKit</string>
             <key>Excluded</key>
             <array>
                 <string>CPOutlineView.j</string>
                 <string>CPTableColumn.j</string>
                 <string>CPTableView.j</string>
             </array>
+            <key>Flags</key>
+            <string>-DPLATFORM_DOM</string>
+        </dict>
+        <dict>
+            <key>Name</key>
+            <string>AppKit-Rhino</string>
+            <key>Excluded</key>
+            <array>
+                <string>CPOutlineView.j</string>
+                <string>CPTableColumn.j</string>
+                <string>CPTableView.j</string>
+            </array>
         </dict>
 	</array>
     <key>Configurations</key>
 	<array>
         <dict>
-            <key>name</key>
+            <key>Name</key>
             <string>Debug</string>
             <key>Settings</key>
             <dict>
@@ -31,7 +43,7 @@
             </dict>
         </dict>
         <dict>
-            <key>name</key>
+            <key>Name</key>
             <string>Release</string>
             <key>Settings</key>
             <dict>

AppKit/CPTextField.j

@@ -210,6 +210,7 @@ var _CPTextFieldSquareBezelColor    = nil;
 
     [self setStringValue:@""];
 
+#if PLATFORM(DOM)
     var element = [[self class] _inputElement];
 
     element.value = string;
@@ -244,17 +245,20 @@ var _CPTextFieldSquareBezelColor    = nil;
     };
 
     [[CPDOMWindowBridge sharedDOMWindowBridge] _propagateCurrentDOMEvent:YES];
-
+#endif
+
     return YES;
 }
 
 - (BOOL)resignFirstResponder
 {
+#if PLATFORM(DOM)
     var element = [[self class] _inputElement];
 
     _DOMElement.removeChild(element);
     [self setStringValue:element.value];
-
+#endif
+
     return YES;
 }
 
@@ -272,7 +276,9 @@ var _CPTextFieldSquareBezelColor    = nil;
 {
     [super setFrameSize:aSize];
 
+#if PLATFORM(DOM)
     CPDOMDisplayServerSetStyleSize(_DOMTextElement, _frame.size.width - 2.0 * HORIZONTAL_PADDING, _frame.size.height - TOP_PADDING - BOTTOM_PADDING);
+#endif
 }
 
 - (BOOL)isSelectable

AppKit/Cib/CPCustomView.j

@@ -22,6 +22,19 @@
 
 import "CPView.j"
 
+
+var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
+    CPViewAutoresizesSubviewsKey    = @"CPViewAutoresizesSubviews",
+    CPViewBackgroundColorKey        = @"CPViewBackgroundColor",
+    CPViewBoundsKey                 = @"CPViewBoundsKey",
+    CPViewFrameKey                  = @"CPViewFrameKey",
+    CPViewHitTestsKey               = @"CPViewHitTestsKey",
+    CPViewIsHiddenKey               = @"CPViewIsHiddenKey",
+    CPViewOpacityKey                = @"CPViewOpacityKey",
+    CPViewSubviewsKey               = @"CPViewSubviewsKey",
+    CPViewSuperviewKey              = @"CPViewSuperviewKey",
+    CPViewWindowKey                 = @"CPViewWindowKey";
+
 @implementation CPCustomView : CPView
 {
     CPString    _className;
@@ -43,41 +56,41 @@ var CPCustomViewClassNameKey    = @"CPCustomViewClassNameKey";
     // FIXME: Should we instead throw an exception?
     if (!theClass)
         theClass = [CPView class];
-
-    // If this is just a "CPView", don't bother with any funny business, just go ahead and create it with initWithCoder:
-    if (theClass == [CPView class])
-        self = [[CPView alloc] initWithCoder:aCoder];
-
-    return self;
-    // If not, fall back to initWithFrame:
-/*
+
     var frame = [aCoder decodeRectForKey:CPViewFrameKey];
 
-    self = [[theClass alloc] initWithFrame:frame];
-    
+    // If this is just a "CPView", don't bother with any funny business, just go ahead and create it with initWithCoder:
+    if (theClass == [CPView class])
+        self = [[CPView alloc] initWithFrame:frame];
+
     if (self)
-    {
-        _bounds = [aCoder decodeRectForKey:CPViewBoundsKey];
-
-        _window = [aCoder decodeObjectForKey:CPViewWindowKey];
-        _subviews = [aCoder decodeObjectForKey:CPViewSubviewsKey];
-        _superview = [aCoder decodeObjectForKey:CPViewSuperviewKey];
+    {    
+        [self _setWindow:[aCoder decodeObjectForKey:CPViewWindowKey]];
 
-        _autoresizingMask = [aCoder decodeIntForKey:CPViewAutoresizingMaskKey];
-        _autoresizesSubviews = [aCoder decodeBoolForKey:CPViewAutoresizesSubviewsKey];
+        // Since the object replacement logic hasn't had a chance to kick in yet, we need to do it manually:
+        var subviews = [aCoder decodeObjectForKey:CPViewSubviewsKey],
+            index = 0,
+            count = subviews.length;
 
-        // FIXME: UGH!!!!
-        _index = [aCoder decodeIntForKey:FIXME_indexKey];
+        for (; index < count; ++index)
+        {
+            // This is a bogus superview "CPCustomView".
+            subviews[index]._superview = nil;
+
+            [self addSubview:subviews[index]];
+        }
 
+        _autoresizingMask = [aCoder decodeIntForKey:CPViewAutoresizingMaskKey];
+        _autoresizesSubviews = [aCoder decodeBoolForKey:CPViewAutoresizesSubviewsKey];
+
         _hitTests = [aCoder decodeObjectForKey:CPViewHitTestsKey];
         _isHidden = [aCoder decodeObjectForKey:CPViewIsHiddenKey];
         _opacity = [aCoder decodeIntForKey:CPViewOpacityKey];
 
         [self setBackgroundColor:[aCoder decodeObjectForKey:CPViewBackgroundColorKey]];
-
     }
 
-    return self;*/
+    return self;
 }
 
 @end

AppKit/Platform/Platform.h

@@ -21,5 +21,3 @@
  */
 
 #define PLATFORM(FEATURE) (defined( PLATFORM_##FEATURE ) && PLATFORM_##FEATURE)
-
-#define PLATFORM_DOM 1

AppKit/build.xml

@@ -16,7 +16,13 @@
 
         <steam>
             <arguments>
-                <arg line = "-f AppKit.steam -c ${Configuration}" />
+                <arg line = "-f AppKit.steam -c ${Configuration} -t AppKit" />
+            </arguments>
+        </steam>
+
+        <steam>
+            <arguments>
+                <arg line = "-f AppKit.steam -c ${Configuration} -t AppKit-Rhino" />
             </arguments>
         </steam>
 
@@ -33,7 +39,7 @@
         </copy>        
 
         <copy todir = "${Build.Cappuccino.Tools.Lib.Frameworks}/AppKit">
-            <fileset dir = "${Build}/${Configuration}/AppKit" />
+            <fileset dir = "${Build}/${Configuration}/AppKit-Rhino" />
         </copy>
 
         <copy todir = "${Build.Cappuccino.Starter.Frameworks}/AppKit" >

Foundation/Foundation.steam

@@ -2,19 +2,19 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>name</key>
+    <key>Name</key>
     <string>Foundation</string>
 	<key>Targets</key>
 	<array>
         <dict>
-            <key>name</key>
+            <key>Name</key>
             <string>Foundation</string>
         </dict>
 	</array>
     <key>Configurations</key>
 	<array>
         <dict>
-            <key>name</key>
+            <key>Name</key>
             <string>Debug</string>
             <key>Settings</key>
             <dict>
@@ -25,7 +25,7 @@
             </dict>
         </dict>
         <dict>
-            <key>name</key>
+            <key>Name</key>
             <string>Release</string>
             <key>Settings</key>
             <dict>

Tools/Install/install-tools

@@ -27,11 +27,13 @@ mkdir -p $INSTALL_DIR/share
 
 cp -fR objj/ $INSTALL_DIR/share/objj
 
+ln -sf $INSTALL_DIR/share/objj/bin/nib2cib $INSTALL_DIR/bin/nib2cib
 ln -sf $INSTALL_DIR/share/objj/bin/objj $INSTALL_DIR/bin/objj
 ln -sf $INSTALL_DIR/share/objj/bin/objjc $INSTALL_DIR/bin/objjc
 ln -sf $INSTALL_DIR/share/objj/bin/steam $INSTALL_DIR/bin/steam
 ln -sf $INSTALL_DIR/share/objj/bin/bake $INSTALL_DIR/bin/bake
 
+chmod +x $INSTALL_DIR/bin/nib2cib
 chmod +x $INSTALL_DIR/bin/objj
 chmod +x $INSTALL_DIR/bin/objjc
 chmod +x $INSTALL_DIR/bin/steam

Tools/NibApp/AppController.j

@@ -0,0 +1,25 @@
+
+import <Foundation/CPObject.j>
+import <AppKit/CPCib.j>
+
+
+@implementation AppController : CPObject
+{
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    var cib = [[CPCib alloc] initWithContentsOfURL:@"MainMenu.cib"],
+        x = [cib instantiateCibWithExternalNameTable:nil];
+
+    [x setBackgroundColor:[CPColor blueColor]];
+
+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask],
+        contentView = [theWindow contentView];
+
+    [contentView addSubview:x];
+
+    [theWindow orderFront:self];
+}
+
+@end

Tools/NibApp/Frameworks

@@ -0,0 +1 @@
+/Users/tolmasky/Development/Build/Release