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/08/05 07:36:30 UTC
svn commit: r801065 - in /buildr/trunk: lib/buildr/ide/eclipse.rb
spec/ide/eclipse_spec.rb
Author: boisvert
Date: Wed Aug 5 05:36:29 2009
New Revision: 801065
URL: http://svn.apache.org/viewvc?rev=801065&view=rev
Log:
Fix double include of Eclipse module
Modified:
buildr/trunk/lib/buildr/ide/eclipse.rb
buildr/trunk/spec/ide/eclipse_spec.rb
Modified: buildr/trunk/lib/buildr/ide/eclipse.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/ide/eclipse.rb?rev=801065&r1=801064&r2=801065&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/ide/eclipse.rb (original)
+++ buildr/trunk/lib/buildr/ide/eclipse.rb Wed Aug 5 05:36:29 2009
@@ -20,13 +20,12 @@
module Buildr
module Eclipse #:nodoc:
-
include Extension
def eclipse
- Eclipse.instance
+ Eclipse.instance
end
-
+
class Eclipse
include Singleton
@@ -48,7 +47,7 @@
first_time do
# Global task "eclipse" generates artifacts for all projects.
desc 'Generate Eclipse artifacts for all projects'
- Project.local_task 'eclipse'=>'artifacts'
+ Project.local_task('eclipse'=>'artifacts') { |name| "Generating Eclipse project for #{name}" }
end
before_define do |project|
@@ -145,6 +144,7 @@
end
+
# Writes 'classpathentry' tags in an xml file.
# It converts tasks to paths.
# It converts absolute paths to relative paths.
@@ -237,8 +237,6 @@
end
- include Eclipse
-
end # module Buildr
Modified: buildr/trunk/spec/ide/eclipse_spec.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/spec/ide/eclipse_spec.rb?rev=801065&r1=801064&r2=801065&view=diff
==============================================================================
--- buildr/trunk/spec/ide/eclipse_spec.rb (original)
+++ buildr/trunk/spec/ide/eclipse_spec.rb Wed Aug 5 05:36:29 2009
@@ -312,8 +312,10 @@
describe 'maven2 repository variable' do
it 'should be configurable' do
- eclipse.options.m2_repo_var = 'PROJ_REPO'
- define('foo') { compile.using(:javac).with('com.example:library:jar:2.0') }
+ define('foo') do
+ eclipse.options.m2_repo_var = 'PROJ_REPO'
+ compile.using(:javac).with('com.example:library:jar:2.0')
+ end
artifact('com.example:library:jar:2.0') { |task| write task.name }
task('eclipse').invoke