From cd98bce331b9b074f55567c18c13fea1885fbca6 Mon Sep 17 00:00:00 2001 From: Francisco Ryan Tolmasky I Date: Sun, 31 Jan 2010 23:59:58 -0800 Subject: [PATCH] Turned off logging by default, removed unecessary logs, and fixed bug where turning of logs broke the build. Reviewed by me. --- Objective-J/DebugOptions.js | 5 ++--- Objective-J/Executable.js | 2 +- Objective-J/StaticResourceNode.js | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Objective-J/DebugOptions.js b/Objective-J/DebugOptions.js index 66083b0d4..1292282e3 100644 --- a/Objective-J/DebugOptions.js +++ b/Objective-J/DebugOptions.js @@ -1,7 +1,6 @@ -#define DEPENDENCY_LOGGING 1 -#define STATIC_RESOURCE_LOGGING 1 -#define EXECUTION_LOGGING 1 +#define DEPENDENCY_LOGGING 0 +#define EXECUTION_LOGGING 0 #if BROWSER #define CPLog console.log diff --git a/Objective-J/Executable.js b/Objective-J/Executable.js index d838db98e..7f34fe659 100644 --- a/Objective-J/Executable.js +++ b/Objective-J/Executable.js @@ -247,7 +247,7 @@ Executable.prototype.loadFileDependencies = function() } CPLog("DEPENDENCY: Ended"); -#end +#endif for (var executablePath in foundExecutablePaths) if (hasOwnProperty.apply(foundExecutablePaths, [executablePath])) diff --git a/Objective-J/StaticResourceNode.js b/Objective-J/StaticResourceNode.js index 72af07965..0f4c7fb33 100644 --- a/Objective-J/StaticResourceNode.js +++ b/Objective-J/StaticResourceNode.js @@ -377,9 +377,9 @@ StaticResourceNode.resolveStandardNodeAtPath = function(/*String*/ aPath, /*Func resolveStandardNodeAtPath = function(/*String*/ aPath, /*int*/ anIndex) { var searchPath = FILE.absolute(FILE.join(includePaths[anIndex], FILE.normal(aPath))); - if (searchPath.indexOf("CPObject.j") !== -1) CPLog("WILL SEARCH IN: " + searchPath); + rootNode.resolveSubPath(searchPath, StaticResourceNode.FileType, function(/*StaticResourceNode*/ aStaticResourceNode) - {if (searchPath.indexOf("CPObject.j") !== -1) CPLog("FOUND...: " + aStaticResourceNode); + { if (!aStaticResourceNode) { if (anIndex + 1< includePaths.length)