From 45ebe2c905390d7170f3f65af095f85b121eac74 Mon Sep 17 00:00:00 2001 From: Paul Baumgart Date: Wed, 6 Oct 2010 23:04:00 -0700 Subject: [PATCH] Fix deprecation warnings --- AppKit/Themes/CommonJS/blendtask.j | 4 ++-- CommonJS/bin/flatten | 6 +++--- CommonJS/bin/ojdepcheck | 4 ++-- CommonJS/bin/press | 4 ++-- Jakefile | 4 ++-- Objective-J/CPLog.js | 2 +- Objective-J/CommonJS/bin/cplutil | 2 +- Objective-J/CommonJS/lib/objective-j.js | 2 +- Objective-J/CommonJS/lib/objective-j/jake/bundletask.js | 4 ++-- Objective-J/Jakefile | 2 +- Tools/capp/Generate.j | 6 +++--- Tools/nib2cib/main.j | 2 +- common.jake | 8 ++++---- 13 files changed, 25 insertions(+), 25 deletions(-) diff --git a/AppKit/Themes/CommonJS/blendtask.j b/AppKit/Themes/CommonJS/blendtask.j index 168fdbd8d..1cb7ee6f9 100644 --- a/AppKit/Themes/CommonJS/blendtask.j +++ b/AppKit/Themes/CommonJS/blendtask.j @@ -6,7 +6,7 @@ var FILE = require("file"), - TERM = require("term"), + TERM = require("narwhal/term"), task = require("jake").task, filedir = require("jake").filedir, BundleTask = require("objective-j/jake/bundletask").BundleTask; @@ -32,7 +32,7 @@ BlendTask.prototype.infoPlist = function() { var infoPlist = BundleTask.prototype.infoPlist.apply(this, arguments); - infoPlist.setValueForKey("CPKeyedThemes", require("util").unique(this._keyedThemes)); + infoPlist.setValueForKey("CPKeyedThemes", require("narwhal/util").unique(this._keyedThemes)); return infoPlist; } diff --git a/CommonJS/bin/flatten b/CommonJS/bin/flatten index f47fb1e19..7bf829451 100755 --- a/CommonJS/bin/flatten +++ b/CommonJS/bin/flatten @@ -8,12 +8,12 @@ require("narwhal").ensureEngine("rhino"); var FILE = require("file"); var OS = require("os"); -var UTIL = require("util"); +var UTIL = require("narwhal/util"); var CACHEMANIFEST = require("objective-j/cache-manifest"); -var stream = require("term").stream; -var parser = new (require("args").Parser)(); +var stream = require("narwhal/term").stream; +var parser = new (require("narwhal/args").Parser)(); parser.usage("INPUT_PROJECT OUTPUT_PROJECT"); parser.help("Combine a Cappuccino application into a single JavaScript file."); diff --git a/CommonJS/bin/ojdepcheck b/CommonJS/bin/ojdepcheck index a06f4f431..c373f6927 100755 --- a/CommonJS/bin/ojdepcheck +++ b/CommonJS/bin/ojdepcheck @@ -8,8 +8,8 @@ require("narwhal").ensureEngine("rhino"); var FILE = require("file"); -var stream = require("term").stream -var parser = new (require("args").Parser)(); +var stream = require("narwhal/term").stream +var parser = new (require("narwhal/args").Parser)(); parser.usage("INPUT_PROJECT"); parser.help("Checks a project for missing imports."); diff --git a/CommonJS/bin/press b/CommonJS/bin/press index 10b6dadf1..8d1b60025 100755 --- a/CommonJS/bin/press +++ b/CommonJS/bin/press @@ -12,8 +12,8 @@ var OS = require("os"); var CACHEMANIFEST = require("objective-j/cache-manifest"); -var stream = require("term").stream; -var parser = new (require("args").Parser)(); +var stream = require("narwhal/term").stream; +var parser = new (require("narwhal/args").Parser)(); parser.usage("INPUT_PROJECT OUTPUT_PROJECT"); parser.help("Analyze and strip unused files from a Cappuccino project's .sj bundles."); diff --git a/Jakefile b/Jakefile index 83ca1c030..8a103149d 100644 --- a/Jakefile +++ b/Jakefile @@ -4,9 +4,9 @@ require("./common.jake"); var FILE = require("file"), SYSTEM = require("system"), OS = require("os"), - UTIL = require("util"), + UTIL = require("narwhal/util"), jake = require("jake"), - stream = require("term").stream; + stream = require("narwhal/term").stream; var subprojects = ["Objective-J", "CommonJS", "Foundation", "AppKit", "Tools"]; diff --git a/Objective-J/CPLog.js b/Objective-J/CPLog.js index dec1e0f06..3a9e863e4 100644 --- a/Objective-J/CPLog.js +++ b/Objective-J/CPLog.js @@ -182,7 +182,7 @@ GLOBAL(CPLogPrint) = function(aString, aLevel, aTitle, aFormatter) { if (stream === undefined) { try { - stream = require("term").stream; + stream = require("narwhal/term").stream; } catch (e) { stream = null; } diff --git a/Objective-J/CommonJS/bin/cplutil b/Objective-J/CommonJS/bin/cplutil index ceb11c71b..4d489ab0a 100755 --- a/Objective-J/CommonJS/bin/cplutil +++ b/Objective-J/CommonJS/bin/cplutil @@ -5,7 +5,7 @@ var FILE = require("file"), OS = require("os"), ObjectiveJ = require("objective-j"); -var parser = new (require("args").Parser)(); +var parser = new (require("narwhal/args").Parser)(); parser.usage("file..."); parser.help("Cappuccino plist converter."); diff --git a/Objective-J/CommonJS/lib/objective-j.js b/Objective-J/CommonJS/lib/objective-j.js index 444c47806..3bb275a27 100644 --- a/Objective-J/CommonJS/lib/objective-j.js +++ b/Objective-J/CommonJS/lib/objective-j.js @@ -23,7 +23,7 @@ var OBJJ_INCLUDE_PATHS = global.OBJJ_INCLUDE_PATHS = exports.OBJJ_INCLUDE_PATHS exports.objj_frameworks = []; exports.objj_debug_frameworks = []; -var catalog = require("packages").catalog; +var catalog = require("narwhal/packages").catalog; for (var name in catalog) { if (!catalog.hasOwnProperty(name)) diff --git a/Objective-J/CommonJS/lib/objective-j/jake/bundletask.js b/Objective-J/CommonJS/lib/objective-j/jake/bundletask.js index 13e3d7a8b..e9cca5ee5 100644 --- a/Objective-J/CommonJS/lib/objective-j/jake/bundletask.js +++ b/Objective-J/CommonJS/lib/objective-j/jake/bundletask.js @@ -1,8 +1,8 @@ var FILE = require("file"), OS = require("os"), - UTIL = require("util"), - TERM = require("term"), + UTIL = require("narwhal/util"), + TERM = require("narwhal/term"), Jake = require("jake"), CLEAN = require("jake/clean").CLEAN, CLOBBER = require("jake/clean").CLOBBER, diff --git a/Objective-J/Jakefile b/Objective-J/Jakefile index 58f2de2db..1458c9210 100644 --- a/Objective-J/Jakefile +++ b/Objective-J/Jakefile @@ -24,7 +24,7 @@ require("../common.jake"); var FILE = require("file"), OS = require("os"), - stream = require("term").stream; + stream = require("narwhal/term").stream; //$BUILD_CONFIGURATION_DIR = "../Build" $BROWSER_FILE = FILE.join("Browser", "Objective-J.js"); diff --git a/Tools/capp/Generate.j b/Tools/capp/Generate.j index 0062ff735..e360500a0 100644 --- a/Tools/capp/Generate.j +++ b/Tools/capp/Generate.j @@ -6,9 +6,9 @@ var OS = require("os"), FILE = require("file"), OBJJ = require("objective-j"); -var stream = require("term").stream; +var stream = require("narwhal/term").stream; -var parser = new (require("args").Parser)(); +var parser = new (require("narwhal/args").Parser)(); parser.usage("DESTINATION_DIRECTORY"); @@ -63,7 +63,7 @@ parser.option("--list-frameworks", "listFrameworks") parser.helpful(); // FIXME: better way to do this: -var CAPP_HOME = require("packages").catalog["cappuccino"].directory; +var CAPP_HOME = require("narwhal/packages").catalog["cappuccino"].directory; var templatesDirectory = FILE.join(CAPP_HOME, "lib", "capp", "Resources", "Templates"); function gen(/*va_args*/) diff --git a/Tools/nib2cib/main.j b/Tools/nib2cib/main.j index ccb1a9f29..f718369a5 100644 --- a/Tools/nib2cib/main.j +++ b/Tools/nib2cib/main.j @@ -33,7 +33,7 @@ var FILE = require("file"); var OS = require("os"); -var parser = new (require("args").Parser)(); +var parser = new (require("narwhal/args").Parser)(); parser.usage("INPUT_FILE [OUTPUT_FILE]"); diff --git a/common.jake b/common.jake index 3607393e4..f9b755a80 100644 --- a/common.jake +++ b/common.jake @@ -1,8 +1,8 @@ var SYSTEM = require("system"); var FILE = require("file"); var OS = require("os"); -var UTIL = require("util"); -var stream = require("term").stream; +var UTIL = require("narwhal/util"); +var stream = require("narwhal/term").stream; var requiresSudo = false; @@ -15,7 +15,7 @@ function ensurePackageUpToDate(packageName, requiredVersion, options) { options = options || {}; - var packageInfo = require("packages").catalog[packageName]; + var packageInfo = require("narwhal/packages").catalog[packageName]; if (!packageInfo) { if (options.optional) @@ -163,7 +163,7 @@ function additionalPackages() // checks to see if a path is in the package catalog function packageInCatalog(path) { - var catalog = require("packages").catalog; + var catalog = require("narwhal/packages").catalog; for (var name in catalog) if (String(catalog[name].directory) === String(path)) return true;