Author: boisvert
Date: Sun Jan 27 15:07:49 2008
New Revision: 615673
URL: http://svn.apache.org/viewvc?rev=615673&view=rev
Log:
-Remove old scala plugin
-Revise scala compiler options (remove -lint, add -optimise, set defaults)
-Add specs tests for scala compiler
Added:
incubator/buildr/trunk/spec/scala_compilers.rb
Removed:
incubator/buildr/trunk/lib/buildr/scala.rb
Modified:
incubator/buildr/trunk/lib/java/compilers.rb
Modified: incubator/buildr/trunk/lib/java/compilers.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/java/compilers.rb?rev=615673&r1=615672&r2=615673&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/java/compilers.rb (original)
+++ incubator/buildr/trunk/lib/java/compilers.rb Sun Jan 27 15:07:49 2008
@@ -81,20 +81,23 @@
# Accepts the following options:
# * :warnings -- Generate warnings if true (opposite of -nowarn).
# * :deprecation -- Output source locations where deprecated APIs are used.
+ # * :optimise -- Generates faster bytecode by applying optimisations to
the program.
# * :source -- Source compatibility with specified release.
# * :target -- Class file compatibility with specified release.
- # * :lint -- Value to pass to xlint argument. Use true to enable
default lint
- # options, or pass a specific setting as string or array
of strings.
# * :debug -- Generate debugging info.
- # * :other -- Array of options to pass to the Scalac compiler as is.
+ # * :other -- Array of options to pass to the Scalac compiler as is,
e.g. -Xprint-types
class Scalac < Base
- OPTIONS = [:warnings, :deprecation, :source, :target, :lint, :debug,
:other]
+ OPTIONS = [:warnings, :deprecation, :optimise, :source, :target, :debug,
:other]
specify :language=>:scala, :target=>'classes', :target_ext=>'class',
:packaging=>:jar
def initialize(options) #:nodoc:
super
+ options[:debug] = Buildr.options.debug if options[:debug].nil?
+ options[:warnings] = verbose if options[:warnings].nil?
+ options[:deprecation] ||= false
+ options[:optimise] ||= false
end
def compile(sources, target, dependencies) #:nodoc:
@@ -132,13 +135,9 @@
args << "-verbose" if Rake.application.options.trace
args << "-g" if options[:debug]
args << "-deprecation" if options[:deprecation]
+ args << "-optimise" if options[:optimise]
args << "-source" << options[:source].to_s if options[:source]
args << "-target:jvm-" + options[:target].to_s if options[:target]
- case options[:lint]
- when Array then args << "-Xlint:#{options[:lint].join(',')}"
- when String then args << "-Xlint:#{options[:lint]}"
- when true then args << "-Xlint"
- end
args + Array(options[:other])
end
Added: incubator/buildr/trunk/spec/scala_compilers.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/scala_compilers.rb?rev=615673&view=auto
==============================================================================
--- incubator/buildr/trunk/spec/scala_compilers.rb (added)
+++ incubator/buildr/trunk/spec/scala_compilers.rb Sun Jan 27 15:07:49 2008
@@ -0,0 +1,199 @@
+require File.join(File.dirname(__FILE__), 'spec_helpers')
+
+
+describe 'scalac compiler' do
+ it 'should identify itself from source directories' do
+ write 'src/main/scala/com/example/Test.scala', 'package com.example; class
Test {}'
+ define('foo').compile.compiler.should eql(:scalac)
+ end
+
+ it 'should report the language as :scala' do
+ define('foo').compile.using(:scalac).language.should eql(:scala)
+ end
+
+ it 'should set the target directory to target/classes' do
+ define 'foo' do
+ lambda { compile.using(:scalac) }.should change { compile.target.to_s
}.to(File.expand_path('target/classes'))
+ end
+ end
+
+ it 'should not override existing target directory' do
+ define 'foo' do
+ compile.into('classes')
+ lambda { compile.using(:scalac) }.should_not change { compile.target }
+ end
+ end
+
+ it 'should not change existing list of sources' do
+ define 'foo' do
+ compile.from('sources')
+ lambda { compile.using(:scalac) }.should_not change { compile.sources }
+ end
+ end
+
+ it 'should include as classpath dependency' do
+ write 'src/dependency/Dependency.scala', 'class Dependency {}'
+ define 'dependency', :version=>'1.0' do
+ compile.from('src/dependency').into('target/dependency')
+ package(:jar)
+ end
+ write 'src/test/DependencyTest.scala', 'class DependencyTest { var d:
Dependency = _ }'
+ lambda {
define('foo').compile.from('src/test').with(project('dependency')).invoke
}.should run_task('foo:compile')
+ end
+end
+
+
+describe 'scalac compiler options' do
+ def compile_task
+ @compile_task ||= define('foo').compile.using(:scalac)
+ end
+
+ def scalac_args
+ Compiler::Scalac.new(compile_task.options).send(:scalac_args)
+ end
+
+ it 'should set warnings option to false by default' do
+ compile_task.options.warnings.should be_false
+ end
+
+ it 'should set wranings option to true when running with --verbose option' do
+ verbose true
+ compile_task.options.warnings.should be_true
+ end
+
+ it 'should use -nowarn argument when warnings is false' do
+ compile_task.using(:warnings=>false)
+ scalac_args.should include('-nowarn')
+ end
+
+ it 'should not use -nowarn argument when warnings is true' do
+ compile_task.using(:warnings=>true)
+ scalac_args.should_not include('-nowarn')
+ end
+
+ it 'should not use -verbose argument by default' do
+ scalac_args.should_not include('-verbose')
+ end
+
+ it 'should use -verbose argument when running with --trace option' do
+ trace true
+ scalac_args.should include('-verbose')
+ end
+
+ it 'should set debug option to true by default' do
+ compile_task.options.debug.should be_true
+ end
+
+ it 'should set debug option to false based on Buildr.options' do
+ Buildr.options.debug = false
+ compile_task.options.debug.should be_false
+ end
+
+ it 'should set debug option to false based on debug environment variable' do
+ ENV['debug'] = 'no'
+ compile_task.options.debug.should be_false
+ end
+
+ it 'should set debug option to false based on DEBUG environment variable' do
+ ENV['DEBUG'] = 'no'
+ compile_task.options.debug.should be_false
+ end
+
+ it 'should use -g argument when debug option is true' do
+ compile_task.using(:debug=>true)
+ scalac_args.should include('-g')
+ end
+
+ it 'should not use -g argument when debug option is false' do
+ compile_task.using(:debug=>false)
+ scalac_args.should_not include('-g')
+ end
+
+ it 'should set deprecation option to false by default' do
+ compile_task.options.deprecation.should be_false
+ end
+
+ it 'should use -deprecation argument when deprecation is true' do
+ compile_task.using(:deprecation=>true)
+ scalac_args.should include('-deprecation')
+ end
+
+ it 'should not use -deprecation argument when deprecation is false' do
+ compile_task.using(:deprecation=>false)
+ scalac_args.should_not include('-deprecation')
+ end
+
+ it 'should set optimise option to false by default' do
+ compile_task.options.optimise.should be_false
+ end
+
+ it 'should use -optimise argument when deprecation is true' do
+ compile_task.using(:optimise=>true)
+ scalac_args.should include('-optimise')
+ end
+
+ it 'should not use -optimise argument when deprecation is false' do
+ compile_task.using(:optimise=>false)
+ scalac_args.should_not include('-optimise')
+ end
+
+ it 'should not set source option by default' do
+ compile_task.options.source.should be_nil
+ scalac_args.should_not include('-source')
+ end
+
+ it 'should not set target option by default' do
+ compile_task.options.target.should be_nil
+ scalac_args.should_not include('-target')
+ end
+
+ it 'should use -source nn argument if source option set' do
+ compile_task.using(:source=>'1.5')
+ scalac_args.should include('-source', '1.5')
+ end
+
+ it 'should use -target:xxx argument if target option set' do
+ compile_task.using(:target=>'1.5')
+ scalac_args.should include('-target:jvm-1.5')
+ end
+
+ it 'should not set other option by default' do
+ compile_task.options.other.should be_nil
+ end
+
+ it 'should pass other argument if other option is string' do
+ compile_task.using(:other=>'-unchecked')
+ scalac_args.should include('-unchecked')
+ end
+
+ it 'should pass other argument if other option is array' do
+ compile_task.using(:other=>['-unchecked', '-Xprint-types'])
+ scalac_args.should include('-unchecked', '-Xprint-types')
+ end
+
+ it 'should complain about options it doesn\'t know' do
+ write 'source/Test.scala', 'class Test {}'
+ compile_task.using(:unknown=>'option')
+ lambda { compile_task.from('source').invoke }.should
raise_error(ArgumentError, /no such option/i)
+ end
+
+ it 'should inherit options from parent' do
+ define 'foo' do
+ compile.using(:warnings=>true, :debug=>true, :deprecation=>true,
:source=>'1.5', :target=>'1.4')
+ define 'bar' do
+ compile.using(:scalac)
+ compile.options.warnings.should be_true
+ compile.options.debug.should be_true
+ compile.options.deprecation.should be_true
+ compile.options.source.should eql('1.5')
+ compile.options.target.should eql('1.4')
+ end
+ end
+ end
+
+ after do
+ Buildr.options.debug = nil
+ ENV.delete "debug"
+ ENV.delete "DEBUG"
+ end
+end
