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

Commits on May 12, 2016

  1. aside

    chrisseaton committed May 12, 2016
    Copy the full SHA
    02fbdb2 View commit details
  2. Revert "[Truffle] Debug Travis."

    This reverts commit 9a82b1e.
    chrisseaton committed May 12, 2016
    Copy the full SHA
    34703cf View commit details
Showing with 0 additions and 9 deletions.
  1. +0 −2 bin/jruby-cext-c
  2. +0 −7 truffle/src/main/java/org/jruby/truffle/language/loader/FeatureLoader.java
2 changes: 0 additions & 2 deletions bin/jruby-cext-c
Original file line number Diff line number Diff line change
@@ -51,5 +51,3 @@ SRC.each do |src|
end

mx 'su-link', '-o', OUT, *LL

puts `file #{OUT}`
Original file line number Diff line number Diff line change
@@ -63,8 +63,6 @@ public boolean require(VirtualFrame frame, String feature, IndirectCallNode call
}

private String findFeature(String feature) {
System.err.println("findFeature " + feature);

final String currentDirectory = context.getNativePlatform().getPosix().getcwd();

if (feature.startsWith("./")) {
@@ -92,8 +90,6 @@ private String findFeature(String feature) {
}

private String findFeatureWithAndWithoutExtension(String path) {
System.err.println("findFeatureWithAndWithoutExtension " + path);

final String asCExt = findFeatureWithExactPath(path + RubyLanguage.CEXT_EXTENSION);

if (asCExt != null) {
@@ -116,16 +112,13 @@ private String findFeatureWithAndWithoutExtension(String path) {
}

private String findFeatureWithExactPath(String path) {
System.err.println("findFeatureWithExactPath " + path);

if (path.startsWith(SourceLoader.TRUFFLE_SCHEME) || path.startsWith(SourceLoader.JRUBY_SCHEME)) {
return path;
}

final File file = new File(path);

if (!file.isFile()) {
System.err.println("not a file " + path);
return null;
}