External/Rakefile Objective-J/Tools/objj/bin/objj Objective-J/Tools/objj/bin/objjc Objective-J/Tools/objj/bin/plutil Objective-J/Tools/objj/lib/objj/objj.js Objective-J/Tools/objj/lib/objj/objjc.js Objective-J/Tools/objj/package.json Objective-J/Tools/shrinksafe.jar @@ -5,7 +5,6 @@ @import <AppKit/CPTheme.j> @import <BlendKit/BlendKit.j> -importClass(java.io.File); importClass(java.io.FileOutputStream); importClass(java.io.BufferedWriter); importClass(java.io.OutputStreamWriter); @@ -14,7 +13,7 @@ importClass(java.io.OutputStreamWriter); function main() { var index = 0, - count = arguments.length, + count = system.args.length, outputFilePath = "", descriptorFiles = [], @@ -23,22 +22,22 @@ function main() for (; index < count; ++index) { - var argument = arguments[index]; + var argument = system.args[index]; switch (argument) { case "-c": - case "--cib": cibFiles.push(arguments[++index]); + case "--cib": cibFiles.push(system.args[++index]); break; case "-d": - case "-descriptor": descriptorFiles.push(arguments[++index]); + case "-descriptor": descriptorFiles.push(system.args[++index]); break; - case "-o": outputFilePath = arguments[++index]; + case "-o": outputFilePath = system.args[++index]; break; - case "-R": resourcesPath = arguments[++index]; + case "-R": resourcesPath = system.args[++index]; break; default: jExtensionIndex = argument.indexOf(".j"); @@ -67,7 +66,7 @@ function main() var objectTemplates = BKThemeObjectTemplatesForClass(theClass); data = cibDataFromTopLevelObjects(objectTemplates.concat([themeTemplate])), - temporaryCibFile = File.createTempFile("temp", ".cib"), + temporaryCibFile = Packages.java.io.File.createTempFile("temp", ".cib"), temporaryCibFilePath = temporaryCibFile.getAbsolutePath(), writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(temporaryCibFilePath), "UTF-8")); @@ -116,7 +115,7 @@ function buildBlendFromCibFiles(cibFiles, outputFilePath, resourcesPath) var resourcesFile = nil; if (resourcesPath) - resourcesFile = new File(resourcesPath); + resourcesFile = new Packages.java.io.File(resourcesPath); var count = cibFiles.length, replacedFiles = [], @@ -124,7 +123,7 @@ function buildBlendFromCibFiles(cibFiles, outputFilePath, resourcesPath) while (count--) { - var theme = themeFromCibFile(new File(cibFiles[count])), + var theme = themeFromCibFile(new Packages.java.io.File(cibFiles[count])), // Archive our theme. filePath = [theme name] + ".keyedtheme", @@ -145,7 +144,7 @@ function buildBlendFromCibFiles(cibFiles, outputFilePath, resourcesPath) [infoDictionary setObject:replacedFiles forKey:@"CPBundleReplacedFiles"]; [infoDictionary setObject:staticContentName forKey:@"CPBundleExecutable"]; - var outputFile = new File(outputFilePath).getCanonicalFile(); + var outputFile = new Packages.java.io.File(outputFilePath).getCanonicalFile(); outputFile.mkdirs(); @@ -162,7 +161,7 @@ function buildBlendFromCibFiles(cibFiles, outputFilePath, resourcesPath) writer.close(); if (resourcesPath) - rsync(new File(resourcesPath), new File(outputFilePath)); + rsync(new Packages.java.io.File(resourcesPath), new Packages.java.io.File(outputFilePath)); } function themeFromCibFile(aFile) AppKit/Tools/blend/main.j @@ -1,13 +1,35 @@ #!/usr/bin/env ruby -require 'rake' require '../../common' +require 'objective-j' +require 'rake' +require 'rake/clean' + +$ENVIRONMENT_NARWHAL_PRODUCT = File.join($ENVIRONMENT_DIR, 'narwhal') +$ENVIRONMENT_OBJJ_PRODUCT = File.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages', 'objj') +$OBJJC_JS_COMPILER = File.join($ENVIRONMENT_LIB_DIR, 'shrinksafe.jar') -subprojects = %w{cplutil objj objjc} +$EXECUTABLES = ['objj', 'objjc', 'plutil'] +$EXECUTABLES_PRODUCTS = $EXECUTABLES.map {|e| File.join($ENVIRONMENT_BIN_DIR, e) } + +file_d $ENVIRONMENT_OBJJ_PRODUCT do + cp_r('objj', $ENVIRONMENT_OBJJ_PRODUCT) +end -%w(build clean clobber).each do |task_name| - task task_name do - subrake(subprojects, task_name) +$EXECUTABLES.each do |executable| + source = File.join('objj', 'bin', executable) + dest = File.join($ENVIRONMENT_BIN_DIR, executable) + file_d dest => source do + #cp(source, dest) + FileUtils.ln_s("../narwhal/packages/objj/bin/#{executable}", dest) end end + +file_d $OBJJC_JS_COMPILER => 'shrinksafe.jar' do + cp('shrinksafe.jar', $OBJJC_JS_COMPILER) +end + +task :build => [$ENVIRONMENT_OBJJ_PRODUCT, $OBJJC_JS_COMPILER].concat($EXECUTABLES_PRODUCTS) + +CLOBBER.include($ENVIRONMENT_OBJJ_PRODUCT, $EXECUTABLES_PRODUCTS, $OBJJC_JS_COMPILER) Objective-J/Tools/Rakefile @@ -158,8 +158,8 @@ function fragment_evaluate_code(aFragment) try { #if RHINO - //compiled = eval("function(){"+GET_CODE(aFragment)+"}"); - compiled = Packages.org.mozilla.javascript.Context.getCurrentContext().compileFunction(window, "function(){"+GET_CODE(aFragment)+"}", GET_FILE(aFragment).path, 0, null); + compiled = eval("function(){"+GET_CODE(aFragment)+"}"); + //compiled = Packages.org.mozilla.javascript.Context.getCurrentContext().compileFunction(window, "function(){"+GET_CODE(aFragment)+"}", GET_FILE(aFragment).path, 0, null); #else compiled = new Function(GET_CODE(aFragment)); compiled.displayName = GET_FILE(aFragment).path; Objective-J/evaluate.js @@ -279,10 +279,6 @@ function CPPropertyListCreateFromXMLData(XMLNodeOrData) if (XMLNode.string) { -#if RHINO - XMLNode = DOCUMENT_ELEMENT(_documentBuilder.parse( - new Packages.org.xml.sax.InputSource(new Packages.java.io.StringReader(XMLNode.string)))); -#else if (window.ActiveXObject) { XMLNode = new ActiveXObject("Microsoft.XMLDOM"); @@ -290,7 +286,6 @@ function CPPropertyListCreateFromXMLData(XMLNodeOrData) } else XMLNode = DOCUMENT_ELEMENT(new DOMParser().parseFromString(XMLNodeOrData.string, "text/xml")); -#endif } // Skip over DOCTYPE and so forth. Objective-J/plist.js @@ -5,7 +5,7 @@ require 'rake' require 'rake/clean' -subprojects = %w{Objective-J Foundation AppKit Tools} +subprojects = %w{External Objective-J Foundation AppKit Tools External/ojunit} %w(build clean clobber).each do |task_name| task task_name do @@ -82,6 +82,8 @@ task :test => [:build] do puts "tests failed, aborting the build" puts build_result rake abort + else + puts build_result end end Rakefile @@ -3,8 +3,7 @@ require 'rake' require '../common' - -subprojects = %w{bake capp nib2cib press ojunit} +subprojects = %w{capp bake nib2cib press} %w(build clean clobber).each do |task_name| task task_name do Tools/Rakefile @@ -1,6 +1,3 @@ - -importClass(java.lang.System); -importClass(java.io.File); importClass(java.io.FileWriter); importClass(java.io.FileOutputStream); importClass(java.io.BufferedWriter); @@ -10,11 +7,11 @@ importClass(java.io.OutputStreamWriter); function main() { - if (arguments.length < 1) + if (system.args.length < 1) return printUsage(); var index = 0, - count = arguments.length, + count = system.args.length, shouldSymbolicallyLink = false, justFrameworks = false, @@ -24,9 +21,9 @@ function main() for (; index < count; ++index) { - var argument = arguments[index]; + var argument = system.args[index]; - switch (arguments[index]) + switch (system.args[index]) { case "-l": shouldSymbolicallyLink = true; break; @@ -36,7 +33,7 @@ function main() return; case "-t": - case "--template": template = arguments[++index]; + case "--template": template = system.args[++index]; break; case "-f": @@ -47,8 +44,8 @@ function main() } } - var sourceTemplate = new File(OBJJ_HOME + "/lib/capp/Resources/Templates/" + template), - destinationProject = new File(destination); + var sourceTemplate = new java.io.File(OBJJ_HOME + "/lib/capp/Resources/Templates/" + template), + destinationProject = new java.io.File(destination); if (!destinationProject.exists()) { @@ -79,43 +76,43 @@ function main() function createFrameworksInFile(/*File*/ aFile, /*Boolean*/ shouldSymbolicallyLink) { - var destinationFrameworks = new File(aFile.getCanonicalPath()+ "/Frameworks"), - destinationDebugFrameworks = new File(aFile.getCanonicalPath() + "/Frameworks/Debug"); + var destinationFrameworks = new java.io.File(aFile.getCanonicalPath()+ "/Frameworks"), + destinationDebugFrameworks = new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Debug"); if (!shouldSymbolicallyLink) { - var sourceFrameworks = new File(OBJJ_HOME + "/lib/Frameworks"); + var sourceFrameworks = new java.io.File(OBJJ_HOME + "/lib/Frameworks"); exec(["cp", "-vR", sourceFrameworks.getCanonicalPath(), destinationFrameworks.getCanonicalPath()], true); return true; } - var STEAM_BUILD = System.getenv("STEAM_BUILD"); + var STEAM_BUILD = system.env("STEAM_BUILD"); // Release Frameworks - new File(destinationFrameworks).mkdir(); + new java.io.File(destinationFrameworks).mkdir(); - exec(["ln", "-s", new File(STEAM_BUILD + "/Release/Objective-J").getCanonicalPath(), - new File(aFile.getCanonicalPath() + "/Frameworks/Objective-J").getCanonicalPath()], true); + exec(["ln", "-s", new java.io.File(STEAM_BUILD + "/Release/Objective-J").getCanonicalPath(), + new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Objective-J").getCanonicalPath()], true); - exec(["ln", "-s", new File(STEAM_BUILD + "/Release/Foundation").getCanonicalPath(), - new File(aFile.getCanonicalPath() + "/Frameworks/Foundation").getCanonicalPath()], true); + exec(["ln", "-s", new java.io.File(STEAM_BUILD + "/Release/Foundation").getCanonicalPath(), + new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Foundation").getCanonicalPath()], true); - exec(["ln", "-s", new File(STEAM_BUILD + "/Release/AppKit").getCanonicalPath(), - new File(aFile.getCanonicalPath() + "/Frameworks/AppKit").getCanonicalPath()], true); + exec(["ln", "-s", new java.io.File(STEAM_BUILD + "/Release/AppKit").getCanonicalPath(), + new java.io.File(aFile.getCanonicalPath() + "/Frameworks/AppKit").getCanonicalPath()], true); // Debug Frameworks - new File(destinationDebugFrameworks).mkdir(); + new java.io.File(destinationDebugFrameworks).mkdir(); - exec(["ln", "-s", new File(STEAM_BUILD + "/Debug/Objective-J").getCanonicalPath(), - new File(aFile.getCanonicalPath() + "/Frameworks/Debug/Objective-J").getCanonicalPath()], true); + exec(["ln", "-s", new java.io.File(STEAM_BUILD + "/Debug/Objective-J").getCanonicalPath(), + new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Debug/Objective-J").getCanonicalPath()], true); - exec(["ln", "-s", new File(STEAM_BUILD + "/Debug/Foundation").getCanonicalPath(), - new File(aFile.getCanonicalPath() + "/Frameworks/Debug/Foundation").getCanonicalPath()], true); + exec(["ln", "-s", new java.io.File(STEAM_BUILD + "/Debug/Foundation").getCanonicalPath(), + new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Debug/Foundation").getCanonicalPath()], true); - exec(["ln", "-s", new File(STEAM_BUILD + "/Debug/AppKit").getCanonicalPath(), - new File(aFile.getCanonicalPath() + "/Frameworks/Debug/AppKit").getCanonicalPath()], true); + exec(["ln", "-s", new java.io.File(STEAM_BUILD + "/Debug/AppKit").getCanonicalPath(), + new java.io.File(aFile.getCanonicalPath() + "/Frameworks/Debug/AppKit").getCanonicalPath()], true); } function printUsage() @@ -136,3 +133,84 @@ function writeContentsToFile(/*String*/ aString, /*File*/ aFile) writer.close(); } + +function exec(/*Array*/ command, /*Boolean*/ showOutput) +{ + var line = "", + output = "", + + process = Packages.java.lang.Runtime.getRuntime().exec(command),//jsArrayToJavaArray(command)); + reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(process.getInputStream())); + + while (line = reader.readLine()) + { + if (showOutput) + Packages.java.lang.System.out.println(line); + + output += line + '\n'; + } + + reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(process.getErrorStream())); + + while (line = reader.readLine()) + Packages.java.lang.System.out.println(line); + + try + { + if (process.waitFor() != 0) + Packages.java.lang.System.err.println("exit value = " + process.exitValue()); + } + catch (anException) + { + Packages.java.lang.System.err.println(anException); + } + + return output; +} + +function getFiles(/*File*/ sourceDirectory, /*nil|String|Array<String>*/ extensions, /*Array*/ exclusions) +{ + var matches = [], + files = sourceDirectory.listFiles(), + hasMultipleExtensions = typeof extensions !== "string"; + + if (files) + { + var index = 0, + count = files.length; + + for (; index < count; ++index) + { + var file = files[index].getCanonicalFile(), + name = String(file.getName()), + isValidExtension = !extensions; + + if (exclusions && fileArrayContainsFile(exclusions, file)) + continue; + + if (!isValidExtension) + if (hasMultipleExtensions) + { + var extensionCount = extensions.length; + + while (extensionCount-- && !isValidExtension) + { + var extension = extensions[extensionCount]; + + if (name.substring(name.length - extension.length - 1) === ("." + extension)) + isValidExtension = true; + } + } + else if (name.substring(name.length - extensions.length - 1) === ("." + extensions)) + isValidExtension = true; + + if (isValidExtension) + matches.push(file); + + if (file.isDirectory()) + matches = matches.concat(getFiles(file, extensions, exclusions)); + } + } + + return matches; +} Tools/capp/main.j @@ -36,7 +36,7 @@ CPLogRegister(CPLogPrint); function exec(command) { - var p = Packages.java.lang.Runtime.getRuntime().exec(jsArrayToJavaArray(command)); + var p = Packages.java.lang.Runtime.getRuntime().exec(command); var result = p.waitFor(); var reader = new Packages.java.io.BufferedReader(new Packages.java.io.InputStreamReader(p.getInputStream())); Tools/nib2cib/main.j @@ -77,40 +77,14 @@ end def subrake(directories, task_name) directories.each do |directory| if (File.directory?(directory) && File.file?(File.join(directory, "Rakefile"))) - system %{cd #{directory} && #{$serialized_env} #{$0} #{task_name}} + ok = system(%{cd #{directory} && #{$serialized_env} #{$0} #{task_name}}) + rake abort unless ok else puts "warning: subrake missing: " + directory +" (this is not necessarily an error, "+directory+" may be optional)" end end end -# Shared Resrouces in env -$JSJAR_PATH = File.expand_path(File.join($HOME_DIR, 'Tools/Utilities/js.jar')) -$ENVIRONMENT_JS = File.join($ENVIRONMENT_LIB_DIR, 'js.jar') - -file_d $ENVIRONMENT_JS do - cp($JSJAR_PATH, $ENVIRONMENT_JS) -end - -def js2java(inputfile, className, debug) - - debugString = '-nosource -debug' if debug - - IO.popen("java -classpath #{$JSJAR_PATH}:. #{debugString} org.mozilla.javascript.tools.jsc.Main -o #{className} #{inputfile}") do |shrinksafe| - puts shrinksafe.read - end -end - -def cat(files, outfile) - - File.open(outfile, "w") do |concated| - - files.each do |file| - concated.write IO.read(file) - end - end -end - def executable_exists?(name) ENV["PATH"].split(":").any? {|p| File.executable? File.join(p, name) } end @@ -122,7 +96,7 @@ def make_objj_executable(path) File.chmod 0755, path end -task :build => [$ENVIRONMENT_JS] +task :build task :default => [:build] task :release do common.rb Objective-J/Tools/cplutil/Rakefile Objective-J/Tools/cplutil/main.js Objective-J/Tools/executable Objective-J/Tools/objj/Rakefile Objective-J/Tools/objj/main.js Objective-J/Tools/objjc/Rakefile Objective-J/Tools/objjc/main.js Objective-J/Tools/objjc/shrinksafe.jar b31abab59501ed182ccc9d851c4d280bf8877a9a tlrobinson tom@280north.com http://github.com/280north/cappuccino/commit/6e11a66cb090c3c08031ddae74840fe88ee5e391 6e11a66cb090c3c08031ddae74840fe88ee5e391 2009-05-10T03:35:31-07:00 2009-05-10T03:35:31-07:00 Updated all Rakefiles and tools to work with Narwhal a24889ca2d90aa33e581a17f822c8f68b1812764 tlrobinson tom@280north.com