Merge pull request #4811 from jruby/remove-ant

Remove ant DSL/wrapper from stdlib and replace with gem.
jruby · Oct 10, 2017 · 625fac9 · 625fac9
2 parents 1b5822d + 4b6695f
commit 625fac9
Showing 15 changed files with 22 additions and 671 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,6 +52,7 @@ lib/native
 lib/ruby/cext/
 lib/ruby/gems
 lib/ruby/stdlib/*.jar
+lib/ruby/stdlib/ant*
 lib/ruby/stdlib/did_you_mean*
 lib/ruby/stdlib/gauntlet_rdoc.rb
 lib/ruby/stdlib/jar*

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -38,6 +38,7 @@ def initialize( name, version, default_spec = true )
    ImportedGem.new( 'jar-dependencies', '${jar-dependencies.version}' ),
    ImportedGem.new( 'net-telnet', '0.1.1'),
    ImportedGem.new( 'did_you_mean', '1.0.1'),
+   ImportedGem.new( 'rake-ant', '1.0.4'),
   ]
 
 project 'JRuby Lib Setup' do

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -187,6 +187,19 @@ DO NOT MODIFIY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>rake-ant</artifactId>
+      <version>1.0.4</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>

diff --git a/lib/ruby/stdlib/ant.rb b/lib/ruby/stdlib/ant.rb
diff --git a/lib/ruby/stdlib/ant/ant.rb b/lib/ruby/stdlib/ant/ant.rb
diff --git a/lib/ruby/stdlib/ant/element.rb b/lib/ruby/stdlib/ant/element.rb
diff --git a/lib/ruby/stdlib/ant/project_converter.rb b/lib/ruby/stdlib/ant/project_converter.rb
diff --git a/lib/ruby/stdlib/ant/rake.rb b/lib/ruby/stdlib/ant/rake.rb
diff --git a/lib/ruby/stdlib/ant/target.rb b/lib/ruby/stdlib/ant/target.rb
diff --git a/lib/ruby/stdlib/ant/tasks/raketasks.rb b/lib/ruby/stdlib/ant/tasks/raketasks.rb
diff --git a/spec/java_integration/ant/ant_spec.rb b/spec/java_integration/ant/ant_spec.rb
@@ -22,8 +22,12 @@
   after :each do
     ENV['JAVA_HOME'] = @previous_java_home
     Ant.instance_eval do
-      remove_const(:JAVA_HOME)
-      const_set(:JAVA_HOME, @previous_java_home)
+      begin
+        remove_const(:JAVA_HOME)
+        const_set(:JAVA_HOME, @previous_java_home)
+      rescue NameError
+        # ignore, JAVA_HOME constant is not necessarily set now
+      end
     end
   end
 

diff --git a/spec/java_integration/ant/rake_spec.rb b/spec/java_integration/ant/rake_spec.rb
@@ -2,7 +2,6 @@
 require 'rake'
 # Do this hoo-hah with import because we don't want Rake's version of "import".
 def import(*args); java_import(*args); end
-require 'ant/rake'
 
 describe Ant, "Rake helpers" do
   include Ant::RSpec::AntExampleGroup

diff --git a/spec/java_integration/ant_spec_helper.rb b/spec/java_integration/ant_spec_helper.rb
@@ -2,7 +2,7 @@
 require 'ant'
 require 'tmpdir'
 
-class Ant
+class Rake::Ant
   module RSpec
     module AntExampleGroup
       def self.included(example_group)

diff --git a/test/ant_example.xml b/test/ant_example.xml
diff --git a/test/jruby/test_ant.rb b/test/jruby/test_ant.rb