From 3ee63b754c274b6bb32d928fc056ac0c065ec16f Mon Sep 17 00:00:00 2001 From: Tom Robinson Date: Wed, 27 Jan 2010 17:54:28 -0800 Subject: [PATCH] Remove theme bundle loading in press for now. --- Tools/press/main.j | 7 +------ Tools/press/objj-analysis-tools.j | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Tools/press/main.j b/Tools/press/main.j index f92270a50..3ea3bcd47 100644 --- a/Tools/press/main.j +++ b/Tools/press/main.j @@ -1,9 +1,4 @@ -var OS = require("os"); -if (system.engine !== "rhino") { - system.args.splice(1,2); // remove library path and main.j - var cmd = "NARWHAL_ENGINE_HOME='' NARWHAL_ENGINE='rhino' " + system.args.map(OS.enquote).join(" "); - OS.exit(OS.system(cmd)); -} +require("narwhal").ensureEngine("rhino"); @import diff --git a/Tools/press/objj-analysis-tools.j b/Tools/press/objj-analysis-tools.j index 344148bc8..24b6e9a8f 100644 --- a/Tools/press/objj-analysis-tools.j +++ b/Tools/press/objj-analysis-tools.j @@ -272,9 +272,9 @@ function findGlobalDefines(context, mainPath, evaledFragments, bundleCallback) bundlePaths = bundlePaths || []; // load default theme bundle - var themePath = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:[CPApplication defaultThemeName]]; - var themeBundle = [[CPBundle alloc] initWithPath:themePath + "/Info.plist"]; - [themeBundle loadWithDelegate:bundleDelegate]; + // var themePath = [[CPBundle bundleForClass:[CPApplication class]] pathForResource:[CPApplication defaultThemeName]]; + // var themeBundle = [[CPBundle alloc] initWithPath:themePath + "/Info.plist"]; + // [themeBundle loadWithDelegate:bundleDelegate]; // load additional bundles bundlePaths.forEach(function(bundlePath) {