mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-09-30 06:07:42 +00:00
removal of print and debugger statements + added some more color
This commit is contained in:
@@ -27,8 +27,6 @@
|
||||
@import <AppKit/_CPCibObjectData.j>
|
||||
@import <BlendKit/BlendKit.j>
|
||||
|
||||
debugger;
|
||||
console.log("require: " + require);
|
||||
var /* FILE = require("file"), */
|
||||
TERM = require("objj-runtime").term,
|
||||
task = require("objj-jake").task,
|
||||
@@ -118,7 +116,6 @@ BlendTask.prototype.defineThemeDescriptorTasks = function()
|
||||
var localKeyedThemes = keyedThemes;
|
||||
var localThemesTaskName = themesTaskName;
|
||||
|
||||
console.log("starting themedescriptors: " + themeDescriptorPath);
|
||||
objj_importFile(path.resolve(themeDescriptorPath), YES, function() {
|
||||
if (--tdLeft === 0) {
|
||||
[BKThemeDescriptor allThemeDescriptorClasses].forEach(function(aClass)
|
||||
@@ -130,7 +127,6 @@ BlendTask.prototype.defineThemeDescriptorTasks = function()
|
||||
|
||||
localKeyedThemes.push([aClass themeName] + ".keyedtheme");
|
||||
});
|
||||
console.log("themesTaskName: " + localThemesTaskName);
|
||||
task (localThemesTaskName, function()
|
||||
{
|
||||
[BKThemeDescriptor allThemeDescriptorClasses].forEach(function(aClass)
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
console.log("at the top of CommonJS/Jakefile");
|
||||
|
||||
require("../common.jake");
|
||||
|
||||
// var FILE = require("file");
|
||||
|
||||
@@ -29,7 +29,6 @@ const path = require("path");
|
||||
|
||||
foundationTask = framework ("Foundation", function(foundationTask)
|
||||
{
|
||||
console.log("in foundationTask");
|
||||
foundationTask.setBuildIntermediatesPath(path.join($BUILD_DIR, "Foundation.build", $CONFIGURATION))
|
||||
foundationTask.setBuildPath($BUILD_CONFIGURATION_DIR);
|
||||
|
||||
@@ -72,6 +71,3 @@ filedir ($BUILD_CJS_FOUNDATION, ["Foundation"], function()
|
||||
task ("build", ["Foundation", $BUILD_CJS_FOUNDATION]);
|
||||
|
||||
CLOBBER.include($BUILD_CJS_FOUNDATION);
|
||||
|
||||
console.log("at the end of Foundation/jakefile");
|
||||
|
||||
|
||||
@@ -10,9 +10,7 @@ var subprojects = ["Objective-J", "CommonJS", "Foundation", "AppKit", "Tools"];
|
||||
{
|
||||
task (aTaskName, function()
|
||||
{
|
||||
console.log("i build task action");
|
||||
subjake(subprojects, aTaskName);
|
||||
console.log("ut ur build task action");
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -365,7 +365,6 @@ function finishBundleLoadingWithError(/*CFBundle*/ aBundle, /*Event*/ anError)
|
||||
|
||||
function loadExecutableAndResources(/*Bundle*/ aBundle, /*BOOL*/ shouldExecute)
|
||||
{
|
||||
console.log("loadExecutableAndResources");
|
||||
if (!aBundle.mostEligibleEnvironment())
|
||||
return failure();
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
console.log("i jakefilen för obj-j");
|
||||
require("../common.jake");
|
||||
|
||||
// Make sure we can use new functions in an in old javascript engines like Rhino
|
||||
@@ -58,7 +57,6 @@ $BROWSER_FILES = new FileList($BROWSER_FILE).include($OBJECTIVEJ_FILES);
|
||||
|
||||
filedir($BUILD_BROWSER_FILE, $BROWSER_FILES, function(aTask)
|
||||
{
|
||||
console.log("in task $BUILD_BROWSER_FILE");
|
||||
gcc($BROWSER_FILE,
|
||||
$BUILD_BROWSER_FILE,
|
||||
environmentFlags("Browser", "ObjJ").concat($INCLUDE_FLAGS, $DEBUG_FLAGS, ["-Wno-unused-but-set-variable"]), $CONFIGURATION !== "Debug");
|
||||
@@ -179,5 +177,3 @@ function gcc(inputFilePath, outputFilePath, flags, compress)
|
||||
}
|
||||
|
||||
task("build", [$BUILD_BROWSER_FILE, $BUILD_LICENSE, $BUILD_CJS_OBJECTIVE_J_FRAMEWORK]);
|
||||
|
||||
console.log("at the bottom of Objective-J/jakefile");
|
||||
+6
-9
@@ -23,6 +23,7 @@ const fs = require('fs');
|
||||
const child_process = require('child_process');
|
||||
const path = require('path');
|
||||
const jake = require("objj-jake");
|
||||
const { stream } = require('objj-runtime/lib/term');
|
||||
|
||||
requiresSudo = false;
|
||||
|
||||
@@ -94,7 +95,6 @@ global.FIXME_fileDependency = function(destinationPath, sourcePath)
|
||||
// used in serializedENV()
|
||||
function additionalPackages()
|
||||
{
|
||||
console.log("in additionalPackages");
|
||||
var builtObjectiveJPackage = path.join(path.resolve($BUILD_CONFIGURATION_DIR), "CommonJS", "objective-j");
|
||||
var builtCappuccinoPackage = path.join(path.resolve($BUILD_CONFIGURATION_DIR), "CommonJS", "cappuccino");
|
||||
|
||||
@@ -263,8 +263,7 @@ global.mv = function(/*String*/ from, /*String*/ to)
|
||||
|
||||
function systemSync(command)
|
||||
{
|
||||
console.log("i systemSync");
|
||||
console.log("command: " + command)
|
||||
//console.log("command: " + command)
|
||||
try {
|
||||
child_process.execSync(command, {stdio: 'inherit'});
|
||||
return 0;
|
||||
@@ -347,9 +346,9 @@ global.setPackageMetadata = function(packagePath)
|
||||
pkg["cappuccino-timestamp"] = new Date().getTime();
|
||||
pkg["version"] = getCappuccinoVersion();
|
||||
|
||||
console.log(" Version: \0purple(" + pkg["version"] + "\0)");
|
||||
console.log(" Revision: \0purple(" + pkg["cappuccino-revision"] + "\0)");
|
||||
console.log(" Timestamp: \0purple(" + pkg["cappuccino-timestamp"] + "\0)");
|
||||
stream.print(" Version: \0purple(" + pkg["version"] + "\0)");
|
||||
stream.print(" Revision: \0purple(" + pkg["cappuccino-revision"] + "\0)");
|
||||
stream.print(" Timestamp: \0purple(" + pkg["cappuccino-timestamp"] + "\0)");
|
||||
|
||||
fs.writeFileSync(packagePath, JSON.stringify(pkg, null, 4), 'utf8');
|
||||
};
|
||||
@@ -444,10 +443,9 @@ global.installCopy = function(sourcePath, useSudo)
|
||||
|
||||
global.spawnJake = function(/*String*/ aTaskName)
|
||||
{
|
||||
console.log("i spawnJake");
|
||||
//if (systemSync(serializedENV() + " " + "npx --node-options='--inspect-brk' objj-jake" + " " + aTaskName))
|
||||
if (systemSync(serializedENV() + " " + "npx objj-jake" + " " + aTaskName))
|
||||
console.log("exited in spawnJake with code 1");
|
||||
console.log("exited in spawnJake with error");
|
||||
process.exit(1); //rake abort if ($? != 0)
|
||||
};
|
||||
|
||||
@@ -556,7 +554,6 @@ task ("release", function()
|
||||
|
||||
task ("debug", function()
|
||||
{
|
||||
console.log("in debug mode");
|
||||
process.env["CONFIG"] = "Debug";
|
||||
spawnJake("build");
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user