Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ddba396cb819^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa98236c5c47
Choose a head ref
11 contributors
Loading
Showing 3,251 changed files with 79,870 additions and 31,089 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 5 additions & 3 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ env:
- PHASE='-Prake -Dtask=spec:profiler'
- PHASE='-Ptruffle-specs-language'
- PHASE='-Ptruffle-specs-core'
- PHASE='-Ptruffle-specs-rubysl'
- PHASE='-Ptruffle-specs-library'

matrix:
include:
@@ -56,10 +56,11 @@ matrix:
jdk: openjdk7
- env: PHASE='-Pj2ee'
jdk: oraclejdk7
# These next two started crashing on JDK7 in March 2015, possibly due to JVM issues on Travis's Docker-based env
- env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
jdk: oraclejdk7
jdk: oraclejdk8
- env: PHASE='-Pmain,test -Dinvoker.test=extended'
jdk: openjdk7
jdk: oraclejdk8
- env: PHASE='-Pjruby_complete_jar_extended -Dinvoker.skip=true'
jdk: oraclejdk8
- env: COMMAND=test/check_versions.sh
@@ -68,6 +69,7 @@ matrix:
jdk: oraclejdk8
fast_finish: true


branches:
only:
- master
12 changes: 12 additions & 0 deletions bench/pack.rb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
size = 10_000_000
array = Array.new(size) { 0xabcdef }
expression = 'x' + ('NX' * size)
expected_sum = 3072

loop do
start = Time.now
result = array.pack(expression)
#result = array.pack_fast(expression)
puts Time.now - start
raise unless result.sum == expected_sum
end
2 changes: 1 addition & 1 deletion bin/ast
View file
Original file line number Diff line number Diff line change
@@ -193,7 +193,7 @@ def ir_setup(root)

builder = org.jruby.ir.IRBuilder

scope = builder.build_root(manager, root)
scope = builder.build_root(manager, root).scope
passes = manager.get_compiler_passes(scope)
[scope, passes]
end
5 changes: 5 additions & 0 deletions bin/jruby200.sh
View file
Original file line number Diff line number Diff line change
@@ -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
38 changes: 10 additions & 28 deletions core/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -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
Loading