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
This commit is contained in:
Tom Robinson
2010-02-19 16:09:39 -08:00
parent 99b43fed7f
commit b2179f14ab
14 changed files with 19 additions and 39 deletions
-24
View File
@@ -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();