From aba7ea8bf1af2c190d9d13ccad12f6bba2294133 Mon Sep 17 00:00:00 2001 From: Francisco Ryan Tolmasky I Date: Fri, 16 Oct 2009 11:50:28 -0700 Subject: [PATCH] Fixed Debug mode. Reviewd by me. --- Foundation/CPBundle.j | 6 +++--- Objective-J/Jakefile | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Foundation/CPBundle.j b/Foundation/CPBundle.j index be1574da7..7357ec8fd 100644 --- a/Foundation/CPBundle.j +++ b/Foundation/CPBundle.j @@ -105,13 +105,13 @@ - (CPString)pathForResource:(CPString)aFilename { - var path = [self resourcePath] + '/' + aFilename, + var actualPath = [self resourcePath] + '/' + aFilename, mappedPath = _URIMap["Resources/" + aFilename]; if (mappedPath) return mappedPath; - return path; + return actualPath; } - (CPDictionary)infoDictionary @@ -148,7 +148,7 @@ var platform = [self firstEligiblePlatform]; if (!platform) - throw "Engine not supported."; + throw "Engine not supported for " + [self bundlePath] + ". Supported engines: " + [self objectForInfoDictionaryKey:"CPBundlePlatforms"] + "."; [CPURLConnection connectionWithRequest:[CPURLRequest requestWithURL:[self bundlePath] + '/' + platform + ".platform/" + [self objectForInfoDictionaryKey:"CPBundleExecutable"]] delegate:self]; } diff --git a/Objective-J/Jakefile b/Objective-J/Jakefile index d0ffe60d6..1015d1890 100644 --- a/Objective-J/Jakefile +++ b/Objective-J/Jakefile @@ -16,11 +16,10 @@ $LICENSE_FILE = FILE.join("CommonJS", "objective-j", "lib-js", "object $BROWSER_FILE = FILE.join($PRODUCT, 'Objective-J.js') $RHINO_FILE = FILE.join($PRODUCT, 'CommonJS.platform', 'Objective-J.js') -Files = ["Runtime/constants.js", "Runtime/utilities.js", "Runtime/json2.js", "Runtime/runtime.js", "Runtime/dictionary.js", "Runtime/plist.js", "Runtime/file.js", "Runtime/exception.js", "Runtime/preprocess.js", "Runtime/evaluate.js", "Runtime/bootstrap.js"]; -//Files = new FileList("constants.js", "utilities.js", "json2.js", "runtime.js", "dictionary.js", "plist.js", "file.js", "exception.js", "preprocess.js", "evaluate.js", "bootstrap.js"); +Files = new FileList("Runtime/constants.js", "Runtime/utilities.js", "Runtime/json2.js", "Runtime/runtime.js", "Runtime/dictionary.js", "Runtime/plist.js", "Runtime/file.js", "Runtime/exception.js", "Runtime/preprocess.js", "Runtime/evaluate.js", "Runtime/bootstrap.js"); if ($CONFIGURATION === "Debug") - Files.push("Runtime/debug.js")//Files.add('debug.js'); + Files.add("Runtime/debug.js"); task ("build", [$BROWSER_FILE, $RHINO_FILE, $LICENSE_PRODUCT, $COMMONJS_PRODUCT, $COMMONJS_FRAMEWORK_PRODUCT]);