Merge pull request jruby#6576 from headius/racc_again

Unrevert racc gem

.gitignore

@@ -70,6 +70,7 @@ lib/ruby/stdlib/openssl*
 lib/ruby/stdlib/org/
 lib/ruby/stdlib/ripper.jar
 lib/ruby/stdlib/rubygems/defaults/jruby_native.rb
+lib/ruby/stdlib/racc*
 lib/ruby/stdlib/rake*
 lib/ruby/stdlib/json*
 lib/ruby/stdlib/rdoc*

lib/pom.rb

@@ -24,6 +24,7 @@ def log(message=nil)
     ['jruby-openssl', '0.10.5'],
     ['json', '${json.version}'],
     ['psych', '3.3.1'],
+    ['racc', '1.5.2'],
     ['rake-ant', '1.0.4'],
     ['rdoc', '${rdoc.version}'],
     ['scanf', '1.0.0'],
@@ -204,13 +205,14 @@ def installer.ensure_required_ruby_version_met; end
         spec = Gem::Package.new( Dir[ File.join( cache, "#{gem_name}*.gem" ) ].first ).spec
 
         # copy bin files if the gem has any
-        bin = File.join( gems, "#{gem_name}", spec.bindir || 'bin' )        
-        if File.exists? bin
-          Dir[ File.join( bin, '*' ) ].each do |f|
-            log "copy to bin: #{File.basename( f )}"
-            target = File.join( bin_stubs, f.sub( /#{gems}/, '' ) )
-            FileUtils.mkdir_p( File.dirname( target ) )
-            FileUtils.cp_r( f, target )
+        Dir.glob(File.join( gems, "#{gem_name}*", spec.bindir || 'bin' )) do |bin|
+          if File.exists?(bin)
+            Dir[ File.join( bin, '*' ) ].each do |f|
+              log "copy to bin: #{File.basename( f )}"
+              target = File.join( bin_stubs, f.sub( /#{gems}/, '' ) )
+              FileUtils.mkdir_p( File.dirname( target ) )
+              FileUtils.cp_r( f, target )
+            end
           end
         end
 

lib/pom.xml

@@ -148,6 +148,19 @@ DO NOT MODIFIY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>racc</artifactId>
+      <version>1.5.2</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>rake-ant</artifactId>
@@ -338,6 +351,9 @@ DO NOT MODIFIY - GENERATED CODE
           <include>cache/psych*3.2.0.gem</include>
           <include>gems/psych*3.2.0/**</include>
           <include>specifications/psych*3.2.0.gemspec</include>
+          <include>cache/racc*1.5.2.gem</include>
+          <include>gems/racc*1.5.2/**</include>
+          <include>specifications/racc*1.5.2.gemspec</include>
           <include>cache/rake-ant*1.0.4.gem</include>
           <include>gems/rake-ant*1.0.4/**</include>
           <include>specifications/rake-ant*1.0.4.gemspec</include>