You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by bo...@apache.org on 2009/10/11 02:27:48 UTC
svn commit: r823987 - in /buildr/trunk: CHANGELOG
lib/buildr/ide/eclipse/java.rb lib/buildr/ide/eclipse/plugin.rb
spec/ide/eclipse_spec.rb
Author: boisvert
Date: Sun Oct 11 00:27:47 2009
New Revision: 823987
URL: http://svn.apache.org/viewvc?rev=823987&view=rev
Log:
BUILDR-327 Specifying :plugin eclipse nature explicitly fails
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/ide/eclipse/java.rb
buildr/trunk/lib/buildr/ide/eclipse/plugin.rb
buildr/trunk/spec/ide/eclipse_spec.rb
Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=823987&r1=823986&r2=823987&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Sun Oct 11 00:27:47 2009
@@ -1,4 +1,5 @@
1.4.0 (Pending)
+* Fixed: BUILDR-327 Specifying :plugin eclipse nature explicitly fails
1.3.5 (2009-10-05)
* Added: Interactive shell (REPL) support
Modified: buildr/trunk/lib/buildr/ide/eclipse/java.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/eclipse/java.rb?rev=823987&r1=823986&r2=823987&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/eclipse/java.rb (original)
+++ buildr/trunk/lib/buildr/ide/eclipse/java.rb Sun Oct 11 00:27:47 2009
@@ -38,9 +38,9 @@
# :java nature explicitly set
if eclipse.natures.include? :java
- eclipse.natures += NATURE unless eclipse.natures.include? NATURE
- eclipse.classpath_containers += CONTAINER unless eclipse.classpath_containers.include? CONTAINER
- eclipse.builders += BUILDER unless eclipse.builders.include? BUILDER
+ eclipse.natures += [NATURE] unless eclipse.natures.include? NATURE
+ eclipse.classpath_containers += [CONTAINER] unless eclipse.classpath_containers.include? CONTAINER
+ eclipse.builders += [BUILDER] unless eclipse.builders.include? BUILDER
end
end
Modified: buildr/trunk/lib/buildr/ide/eclipse/plugin.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/eclipse/plugin.rb?rev=823987&r1=823986&r2=823987&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/eclipse/plugin.rb (original)
+++ buildr/trunk/lib/buildr/ide/eclipse/plugin.rb Sun Oct 11 00:27:47 2009
@@ -49,12 +49,12 @@
index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::CONTAINER) || -1
eclipse.classpath_containers = eclipse.classpath_containers.insert(index, CONTAINER)
end
- unless (eclipse.builders.include?(BUILDER[0]) && eclipse.builders.include?(BUILDER[1]))
+ unless (eclipse.builders.include?(BUILDERS[0]) && eclipse.builders.include?(BUILDERS[1]))
# plugin builder must be before java builder
index = eclipse.classpath_containers.index(Buildr::Eclipse::Java::BUILDER) || -1
- eclipse.builders = eclipse.builders.insert(index, BUILDER[1]) unless eclipse.builders.include? BUILDER[1]
- index = eclipse.classpath_containers.index(BUILDER[1]) || -1
- eclipse.builders = eclipse.builders.insert(index, BUILDER[0]) unless eclipse.builders.include? BUILDER[0]
+ eclipse.builders = eclipse.builders.insert(index, BUILDERS[1]) unless eclipse.builders.include? BUILDERS[1]
+ index = eclipse.classpath_containers.index(BUILDERS[1]) || -1
+ eclipse.builders = eclipse.builders.insert(index, BUILDERS[0]) unless eclipse.builders.include? BUILDERS[0]
end
end
end
Modified: buildr/trunk/spec/ide/eclipse_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/ide/eclipse_spec.rb?rev=823987&r1=823986&r2=823987&view=diff
==============================================================================
--- buildr/trunk/spec/ide/eclipse_spec.rb (original)
+++ buildr/trunk/spec/ide/eclipse_spec.rb Sun Oct 11 00:27:47 2009
@@ -201,6 +201,33 @@
build_commands.should include(JAVA_BUILDER)
end
end
+
+ describe 'Non standard Plugin project' do
+
+ before do
+ write 'buildfile'
+ write 'src/main/java/Activator.java'
+ write 'plugin.xml'
+ end
+
+ it 'should have plugin nature before Java nature' do
+ define('foo') do
+ eclipse.natures = [:java, :plugin]
+ end
+ project_natures.should include(PLUGIN_NATURE)
+ project_natures.should include(JAVA_NATURE)
+ project_natures.index(PLUGIN_NATURE).should < project_natures.index(JAVA_NATURE)
+ end
+
+ it 'should have plugin build commands and the Java build command' do
+ define('foo') do
+ eclipse.natures = [:java, :plugin]
+ end
+ build_commands.should include(PLUGIN_BUILDERS[0])
+ build_commands.should include(PLUGIN_BUILDERS[1])
+ build_commands.should include(JAVA_BUILDER)
+ end
+ end
end
describe "eclipse's .classpath file" do