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: 1f56abb341d4
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e822a112cfe
Choose a head ref

Commits on May 5, 2014

  1. Avoid manual unroll of non-hot SipHash loops

    As these loops will be executed only once for every #hash invokation,
    it would make sense to defer the decision to unroll the loops to the
    runtime.
    grddev committed May 5, 2014
    Copy the full SHA
    23570f5 View commit details
  2. Hoist SipHashInline range checks

    In principle, this should allow the JIT compiler to remove all range
    checks within the loop. I haven't had time to verify this though.
    grddev committed May 5, 2014
    Copy the full SHA
    43b2ef4 View commit details
  3. Use Unsafe to read a long at a time

    While one could wish that JIT compilation optimised the eight sequential
    byte reads into a single long read, it in fact does not.
    
    This implementation should fallback to the slow implementation in a
    context where Unsafe fails to load, but I haven't figured out how to
    test that properly.
    grddev committed May 5, 2014
    Copy the full SHA
    c02fcd7 View commit details

Commits on Aug 31, 2014

  1. Deprecate overloaded setProfile, prefer setProfilingMode

    The ScriptingContainer class contains two methods named `setProfile`,
    which differ only by their single argument type and do very different
    things from one another.  One of the two signatures accepts
    an argument of type `ProfilingMode`, which, in other places in the
    code, is exposed via more explicitly named accessor methods such as
    `getProfilingMode` and `setProfilingMode`.  I'm wondering if maybe
    the method in `ScriptingContainer` was simply accidentally mis-named.
    
    This commit deprecates the `setProfile(ProfilingMode)` method, and
    introduces a replacement method `setProfilingMode(ProfilingMode)`,
    which is more consistent with the rest of the code.
    cprice404 committed Aug 31, 2014
    Copy the full SHA
    05655cc View commit details

Commits on Sep 25, 2014

  1. tweak include order

    tduehr committed Sep 25, 2014
    Copy the full SHA
    99da805 View commit details

Commits on Sep 27, 2014

  1. Implemented multi args 'system' method on Windows

    'system' method of multi args was not able to support
    Windows internal commands.
    (ex) echo, cd, etc
    yousuketto committed Sep 27, 2014
    Copy the full SHA
    1355b9f View commit details

Commits on Sep 29, 2014

  1. fixed issue 1695

    k77ch7 committed Sep 29, 2014
    Copy the full SHA
    174117d View commit details

Commits on Oct 6, 2014

  1. Copy the full SHA
    0ad11ae View commit details
  2. sync/update ffi specs

    tduehr committed Oct 6, 2014
    Copy the full SHA
    cf8f196 View commit details
  3. fix failing variadic spec

    updates variadic invoker to match MRI
    variadic functions may now take enum arguments
    tduehr committed Oct 6, 2014
    Copy the full SHA
    7e30627 View commit details
  4. fix failing syslog test

    also adds ffi spec for failure
    tduehr committed Oct 6, 2014
    Copy the full SHA
    b61eb93 View commit details

Commits on Oct 16, 2014

  1. Copy the full SHA
    ef4ce75 View commit details

Commits on Oct 18, 2014

  1. Copy the full SHA
    262ef4d View commit details
  2. [build] * run install goal on maven-integration-tests

    * make sure changes in src/templates will be used with out mvn clean
    mkristian committed Oct 18, 2014
    Copy the full SHA
    7e7f96a View commit details
  3. Copy the full SHA
    34984ce View commit details
  4. Copy the full SHA
    c92b8dd View commit details
  5. Copy the full SHA
    57ecaf6 View commit details

Commits on Oct 21, 2014

  1. Copy the full SHA
    2b7fecb View commit details

Commits on Oct 23, 2014

  1. Copy the full SHA
    d3d8355 View commit details
  2. Fixed spacing

    pabloatplumbee committed Oct 23, 2014
    Copy the full SHA
    1bb4722 View commit details

Commits on Oct 28, 2014

  1. Update 1.8.7 rexml to latest.

    headius committed Oct 28, 2014
    Copy the full SHA
    566b9d6 View commit details
  2. Copy the full SHA
    2bd2879 View commit details
  3. Copy the full SHA
    9ff5675 View commit details
  4. Copy the full SHA
    8cfc303 View commit details
  5. Copy the full SHA
    924a5ee View commit details
  6. Copy the full SHA
    234acf6 View commit details
  7. Copy the full SHA
    0732187 View commit details

Commits on Oct 29, 2014

  1. Copy the full SHA
    8942235 View commit details

