From f360ab9475b1dcb37553b54ffe97a332a44c8802 Mon Sep 17 00:00:00 2001
From: Tom Robinson <tom@280north.com>
Date: Tue, 25 Aug 2009 23:22:04 -0700
Subject: [PATCH] Update objj and browserjs package.json, add Rake task for
 narwhal modules

---
 External/browserjs                  |  2 +-
 Objective-J/Tools/objj/package.json | 16 ++++++++++++----
 Rakefile                            |  9 ++++++++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/External/browserjs b/External/browserjs
index 87a9b481d..b01b92b12 160000
--- a/External/browserjs
+++ b/External/browserjs
@@ -1 +1 @@
-Subproject commit 87a9b481d1362aa380ee69392c7920fb08361d3e
+Subproject commit b01b92b128c1ba8258344806bc7df79ce5ffee3c
diff --git a/Objective-J/Tools/objj/package.json b/Objective-J/Tools/objj/package.json
index 18e5956c7..55159a857 100644
--- a/Objective-J/Tools/objj/package.json
+++ b/Objective-J/Tools/objj/package.json
@@ -1,7 +1,15 @@
 {
-    "author": "Tom Robinson",
-    "dependencies": [],
+    "name": "objj",
+    "dependencies": ["narwhal", "jack", "browserjs"],
     "lib": "lib-js",
-    "jars": "jars/",
-    "plugins": ["objj/loader"]
+    "preload": ["objj/loader"],
+    "description": "Objective-J and Cappuccino tools",
+    "keywords": ["Objective-J", "Cappuccino"],
+    "author": "280 North (http://280north.com/)",
+    "contributors": [
+        "Francisco Tolmasky (http://tolmasky.com/)",
+        "Ross Boucher (http://rossboucher.com/)",
+        "Tom Robinson (http://tlrobinson.net/)",
+        "Numerous others (http://contributors.cappuccino.org/)"
+    ]
 }
diff --git a/Rakefile b/Rakefile
index 427f7c560..05a81dfee 100644
--- a/Rakefile
+++ b/Rakefile
@@ -33,7 +33,9 @@ $STARTER_DOWNLOAD                   = File.join($BUILD_DIR, 'Cappuccino', 'Start
 $STARTER_DOWNLOAD_APPLICATION       = File.join($STARTER_DOWNLOAD, 'NewApplication')
 $STARTER_DOWNLOAD_README            = File.join($STARTER_DOWNLOAD, 'README')
 
-task :downloads => [:starter_download, :tools_download]
+$NARWHAL_PACKAGE                    = File.join($BUILD_DIR, 'Cappuccino', 'objj')
+
+task :downloads => [:starter_download, :tools_download, :narwhal_package]
 
 file_d $TOOLS_DOWNLOAD_ENV => [:debug, :release] do
     rm_rf($TOOLS_DOWNLOAD_ENV)
@@ -61,6 +63,11 @@ task :tools_download => [$TOOLS_DOWNLOAD_ENV, $TOOLS_DOWNLOAD_EDITORS, $TOOLS_DO
 
 task :starter_download => [$STARTER_DOWNLOAD_APPLICATION, $STARTER_DOWNLOAD_README]
 
+task :narwhal_package => [$TOOLS_DOWNLOAD_ENV] do
+  rm_rf($NARWHAL_PACKAGE)
+  cp_r(File.join($TOOLS_DOWNLOAD_ENV, 'packages', 'objj'), $NARWHAL_PACKAGE)
+end
+
 task :deploy => [:downloads, :docs] do
     #copy the docs into the starter pack
     cp_r(File.join($DOCUMENTATION_BUILD, 'html', '.'), File.join($STARTER_DOWNLOAD, 'Documentation'))