@@ -1,3 +1,4 @@ .DS_Store *.sw* -*.gem \ No newline at end of file +*.gem +extras \ No newline at end of file .gitignore @@ -190,7 +190,9 @@ module Processing # If you'd like to do something fancy, feel free. def set_sketch_path(path=nil) field = self.java_class.declared_field('sketchPath') - field.set_value(Java.ruby_to_java(self), path || File.dirname(SKETCH_PATH)) + local = File.dirname(SKETCH_PATH) + default = $__windows_app_mode__ ? "#{local}/lib" : local + field.set_value(Java.ruby_to_java(self), path || default) end lib/ruby-processing/app.rb @@ -63,9 +63,9 @@ module Processing libs = [] code = source.dup loop do - matchdata = code.match(/load_\w+_library.+?["':](\S+?)["'\s]/) + matchdata = code.match(/load\w+librar(y|ies).+?["':](\S+?)["'\s]/) break unless matchdata - match = matchdata[1] + match = matchdata[2] @opengl = true if match.match(/opengl/i) local_path = "#{local_dir}/library/#{match}" rp5_path = "#{RP5_ROOT}/library/#{match}" lib/ruby-processing/exporters/base_exporter.rb @@ -117,13 +117,22 @@ module Processing # Trade in this Ruby instance for a JRuby instance, loading in a # starter script and passing it some arguments. - def spin_up(starter_script, args) + def spin_up(starter_script, sketch) runner = "#{RP5_ROOT}/lib/ruby-processing/runners/#{starter_script}" - command = "java -cp #{jruby_complete} #{dock_icon} org.jruby.Main #{runner} #{args}" + java_args = discover_java_args(sketch) + command = "java #{java_args} -cp #{jruby_complete} #{dock_icon} org.jruby.Main #{runner} #{sketch}" exec(command) # exec replaces the Ruby process with the JRuby one. end + # If you need to pass in arguments to Java, such as the ones on this page: + # http://java.sun.com/j2se/1.4.2/docs/tooldocs/windows/java.html + # then type them into a java_args.txt in your data directory next to your sketch. + def discover_java_args(sketch) + arg_file = "#{File.dirname(sketch)}/data/java_args.txt" + File.exists?(arg_file) ? File.read(arg_file).gsub("\n", " ") : '' + end + def ensure_exists(sketch) puts "Couldn't find: #{sketch}" and exit unless File.exists?(sketch) end lib/ruby-processing/runner.rb @@ -1,5 +1,10 @@ # Windows apps start life in the wrong folder. -ARGV[1] = nil and Dir.chdir('lib') if ARGV[1] == '--windows-app' +# TODO: Fix this crud as soon as possible. +if ARGV[1] == '--windows-app' + ARGV[1] = nil + Dir.chdir('lib') + $__windows_app_mode__ = true +end require "#{File.dirname(__FILE__)}/base.rb" require Processing::SKETCH_PATH \ No newline at end of file lib/ruby-processing/runners/run.rb d42ff1174c5150e03f578279dbc8677a8cece78c Jeremy Ashkenas jashkenas@gmail.com http://github.com/jashkenas/ruby-processing/commit/e81457d3828dda6476117fcf270d0c5a5687201e e81457d3828dda6476117fcf270d0c5a5687201e 2009-01-19T21:04:50-08:00 2009-01-19T21:04:50-08:00 Fixing application exporting inconsistencies on windows and library loading in exported applications and adding a hidden java_args.txt option 4d2f36a87632ce3850f28a3eeba33fa97ddc9a4e Jeremy Ashkenas jashkenas@gmail.com