From e5c5378ec07e943dedae5898cb97d7d1bbaa7720 Mon Sep 17 00:00:00 2001
From: Francisco Ryan Tolmasky I <francisco@280north.com>
Date: Sat, 26 Sep 2009 02:03:03 -0700
Subject: [PATCH] A bit of work on top level tasks.

Reviewed by me.
---
 Jakefile                    | 28 ++++++++--------------------
 Tools/Install/install-tools | 13 +++++--------
 Tools/Jakefile              |  3 ++-
 3 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/Jakefile b/Jakefile
index e479bfe8e..012fde118 100644
--- a/Jakefile
+++ b/Jakefile
@@ -37,17 +37,10 @@ global.$STARTER_DOWNLOAD                = FILE.join($BUILD_DIR, 'Cappuccino', 'S
 global.$STARTER_DOWNLOAD_APPLICATION    = FILE.join($STARTER_DOWNLOAD, 'NewApplication');
 global.$STARTER_DOWNLOAD_README         = FILE.join($STARTER_DOWNLOAD, 'README');
 
-global.$NARWHAL_PACKAGE                 = FILE.join($BUILD_DIR, 'Cappuccino', 'objj');
+global.$TOOLS_COMMONJS                  = FILE.join($BUILD_DIR, "Cappuccino", "Tools", "CommonJS", "objective-j");
 
 task ("downloads", ["starter_download", "tools_download", "narwhal_package"]);
 
-filedir ($TOOLS_DOWNLOAD_ENV, ["debug", "release"], function()
-{
-    rm_rf($TOOLS_DOWNLOAD_ENV);
-    cp_r(FILE.join($RELEASE_ENV), $TOOLS_DOWNLOAD_ENV);
-    cp_r(FILE.join($DEBUG_ENV, 'packages', 'objj', 'lib', 'Frameworks'), FILE.join($TOOLS_DOWNLOAD_ENV, 'packages', 'objj', 'lib', 'Frameworks', 'Debug'));
-});
-
 filedir ($TOOLS_DOWNLOAD_EDITORS, [$TOOLS_EDITORS], function()
 {
     cp_r(FILE.join($TOOLS_EDITORS, '.'), $TOOLS_DOWNLOAD_EDITORS);
@@ -63,19 +56,14 @@ filedir ($TOOLS_DOWNLOAD_INSTALLER, [$TOOLS_INSTALLER], function()
     cp($TOOLS_INSTALLER, $TOOLS_DOWNLOAD_INSTALLER);
 });
 
-task ("objj_gem", function()
-{
-    subjake('Tools/Rake', "objj_gem");
-});
-
-task ("tools_download", [$TOOLS_DOWNLOAD_ENV, $TOOLS_DOWNLOAD_EDITORS, $TOOLS_DOWNLOAD_README, $TOOLS_DOWNLOAD_INSTALLER, "objj_gem"]);
+task ("tools_download", [$TOOLS_DOWNLOAD_EDITORS, $TOOLS_DOWNLOAD_README, $TOOLS_DOWNLOAD_INSTALLER, $TOOLS_COMMONJS]);
 
 task ("starter_download", [$STARTER_DOWNLOAD_APPLICATION, $STARTER_DOWNLOAD_README]);
 
-task ("narwhal_package", [$TOOLS_DOWNLOAD_ENV], function()
+filedir ($TOOLS_COMMONJS, ["build"], function()
 {
-  rm_rf($NARWHAL_PACKAGE);
-  cp_r(FILE.join($TOOLS_DOWNLOAD_ENV, 'packages', 'objj'), $NARWHAL_PACKAGE);
+    rm_rf($TOOLS_COMMONJS);
+    cp_r($COMMONJS_PRODUCT, $TOOLS_COMMONJS);
 });
 
 task ("deploy", ["downloads", "docs"], function()
@@ -98,9 +86,9 @@ task ("deploy", ["downloads", "docs"], function()
     OS.system("cd " + cappuccino_output_path + " && zip -ry -8 Tools.zip Tools");
 });
 
-filedir ($STARTER_DOWNLOAD_APPLICATION, [$TOOLS_DOWNLOAD_ENV], function()
+filedir ($STARTER_DOWNLOAD_APPLICATION, ["build"], function()
 {
-    ENV["PATH"] = FILE.join($TOOLS_DOWNLOAD_ENV, "bin") + ':' + ENV["PATH"];
+    //ENV["PATH"] = FILE.join($TOOLS_DOWNLOAD_ENV, "bin") + ':' + ENV["PATH"];
 
     rm_rf($STARTER_DOWNLOAD_APPLICATION);
     FILE.mkdirs($STARTER_DOWNLOAD);
@@ -109,7 +97,7 @@ filedir ($STARTER_DOWNLOAD_APPLICATION, [$TOOLS_DOWNLOAD_ENV], function()
 //    rake abort if ($? != 0)
 
     // No tools means no objective-j gem
-    FILE.rm(FILE.join($STARTER_DOWNLOAD_APPLICATION, 'Rakefile'))
+    // FILE.rm(FILE.join($STARTER_DOWNLOAD_APPLICATION, 'Rakefile'))
 });
 
 filedir ($STARTER_DOWNLOAD_README, [$STARTER_README], function()
diff --git a/Tools/Install/install-tools b/Tools/Install/install-tools
index d4f8f0cd9..93bf0dec0 100755
--- a/Tools/Install/install-tools
+++ b/Tools/Install/install-tools
@@ -22,13 +22,13 @@ while [ $# -ge 1 ]; do
     shift
 done
 
-mkdir -p $INSTALL_DIR/bin
-mkdir -p $INSTALL_DIR/share
+//mkdir -p $INSTALL_DIR/bin
+//mkdir -p $INSTALL_DIR/share
 
-rm -rf $INSTALL_DIR/share/narwhal
-cp -fR objj $INSTALL_DIR/share/narwhal
+//rm -rf $INSTALL_DIR/share/narwhal
+cp -fR CommonJS/objective-j $INSTALL_DIR/share/narwhal
 
-BINS=`ls objj/bin`
+BINS=`ls CommonJS/objective-j/bin`
 for BIN in $BINS
 do
     ln -sf $INSTALL_DIR/share/narwhal/bin/$BIN $INSTALL_DIR/bin/$BIN
@@ -37,7 +37,4 @@ done
 
 chmod +x $INSTALL_DIR/share/narwhal/bin/*
 
-gem install *.gem
-gem cleanup objective-j
-
 echo "Cappuccino Tools Installed"
diff --git a/Tools/Jakefile b/Tools/Jakefile
index 90544d44f..f508bfbe6 100644
--- a/Tools/Jakefile
+++ b/Tools/Jakefile
@@ -2,5 +2,6 @@
 
 require("../common.jake");
 
+
 // nib2cib has to come before capp since capp uses nib2cib
-subtasks(["nib2cib", "capp"/*, "bake", "press"*/], ["build"/*, "clean", "clobber"*/]);
+subtasks(["nib2cib", "capp"/*, "bake"*/, "press"], ["build"/*, "clean", "clobber"*/]);