Skip to content

Commit

Permalink
Changed Duby module to Mirah
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Tillman committed Jan 5, 2011
1 parent 1900ad3 commit 5ba0a17
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions lib/dubious_tasks.rb
Expand Up @@ -4,8 +4,8 @@
# sets mirah compile opts
# @param [Hash] opts
# @option opts [String] :dest_path
# @option opts [Array<String>] :source_paths
# @option opts [Array<String>] :compiler_options commandline style options
# @option opts [Array<String>] :source_paths
# @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]
Expand All @@ -19,25 +19,25 @@ def mirahc *files
else
options = {}
end
source_dir = options.fetch(:dir, Duby.source_path)
dest = File.expand_path(options.fetch(:dest, Duby.dest_path))
source_dir = options.fetch(:dir, Mirah.source_path)
dest = File.expand_path(options.fetch(:dest, Mirah.dest_path))
files = files.map {|f| f.sub(/^#{source_dir}\//, '')}
flags = options.fetch(:options, Duby.compiler_options)
flags = options.fetch(:options, Mirah.compiler_options)
args = ['-d', dest, *flags] + files
chdir(source_dir) do
cmd = "mirahc #{args.join ' '}"
puts cmd
if files.any? {|f|f.include? 'controllers'}
system cmd
else
Duby.compile(*args)
Duby.reset
Mirah.compile(*args)
Mirah.reset
end
end
end
end

SERVLET_JAR = File.join(AppEngine::SDK::SDK_ROOT, *%w{lib shared servlet-api.jar})
SERVLET_JAR = File.join(AppEngine::SDK::SDK_ROOT, *%w{lib shared servlet-api.jar})

unless $CLASSPATH.include? SERVLET_JAR
$CLASSPATH << SERVLET_JAR
Expand Down Expand Up @@ -79,7 +79,7 @@ def git_data(dir, file='')
model_data = git_data(File.dirname(MODEL_SRC_JAR),File.basename(MODEL_SRC_JAR))

prop_file = "config/build.properties"
File.open(prop_file, 'w') do |f|
File.open(prop_file, 'w') do |f|
f.write <<-EOF
# the current build environment
application.build.time=#{Time.now.xmlschema}
Expand Down

0 comments on commit 5ba0a17

Please sign in to comment.