Commits on Nov 2, 2014

  1. Merge pull request #2068 from pabloatplumbee/jruby-1_7

    Made Exception#set_backtrace compliant with Ruby documentation
    headius committed Nov 2, 2014
    Copy the full SHA
    ceb199a View commit details
  2. Merge pull request #2011 from k77ch7/GH-1695_big_decimal_and_rational…

    …_multiplication
    
    Fix for issue 1695 : BigDecimal and Rational multiplication
    headius committed Nov 2, 2014
    Copy the full SHA
    8a4ffea View commit details
  3. Merge pull request #2008 from yousuketto/internal_cmd_on_win

    Implemented multi args 'system' method on Windows fix #1074
    headius committed Nov 2, 2014
    Copy the full SHA
    581957e View commit details
  4. Merge pull request #2003 from tduehr/enums_fix

    fix enums to return nil on unknown symbol
    headius committed Nov 2, 2014
    Copy the full SHA
    8d12e83 View commit details
  5. RIP Sun Microsystems :'(

    Fixes #2006 and replaces #2007.
    headius committed Nov 2, 2014
    Copy the full SHA
    c5d702b View commit details
  6. Merge pull request #2002 from tduehr/include_order

    tweak include order
    headius committed Nov 2, 2014
    Copy the full SHA
    0cb3433 View commit details
  7. Merge pull request #1681 from grddev/unsafe-siphash-opt

    Optimize SipHash using sun.misc.Unsafe
    headius committed Nov 2, 2014
    Copy the full SHA
    cb4581c View commit details
  8. Better error when java_import'ing names with ::. See #2075.

    Thanks to @byteit101 for the patch!
    headius committed Nov 2, 2014
    Copy the full SHA
    f232a77 View commit details
  9. Merge pull request #1934 from cprice404/maint/jruby-1_7/sc-set-profil…

    …ing-mode
    
    Deprecate overloaded `setProfile`, prefer `setProfilingMode`
    headius committed Nov 2, 2014
    Copy the full SHA
    4a0eed6 View commit details
  10. Fix profile output

    86a75dc incorrectly updated the method names the profiler needs to
    ignore, resulting in incorrect profiler output.
    
    This resulted in graph output including JRuby::Profiler calls and
    incorrectly reported a total time of "0.00" with "100%" time spent in
    every method.
    
    Revert to the correct names, fixing the output.
    dmarcotte committed Nov 2, 2014
    Copy the full SHA
    51faa56 View commit details

Commits on Nov 3, 2014

  1. Revert rdoc to 4.0.1 and remove from sync script.

    The markdown.rb from rdoc appeared to have some newlines in the
    middle of a string and a comment. I removed those after copying
    from the gem, but I'm not sure how they got there.
    headius committed Nov 3, 2014
    Copy the full SHA
    78999e2 View commit details
  2. Fixes #2088. Allow partial but not actual esoteric interpolation sequ…

    …ences to be regexp values
    enebo committed Nov 3, 2014
    Copy the full SHA
    8801d55 View commit details
  3. Merge pull request #2064 from k77ch7/improve_handling_of_nonascii_cha…

    …racter_after_backslash
    
    improve handling of non ascii character after backslash
    enebo committed Nov 3, 2014
    Copy the full SHA
    2c58354 View commit details
  4. Copy the full SHA
    cccc1d7 View commit details
  5. Copy the full SHA
    bb8992e View commit details
  6. Copy the full SHA
    6505ecf View commit details

Commits on Nov 4, 2014

  1. Copy the full SHA
    bb85d42 View commit details

Commits on Nov 5, 2014

  1. Merge pull request #2081 from dmarcotte/test-block-profile

    Fix profile output
    headius committed Nov 5, 2014
    Copy the full SHA
    9459764 View commit details
  2. Copy the full SHA
    2a2652f View commit details
  3. Copy the full SHA
    27a3749 View commit details

Commits on Nov 6, 2014

  1. Limit searches for service libraries to once per baseName, rather tha…

    …n once per suffix.
    
    This change reduces the number of repeated failed classpath lookups, each of which generates a ClassNotFoundException.
    nirvdrum committed Nov 6, 2014
    Copy the full SHA
    35d92a2 View commit details
  2. Merge pull request #2115 from nirvdrum/reduce_cnfe_in_require

    Limit searches for service libraries to once per baseName, rather than once per suffix.
    headius committed Nov 6, 2014
    Copy the full SHA
    8f1a94d View commit details
Showing 864 changed files with 33,506 additions and 67,683 deletions.
7 changes: 2 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -22,8 +22,9 @@ lib/ruby/shared/rubygems/defaults/jruby_native.rb
lib/ruby/shared/krypt*
lib/ruby/shared/jopenssl*
lib/ruby/shared/org/
lib/ruby/shared/openssl
lib/ruby/shared/openssl*
lib/ruby/shared/jar*
lib/ruby/shared/*rdoc*
nbproject/private
share
latest_source_cache
@@ -71,10 +72,6 @@ lib/ruby/shared/ripper.jar
core/src/main/java/org/jruby/runtime/Constants.java
dependency-reduced-pom.xml

# These files are bin files for default gems
!lib/ruby/gems/shared/gems/rake-10.1.0/bin/rake
!lib/ruby/gems/shared/gems/rdoc-4.0.1/bin/rdoc
!lib/ruby/gems/shared/gems/rdoc-4.0.1/bin/ri
install/updates.xml

# generated ITs
18 changes: 11 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -2,27 +2,31 @@ language: java
before_script:
- unset GEM_PATH GEM_HOME IRBRC
- "export PATH=`pwd`/bin:$PATH"
- echo $HOME

jdk:
- oraclejdk7
- oraclejdk8
- openjdk6
jdk: openjdk6

env:
# disable cext
global:
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djruby.cext.enabled=false"
matrix:
- TARGET='test-extended'
- TARGET='spec:ci_interpreted_via_env' RUBYSPEC_LANG_VER='1.8'
- TARGET='spec:ci_interpreted_via_env' RUBYSPEC_LANG_VER='1.9'
- TARGET='spec:ruby:fast'
- TARGET='spec:ruby19:fast'
- TARGET='jruby-jars'
- TARGET='complete'
- TARGET='main'
- TARGET='osgi'
- TARGET='j2ee'
- TARGET='test-jruby-jars'
- TARGET='jruby-jars-extended'
- TARGET='main-extended'

matrix:
include:
# there is one integration test which uses a external jar for jdk7+
- jdk: oraclejdk7
env: TARGET='main'
fast_finish: true

branches:
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.7.17-SNAPSHOT
1.7.21-SNAPSHOT
Loading