Merge branch 'master' into truffle-head

Conflicts: tool/jt.rb truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java truffle/src/main/java/org/jruby/truffle/translator/Translator.java
jruby · Mar 19, 2015 · c00ff32 · c00ff32
2 parents dd2285d + a536f0f
commit c00ff32
Show file tree

Hide file tree

Showing 94 changed files with 770 additions and 1,907 deletions.
diff --git a/bin/jruby200.sh b/bin/jruby200.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+find . -name '*.pack.gz' | sed 's/\(.*\).pack.gz/\1.pack.gz \1.jar/' | xargs -L1 unpack200 --remove-pack-file
+cp bin/jruby.bash bin/jruby 
+bin/jruby.bash $@
+exit
diff --git a/core/pom.rb b/core/pom.rb
@@ -52,7 +52,7 @@
 
   jar 'org.jruby.joni:joni:2.1.5'
   jar 'org.jruby.extras:bytelist:1.0.12'
-  jar 'org.jruby.jcodings:jcodings:1.0.12'
+  jar 'org.jruby.jcodings:jcodings:1.0.13-SNAPSHOT'
   jar 'org.jruby:dirgra:0.2'
 
   jar 'com.headius:invokebinder:1.5'
@@ -253,33 +253,15 @@
                    'outputFile' => '${jruby.basedir}/lib/jruby.jar',
                    'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
                                          'mainClass' => 'org.jruby.Main' } ] )
-  end
-
-  [ :osgi, :dist, :'jruby-jars', :main, :all, :complete, :release, :jruby_complete_jar_extended ].each do |name|
-    profile name do
-      plugin :shade do
-        execute_goals( 'shade',
-                       :id => 'pack jruby-core-noasm.jar',
-                       :phase => 'package',
-                       'shadedArtifactAttached' =>  'true',
-                       'shadedClassifierName' =>  'noasm',
-                       'artifactSet' => {
-                         'includes' => [ 'com.github.jnr:jnr-ffi',
-                                         'org.ow2.asm:*' ]
-                       },
-                       'relocations' => [ { 'pattern' =>  'org.objectweb',
-                                            'shadedPattern' =>  'org.jruby.org.objectweb' } ] )
-        execute_goals( 'shade',
-                       :id => 'pack jruby-core-complete.jar',
-                       :phase => 'package',
-                       'shadedArtifactAttached' =>  'true',
-                       'shadedClassifierName' =>  'complete',
-                       'relocations' => [ { 'pattern' =>  'org.objectweb',
-                                            'shadedPattern' =>  'org.jruby.org.objectweb' } ],
-                       'transformers' => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
-                                             'mainClass' => 'org.jruby.Main' } ] )
-      end
-    end
+    execute_goals( 'shade',
+                   :id => 'shade the asm classes',
+                   :phase => 'verify',
+                   'artifactSet' => {
+                     'includes' => [ 'com.github.jnr:jnr-ffi',
+                                     'org.ow2.asm:*' ]
+                   },
+                   'relocations' => [ { 'pattern' =>  'org.objectweb',
+                                        'shadedPattern' =>  'org.jruby.org.objectweb' } ] )
   end
 
   profile 'jruby.bash' do