Author: boisvert
Date: Mon Jun 2 14:29:46 2008
New Revision: 662577
URL: http://svn.apache.org/viewvc?rev=662577&view=rev
Log:
BUILDR-79: Remove :source Scala compiler option
Modified:
incubator/buildr/trunk/CHANGELOG
incubator/buildr/trunk/lib/buildr/java/compilers.rb
incubator/buildr/trunk/spec/scala_compilers_spec.rb
Modified: incubator/buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/CHANGELOG?rev=662577&r1=662576&r2=662577&view=diff
==============================================================================
--- incubator/buildr/trunk/CHANGELOG (original)
+++ incubator/buildr/trunk/CHANGELOG Mon Jun 2 14:29:46 2008
@@ -1,3 +1,6 @@
+1.3.2 (Pending)
+* BUILDR-79: Remove :source option for Scala compiler
+
1.3.1 (2008-05-19)
* Added: Downloading files from SFTP server, uploading to HTTP.
* Added: jibx_bind method to use JiBX for Java<=>XML binding (by David
Modified: incubator/buildr/trunk/lib/buildr/java/compilers.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/compilers.rb?rev=662577&r1=662576&r2=662577&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/compilers.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/compilers.rb Mon Jun 2 14:29:46 2008
@@ -100,7 +100,6 @@
# * :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.
# * :debug -- Generate debugging info.
# * :other -- Array of options to pass to the Scalac compiler as is,
e.g. -Xprint-types
@@ -119,7 +118,7 @@
end
end
- OPTIONS = [:warnings, :deprecation, :optimise, :source, :target, :debug,
:other]
+ OPTIONS = [:warnings, :deprecation, :optimise, :target, :debug, :other]
Java.classpath << dependencies unless Scalac.use_fsc
specify :language=>:scala, :target=>'classes', :target_ext=>'class',
:packaging=>:jar
@@ -167,7 +166,6 @@
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]
args + Array(options[:other])
end
Modified: incubator/buildr/trunk/spec/scala_compilers_spec.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/spec/scala_compilers_spec.rb?rev=662577&r1=662576&r2=662577&view=diff
==============================================================================
--- incubator/buildr/trunk/spec/scala_compilers_spec.rb (original)
+++ incubator/buildr/trunk/spec/scala_compilers_spec.rb Mon Jun 2 14:29:46 2008
@@ -177,21 +177,11 @@
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')
@@ -219,13 +209,12 @@
it 'should inherit options from parent' do
define 'foo' do
- compile.using(:warnings=>true, :debug=>true, :deprecation=>true,
:source=>'1.5', :target=>'1.4')
+ compile.using(:warnings=>true, :debug=>true, :deprecation=>true,
: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
