Cleanup Jakefiles:

* require common.jake first
* require Objective-J/Cappuccino stuff only when needed (automatically requiring these caused too many problems)
* remove useless shebangs, cleanup whitespace

AppKit/Jakefile

@@ -1,6 +1,8 @@
 
 require("../common.jake");
 
+var framework = require("objective-j/jake").framework;
+var BundleTask = require("objective-j/jake").BundleTask;
 
 $BUILD_PATH = FILE.join($BUILD_DIR, $CONFIGURATION, 'AppKit');
 

AppKit/Themes/Aristo/Jakefile

@@ -1,6 +1,7 @@
 
 require("../../../common.jake");
 
+var blend = require("cappuccino/jake").blend;
 
 blend ("Aristo.blend", function(aristoTask)
 {

AppKit/Themes/BlendKit/Jakefile

@@ -1,6 +1,8 @@
 
 require("../../../common.jake");
 
+var framework = require("objective-j/jake").framework;
+var BundleTask = require("objective-j/jake").BundleTask;
 
 blendKitTask = framework ("BlendKit", function(blendKitTask)
 {

AppKit/Themes/CommonJS/Jakefile

@@ -3,7 +3,6 @@ require("../../../common.jake");
 
 var FILE = require("file");
 
-
 $BLENDTASK              = "blendtask.j";
 $BUILD_CJS_BLENDTASK    = FILE.join($BUILD_CJS_CAPPUCCINO, "lib", "cappuccino", "jake", "blendtask.j");
 

AppKit/Themes/Jakefile

@@ -1,6 +1,4 @@
-#!/usr/bin/env narwhal
 
 require("../../common.jake");
 
-
 subtasks(["BlendKit", "CommonJS", "Aristo"], ["build", "clean", "clobber"]);

CommonJS/Jakefile

@@ -1,7 +1,6 @@
 
 require("../common.jake");
 
-
 var FILE = require("file");
 
 new FileList("**/*").exclude("Jakefile").forEach(function(aFilename)

Foundation/Jakefile

@@ -22,6 +22,8 @@
 
 require("../common.jake");
 
+var framework = require("objective-j/jake").framework;
+var BundleTask = require("objective-j/jake").BundleTask;
 
 foundationTask = framework ("Foundation", function(foundationTask)
 {

Jakefile

@@ -1,4 +1,5 @@
-#!/usr/bin/env narwhal
+
+require("./common.jake");
 
 var FILE = require("file"),
     SYSTEM = require("system"),
@@ -6,8 +7,6 @@ var FILE = require("file"),
     jake = require("jake"),
     stream = require("term").stream;
 
-require(FILE.absolute("common.jake"));
-
 var subprojects = ["Objective-J", "CommonJS", "Foundation", "AppKit", "Tools"];
 
 ["build", "clean", "clobber"].forEach(function(aTaskName)

Objective-J/Jakefile

@@ -20,11 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+require("../common.jake");
+
 var FILE = require("file"),
     OS = require("os"),
     stream = require("term").stream;
 
-require("../common.jake");
 //$BUILD_CONFIGURATION_DIR = "../Build"
 $BROWSER_FILE       = FILE.join("Browser", "Objective-J.js");
 

Tools/Jakefile

@@ -1,7 +1,5 @@
-#!/usr/bin/env narwhal
 
 require("../common.jake");
 
-
 // nib2cib has to come before capp since capp uses nib2cib
 subtasks(["nib2cib", "capp"/*, "bake"*/, "press"], ["build"/*, "clean", "clobber"*/]);

Tools/capp/Jakefile

@@ -1,7 +1,8 @@
 
-
 require ("../../common.jake");
 
+var app = require("objective-j/jake").app;
+var BundleTask = require("objective-j/jake").BundleTask;
 
 app ("capp", function(cappTask)
 {

Tools/nib2cib/Jakefile

@@ -1,9 +1,10 @@
 
-
-var FILE = require("file");
-
 require("../../common.jake");
 
+var FILE = require("file");
+
+var app = require("objective-j/jake").app;
+var BundleTask = require("objective-j/jake").BundleTask;
 
 app ("nib2cib", function(nib2cibTask)
 {

Tools/press/Jakefile

@@ -1,7 +1,8 @@
-#!/usr/bin/env narwhal
 
 require ("../../common.jake");
 
+var app = require("objective-j/jake").app;
+var BundleTask = require("objective-j/jake").BundleTask;
 
 app ("press", function(pressTask)
 {

common.jake

@@ -189,35 +189,11 @@ function handleSetupEnvironmentError(e) {
 
 function setupEnvironment()
 {
-    // TODO: deprecate these globals
-    try {
-        var OBJECTIVE_J_JAKE = require("objective-j/jake");
-        
-        global.app = OBJECTIVE_J_JAKE.app;
-        global.bundle = OBJECTIVE_J_JAKE.bundle;
-        global.framework = OBJECTIVE_J_JAKE.framework;
-
-        global.BundleTask = OBJECTIVE_J_JAKE.BundleTask;
-    } catch (e) {
-        handleSetupEnvironmentError(e);
-    }
-    
     try {
         require("objective-j").OBJJ_INCLUDE_PATHS.push(FILE.join($BUILD_CONFIGURATION_DIR, "CommonJS", "cappuccino", "Frameworks"));
     } catch (e) {
         handleSetupEnvironmentError(e);
     }
-    
-    try {
-        var CAPPUCCINO_JAKE = require("cappuccino/jake");
-        if (CAPPUCCINO_JAKE.blend)
-            global.blend = CAPPUCCINO_JAKE.blend;
-        //else
-        //    print("no blend!")
-    }
-    catch (e) {
-        handleSetupEnvironmentError(e);
-    }
 }
 
 setupEnvironment();