Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fix compilation on mirah 0.0.5

  • Loading branch information...
commit 4e12aa3792727727f269f6948f8059011b97dcc7 1 parent 32feb42
@baroquebobcat baroquebobcat authored
Showing with 7 additions and 5 deletions.
  1. +6 −4 Rakefile
  2. +1 −1  lib/dubious_tasks.rb
View
10 Rakefile
@@ -40,9 +40,11 @@ LIB_SRC = LIB_MIRAH_SRC + LIB_JAVA_SRC
LIB_CLASSES = class_files_for LIB_SRC
STDLIB_CLASSES= LIB_CLASSES.select{|l|l.include? 'stdlib'}
-mirah_compile_options :compiler_options => ['--classpath', [OUTDIR+'/', SERVLET_JAR,*FileList["lib/*.jar", "javalib/*.jar"].map{|f|File.expand_path(f)}].join(':')],
- :dest_path => OUTDIR,
- :source_paths => SRCDIR
+task :set_compile_options do
+ mirah_compile_options :compiler_options => ['--classpath', [OUTDIR+'/', SERVLET_JAR,*FileList["lib/*.jar", "javalib/*.jar"].map{|f|File.expand_path(f)}].join(':')],
+ :dest_path => OUTDIR,
+ :source_paths => SRCDIR
+end
file "#{OUTDIR}/dubious/Inflection.class" => :'compile:java'
file "#{OUTDIR}/dubious/ScopedParameterMap.class" => :'compile:java'
@@ -104,7 +106,7 @@ end
directory OUTDIR
(LIB_CLASSES).zip(LIB_SRC).each do |klass,src|
- file klass => [:dependencies, src]
+ file klass => [:dependencies, :set_compile_options, src]
end
task :generate_build_properties do
View
2  lib/dubious_tasks.rb
@@ -148,7 +148,7 @@ def appengine_app(name,src,hash={}, &block)
# @option opts [Array<String>] :compiler_options commandline style options
def mirah_compile_options opts
Mirah.dest_paths << opts[:dest_path]
- Mirah.source_paths.push *opts[:source_paths]
+ Mirah.source_paths.unshift *opts[:source_paths]
Mirah.compiler_options.push *opts[:compiler_options]
end
Please sign in to comment.
Something went wrong with that request. Please try again.