mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-08-25 04:57:03 +00:00
More clean/clobber fixes.
Reviewed by me.
This commit is contained in:
+1
-1
@@ -35,7 +35,7 @@ filedir ($COMMONJS_PRODUCT_APPKIT, ["AppKit"], function()
|
||||
cp_r(appKitTask.buildProductPath(), $COMMONJS_PRODUCT_APPKIT);
|
||||
});
|
||||
|
||||
//subtasks (["Themes"], ["clean", "clobber"]);
|
||||
subtasks (["Themes"], ["clean", "clobber"]);
|
||||
|
||||
task ("Theme", [$COMMONJS_PRODUCT_APPKIT], function()
|
||||
{
|
||||
|
||||
@@ -33,4 +33,4 @@ filedir ($COMMONJS_PRODUCT_BLENDKIT, ["BlendKit"], function()
|
||||
print("here?...");
|
||||
task ("build", ["BlendKit", $COMMONJS_PRODUCT_BLENDKIT]);
|
||||
|
||||
//CLOBBER.include($ENVIRONMENT_PRODUCT)
|
||||
CLOBBER.include( $COMMONJS_PRODUCT_BLENDKIT);
|
||||
|
||||
@@ -14,3 +14,5 @@ filedir($COMMONJS_BLENDTASK_PRODUCT, [$BLENDTASK], function()
|
||||
});
|
||||
|
||||
task("build", [$COMMONJS_BLENDTASK_PRODUCT]);
|
||||
|
||||
CLOBBER.include($COMMONJS_BLENDTASK_PRODUCT);
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
require("../../common.jake");
|
||||
|
||||
|
||||
subtasks(["BlendKit", "CommonJS", "Aristo"], ["build"/*, "clean", "clobber"*/]);
|
||||
subtasks(["BlendKit", "CommonJS", "Aristo"], ["build", "clean", "clobber"]);
|
||||
|
||||
@@ -262,7 +262,7 @@ BundleTask.prototype.defineTasks = function()
|
||||
this.defineStaticTask();
|
||||
|
||||
CLEAN.include(this.buildIntermediatesProductPath());
|
||||
CLOBBER.include(this.buildPath());
|
||||
CLOBBER.include(this.buildProductPath());
|
||||
}
|
||||
|
||||
BundleTask.prototype.packageType = function()
|
||||
|
||||
+6
-9
@@ -80,15 +80,12 @@ var objectiveJBin = FILE.join($BUILD_DIR, $CONFIGURATION, "CommonJS", "objective
|
||||
if (!FILE.exists(objectiveJBin))
|
||||
objectiveJBin = FILE.join($HOME_DIR, "Objective-J", "CommonJS", "objective-j", "bin");
|
||||
|
||||
if (FILE.exists(objectiveJBin))
|
||||
{
|
||||
var system = OS.system;
|
||||
var system = OS.system;
|
||||
|
||||
// FIXME: is there a better way to do this???
|
||||
OS.system = function(aCommand)
|
||||
{
|
||||
system("PATH=" + OS.enquote(objectiveJBin) + ":$PATH " + aCommand)
|
||||
}
|
||||
// FIXME: is there a better way to do this???
|
||||
OS.system = function(aCommand)
|
||||
{
|
||||
system("PATH=" + OS.enquote(objectiveJBin) + ":$PATH " + aCommand)
|
||||
}
|
||||
|
||||
global.rm_rf = function(/*String*/ aFilename)
|
||||
@@ -238,7 +235,7 @@ global.subtasks = function(subprojects, taskNames)
|
||||
{
|
||||
taskNames.forEach(function(aTaskName)
|
||||
{
|
||||
var subtaskName = taskNames + "_subprojects";
|
||||
var subtaskName = aTaskName + "_subprojects";
|
||||
|
||||
task (aTaskName, [subtaskName]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user