Skip to content
This repository

Include runtime version in site dir #431

Merged
merged 1 commit into from over 1 year ago

2 participants

Slavek Kabrda Charles Oliver Nutter
Slavek Kabrda

I forgot this during doing the path rework, I think it's not used by anyone except me for Fedora packaging, so it can safely be merged into 1.7 tree.

Slavek Kabrda Include runtime version in site dir
I forgot this during doing the path rework, I think it's not used by anyone except me for Fedora packaging, so it can safely be merged into 1.7 tree.
8fb299e
Charles Oliver Nutter headius merged commit 99b5163 into from
Charles Oliver Nutter headius closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Dec 07, 2012
Slavek Kabrda Include runtime version in site dir
I forgot this during doing the path rework, I think it's not used by anyone except me for Fedora packaging, so it can safely be merged into 1.7 tree.
8fb299e
This page is out of date. Refresh to see the latest.
2  src/org/jruby/ext/rbconfig/RbConfigLibrary.java
@@ -185,7 +185,7 @@ public static String getVendorArchDir(Ruby runtime) {
185 185
     }
186 186
 
187 187
     public static String getSiteDir(Ruby runtime) {
188  
-        return new NormalizedFile(getSiteDirGeneral(runtime), "ruby/site_ruby").getPath();
  188
+        return new NormalizedFile(getSiteDirGeneral(runtime), String.format("ruby/%s/site_ruby", getRuntimeVerStr(runtime))).getPath();
189 189
     }
190 190
 
191 191
     public static String getSiteLibDir(Ruby runtime) {
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.