From e956d61a086ea3f101d7d05128773775c3afdf00 Mon Sep 17 00:00:00 2001
From: Randall Luecke <randyl@rclconcepts.com>
Date: Wed, 31 Mar 2010 16:41:13 -0400
Subject: [PATCH 1/3] Fixed bug introduced by renaming of private class.

---
 AppKit/CPTableView.j | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AppKit/CPTableView.j b/AppKit/CPTableView.j
index 892d55cae..00d4e0d73 100644
--- a/AppKit/CPTableView.j
+++ b/AppKit/CPTableView.j
@@ -292,7 +292,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
 // FIX ME: we have a lot of redundent init stuff in initWithFrame: and initWithCoder: we should move it all into here.
 - (void)_init
 {
-        _dropOperationFeedbackView = [[_dropOperationDrawingView alloc] initWithFrame:_CGRectMakeZero()];
+        _dropOperationFeedbackView = [[_CPDropOperationDrawingView alloc] initWithFrame:_CGRectMakeZero()];
         [_dropOperationFeedbackView setTableView:self];
 
         _lastColumnShouldSnap = NO;

From ce32177e1d915c69fd11ed16be13eadd25cec7cb Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Wed, 31 Mar 2010 13:52:17 -0700
Subject: [PATCH 2/3] Use "CommonJS" task as the dependency for "test" task for
 now.

---
 Jakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jakefile b/Jakefile
index 77a4ccc0a..2d6b4bb10 100644
--- a/Jakefile
+++ b/Jakefile
@@ -247,7 +247,7 @@ task ("demos", function()
 
 // Testing
 
-task("test", ["build", "test-only"]);
+task("test", ["CommonJS", "test-only"]);
 
 task("test-only", function()
 {

From 675969af6df6cfc5bfaf3afff28f093ef69cea41 Mon Sep 17 00:00:00 2001
From: Paul Baumgart <paul@baumgart.us>
Date: Tue, 23 Mar 2010 15:27:42 -0700
Subject: [PATCH 3/3] Add some dependency checking to bootstrap.sh: make sure
 correct JVM is being used and ensure other dependencies are installed and on
 the $PATH.

---
 bootstrap.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/bootstrap.sh b/bootstrap.sh
index 6faf03629..07e821a8a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -78,6 +78,32 @@ function check_and_exit () {
     fi
 }
 
+function check_build_environment () {
+    # make sure user is running HotSpot JVM
+    java -version 2>&1 | grep HotSpot &> /dev/null
+    if [ ! "$?" = "0" ]; then
+        java_ver=`java -version 2>&1 | egrep "(Client|Server)"`
+        if [ "$java_ver" = "" ]; then
+            java_ver="your JVM"
+        fi
+        echo "Error: Narwhal is not compatible with $java_ver. Please switch to the Sun (HotSpot) JVM and re-run bootstrap.sh."
+        exit 1
+    fi
+
+    # make sure other dependencies are installed and on the $PATH
+    OTHER_DEPS=(gcc unzip curl)
+
+    for dep in ${OTHER_DEPS[@]}; do
+        which "$dep" &> /dev/null
+        if [ ! "$?" = "0" ]; then
+            echo "Error: $dep is required to build Cappuccino. Please install $dep and re-run bootstrap.sh."
+            exit 1
+        fi
+    done
+}
+
+check_build_environment
+
 if [ -w "/usr/local" ]; then
     default_directory="/usr/local/narwhal"
 else