From 7864a9fa8e3699ce823657ea9d81321157091133 Mon Sep 17 00:00:00 2001 From: Francisco Ryan Tolmasky I Date: Thu, 8 Oct 2009 14:59:10 -0400 Subject: [PATCH] Updates to fix building. Reviewed by me. --- .../objective-j/lib-js/objective-j/compiler.js | 15 +++++++++++++-- common.jake | 9 +++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Objective-J/CommonJS/objective-j/lib-js/objective-j/compiler.js b/Objective-J/CommonJS/objective-j/lib-js/objective-j/compiler.js index 6da90ad60..b9d371630 100644 --- a/Objective-J/CommonJS/objective-j/lib-js/objective-j/compiler.js +++ b/Objective-J/CommonJS/objective-j/lib-js/objective-j/compiler.js @@ -26,13 +26,24 @@ function compress(/*String*/ aCode, /*String*/ FIXME) { // FIXME: figure out why this doesn't work on Windows/Cygwin //var tmpFile = java.io.File.createTempFile("OBJJC", ""); - var tmpFile = new java.io.File("/tmp/" + FIXME + Math.random() + ".tmp"); + /*var tmpFile = new java.io.File("/tmp/" + FIXME + Math.random() + ".tmp"); tmpFile.deleteOnExit(); tmpFile = tmpFile.getAbsolutePath(); + */ + + var tmpFile = FILE.join("/tmp", FIXME + Math.random() + ".tmp"); FILE.write(tmpFile, aCode, { charset:"UTF-8" }); - return OS.command(["java", "-Dfile.encoding=UTF-8", "-classpath", [RHINO_PATH, SHRINKSAFE_PATH].join(":"), "org.dojotoolkit.shrinksafe.Main", tmpFile]); + var shrinksafe = OS.popen("java -Dfile.encoding=UTF-8 -classpath " + RHINO_PATH + ":" + SHRINKSAFE_PATH + " org.dojotoolkit.shrinksafe.Main " + tmpFile), + output = "", + chunk = ""; + + while (chunk = shrinksafe.stdout.read()) + output += chunk; + + return output; +// return OS.command(["java", "-Dfile.encoding=UTF-8", "-classpath", [RHINO_PATH, SHRINKSAFE_PATH].join(":"), "org.dojotoolkit.shrinksafe.Main", tmpFile]); } function compileWithResolvedFlags(aFilePath, objjcFlags, gccFlags) diff --git a/common.jake b/common.jake index e0834d990..ca5abd690 100644 --- a/common.jake +++ b/common.jake @@ -91,8 +91,13 @@ global.rm_rf = function(/*String*/ aFilename) global.cp_r = function(/*String*/ from, /*String*/ to) { - rm_rf(to); - FILE.copyTree(from, to); + if (FILE.exists(to)) + rm_rf(to); + + if (FILE.isDirectory(from)) + FILE.copyTree(from, to); + else + FILE.copy(from, to); } global.cp = function(/*String*/ from, /*String*/ to)