lib/java/xmlbeans.rb in buildr-0.16.0 vs lib/java/xmlbeans.rb in buildr-0.18.0

- old
+ new

@@ -7,31 +7,33 @@ def self.compile(*args) options = Hash === args.last ? args.pop : {} options[:verbose] ||= Rake.application.options.trace || false fu_check_options options, :verbose, :noop, :javasource, :jar, :classes, :output - # Classpath for XMLBeans. - cp = REQUIRES.map { |id| artifact(id) }.each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR) # Options for SchemaCompiler. cmd_args = [ options[:verbose] ? "-verbose" : "-quiet" ] cmd_args << "-javasource" << options[:javasource].collect.join(File::PATH_SEPARATOR) if options[:javasource] cmd_args << "-out" << options[:jar] if options[:jar] cmd_args << "-d" << options[:classes] if options[:classes] cmd_args << "-src" << options[:output] if options[:output] cmd_args += args cmd_args << { :verbose=>options[:verbose] } unless options[:noop] - verbose { puts "Running XMLBeans schema compiler" } + puts "Running XMLBeans schema compiler" if verbose mkpath options[:classes], :verbose=>false rescue nil if options[:classes] mkpath options[:output], :verbose=>false rescue nil if options[:output] - sh(Java.path_to_bin("java"), "-Xmx256m", "-cp", cp, + sh(Java.path_to_bin("java"), "-Xmx256m", "-cp", requires.join(File::PATH_SEPARATOR), "org.apache.xmlbeans.impl.tool.SchemaCompiler", *cmd_args) { |ok, res| fail "Failed to compile schemas, see errors above" unless ok } # Touch paths to let other tasks know there's an update. touch options[:classes], :verbose=>false if options[:classes] touch options[:output], :verbose=>false if options[:output] end + end + + def self.requires() + @requires ||= artifacts(REQUIRES).each { |artifact| artifact.invoke }.map(&:to_s) end class CompileTask < Rake::FileTask def initialize(*args)