Use racc gem instead of our own copy in stdlib.

jruby · Oct 16, 2015 · 007e2ce · 007e2ce
1 parent a6cc47d
commit 007e2ce
Showing 8 changed files with 19 additions and 844 deletions.
diff --git a/.gitignore b/.gitignore
@@ -53,6 +53,7 @@ lib/ruby/stdlib/org/
 lib/ruby/stdlib/readline/*readline*.jar
 lib/ruby/stdlib/ripper.jar
 lib/ruby/stdlib/rubygems/defaults/jruby_native.rb
+lib/ruby/stdlib/racc*
 lib/ruby/stdlib/rake*
 lib/ruby/stdlib/rdoc*
 lib/ruby/stdlib/test*

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -28,7 +28,8 @@ def version
    ImportedGem.new( 'power_assert', 'power_assert.version', true ),
    ImportedGem.new( 'psych', '2.0.15', true ),
    ImportedGem.new( 'json', 'json.version', true ),
-   ImportedGem.new( 'jar-dependencies', '0.1.15', true )
+   ImportedGem.new( 'jar-dependencies', '0.1.15', true ),
+   ImportedGem.new( 'racc', 'racc.version', true)
   ]
 
 project 'JRuby Lib Setup' do

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -161,6 +161,19 @@ DO NOT MODIFIY - GENERATED CODE
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>racc</artifactId>
+      <version>${racc.version}</version>
+      <type>gem</type>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>jar-dependencies</artifactId>
+          <groupId>rubygems</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>ruby-maven</artifactId>

diff --git a/lib/ruby/stdlib/racc/parser.rb b/lib/ruby/stdlib/racc/parser.rb
diff --git a/lib/ruby/stdlib/racc/rdoc/grammar.en.rdoc b/lib/ruby/stdlib/racc/rdoc/grammar.en.rdoc
diff --git a/pom.rb b/pom.rb
@@ -79,7 +79,8 @@
               'main.basedir' => '${project.basedir}',
               'joda.time.version' => '2.8.2',
               'test-unit.version' => '3.0.3',
-              'power_assert.version' => '0.2.3' )
+              'power_assert.version' => '0.2.3',
+              'racc.version' => '1.4.13' )
 
   modules [ 'truffle', 'core', 'lib' ]
 

diff --git a/pom.xml b/pom.xml
@@ -107,6 +107,7 @@ DO NOT MODIFIY - GENERATED CODE
   <properties>
     <rspec-core.version>3.3.2</rspec-core.version>
     <polyglot.dump.readonly>true</polyglot.dump.readonly>
+    <racc.version>1.4.13</racc.version>
     <its.j2ee>j2ee*/pom.xml</its.j2ee>
     <jruby.basedir>${project.basedir}</jruby.basedir>
     <minitest.version>5.4.1</minitest.version>

diff --git a/tool/globals_2_2_2.rb b/tool/globals_2_2_2.rb
@@ -42,7 +42,6 @@
   profile.rb
   profiler.rb
   pstore.rb
-  racc
   rbconfig
   resolv-replace.rb
   resolv.rb