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: bc642f4e4bb9
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 407aafc6efbd
Choose a head ref
  • 11 commits
  • 14 files changed
  • 1 contributor

Commits on Oct 29, 2014

  1. Remove automated generated files (by mvn eclipse:eclipse) from the re… 

    …pository.
    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    4a0809f View commit details

  2. Remove all old Eclipse files, we'll start from scratch.

    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    75943e8 View commit details

  3. Some .gitignore cleanup

    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    28f186c View commit details

  4. Sort the .gitignore file

    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    f721ddd View commit details

  5. Ignore Maven generated Eclipse files.

    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    9b5b229 View commit details

  6. Add a couple settings files for Truffle annotation processing in Ecli… 

    …pse.
    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    b62d86f View commit details

  7. Have a try at keeping all Eclipse settings files since they seem to c… 

    …ontain no path.
    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    2b0c004 View commit details

  8. Eclipse: remove trailing whitespace on save.

    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    3ac23a7 View commit details

  9. Update some Eclipse settings.

    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    035638f View commit details

  10. Eclipse: have a try with the .classpath checked in repository.

    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    39e6519 View commit details

  11. Eclipse: check-in .project as well so there is minimal requirement to… 

    … import the project.
    @eregon
    eregon committed Oct 29, 2014
    Copy the full SHA
    407aafc View commit details
5 changes: 0 additions & 5 deletions .classpath
View file

This file was deleted.

113 changes: 58 additions & 55 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,73 @@
!.gitignore

*.[oa]
*.bundle
*.gz
*.zip
*.md5
*.sha1
*.orig
*.rej
*.releaseBackup
release.properties
jruby-complete.jar
bin/*
!bin/gem
!bin/update_rubygems
*.sha1
*.so
*.sw[mnop]
*.versionsBackup
*.zip
*~

.DS_Store
.debug.properties
.redcar
/.rbx/
build
build.eclipse
build.properties
target
build_graph.png
core/src/main/java/org/jruby/runtime/Constants.java
dependency-reduced-pom.xml
dev_null
dist
ext/*/pom-*.gemspec.xml
lib/jruby*.jar
lib/native
lib/jni
lib/ruby/gems
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/jar*
nbproject/private
share
latest_source_cache
docs/api
test/rails
test/prawn
ext/*/pom-*.gemspec.xml
gems/*/Manifest.txt
gems/*/lib/*.jar
gems/*/lib/jruby-jars/version.rb
gems/*/pkg
*.orig
*.rej
*~
tool/nailgun/Makefile
tool/nailgun/ng
tool/nailgun/config.log
tool/nailgun/config.status
jruby-findbugs.html
.debug.properties
test/testapp/testapp
glob_test
spaces test
.DS_Store
jruby-complete.jar
jruby-findbugs.html
latest_source_cache
lib/jni
lib/jruby*.jar
lib/native
lib/ruby/cext/
*.so
*.bundle
*.[oa]
*.versionsBackup
dev_null
.redcar
/.externalToolBuilders/
.metadata
.idea/workspace.xml
shared.iml
build_graph.png
/.idea/
/.rbx/
*.sw[mnop]
lib/ruby/gems
lib/ruby/shared/*jopenssl*.jar
lib/ruby/shared/bcpkix-jdk15on-*.jar
lib/ruby/shared/bcprov-jdk15on-*.jar
lib/ruby/shared/*jopenssl*.jar
lib/ruby/shared/readline/*readline*.jar
lib/ruby/shared/jar*
lib/ruby/shared/jline
lib/ruby/shared/jopenssl*
lib/ruby/shared/krypt*
lib/ruby/shared/openssl
lib/ruby/shared/org/
lib/ruby/shared/readline/*readline*.jar
lib/ruby/shared/ripper.jar
core/src/main/java/org/jruby/runtime/Constants.java
dependency-reduced-pom.xml
lib/ruby/shared/rubygems/defaults/jruby_native.rb
release.properties
share
spaces test
target
test/prawn
test/rails
test/testapp/testapp
tool/nailgun/Makefile
tool/nailgun/config.log
tool/nailgun/config.status
tool/nailgun/ng

# binaries
!bin/gem
!bin/update_rubygems
bin/*

# These files are bin files for default gems
!lib/ruby/gems/shared/gems/rake-10.1.0/bin/rake
@@ -87,5 +84,11 @@ maven/jruby-complete/src/it/osgi*
.idea
*.iml

# NetBeans files
nbproject/private

# Eclipse project files
/.metadata

# Truffle benchmark stuff
reference.txt
34 changes: 0 additions & 34 deletions .project
View file

This file was deleted.

Loading