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: b60b386522bb
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3108c15e6c08
Choose a head ref
  • 4 commits
  • 8 files changed
  • 1 contributor

Commits on Nov 26, 2014

  1. remove extra whitespaces

    @mkristian
    mkristian committed Nov 26, 2014
    Copy the full SHA
    7b3a29f View commit details

  2. clean up classloader type hierachy 

    * only the classloader runtime.getJRubyClassLoader needs to have
  all the extra features. all other classloaders just needs to
  be able to define classes and do not need the extra overhead of
  loading and finding resources and adding jar files during runtime.
* the OneShotClassloader is only used with runtime.getJRubyClassLoader
  so ensure this relation via types
* the JRubyClassLoader is used at various places also as "flag via instanceof".
  keep this and all other uses of JRubyClassLoader as it was before
* replace on use of OneShotClassloader with JRubyClassLoader to check if it possible
  to load byte code at runtime
    @mkristian
    mkristian committed Nov 26, 2014
    Copy the full SHA
    90a61d7 View commit details

  3. fix -Pjruby_complete_jar_extended

    @mkristian
    mkristian committed Nov 26, 2014
    Copy the full SHA
    c0bf38a View commit details

  4. Revert "[build] check_versions.sh does not need to -Pboostrap - save … 

    …some CPU cycles"

This reverts commit 48a12f5.
    @mkristian
    mkristian committed Nov 26, 2014
    Copy the full SHA
    3108c15 View commit details
3 changes: 2 additions & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ env:
- JAVA_OPTS="-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
matrix:
- PHASE='-Ptest'
- PHASE='-Pjruby_complete_jar_extended'
- PHASE='-Prake -Dtask=test:jruby'
- PHASE='-Prake -Dtask=test:mri'
- PHASE='-Prake -Dtask=test:slow_suites'
@@ -51,6 +50,8 @@ matrix:
- env: PHASE='-Pjruby-jars,test -Dinvoker.test=extended'
jdk: oraclejdk7
- env: PHASE='-Pmain,test -Dinvoker.test=extended'
jdk: openjdk7
- env: PHASE='-Pjruby_complete_jar_extended'
jdk: oraclejdk8
- env: COMMAND=test/check_versions.sh
jdk: oraclejdk8
Loading