Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Truffle] Attempt at removing core from mx. #4371

Merged
merged 2 commits into from Dec 9, 2016

Conversation

chrisseaton
Copy link
Contributor

No description provided.

if classic:
main_class = "org.jruby.Main"
else:
main_class = "org.jruby.truffle.Main"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

classic will not launch anymore if the jar is not on the classpath, so probably this launcher should not support classic anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@@ -143,21 +222,10 @@ def mavenLib(mavenDep, sha1, sourceSha1, license):
"license": "EPL-1.0",
},

# Depends on jruby-core extracting jni libs in lib/jni
"jruby-lib-jni": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the native *.so needed to be real files on the filesystem, is this not required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that was just classic. At least, everything seems to run without it. I know they aren't needed to be on the filesystem by JNI in the first place.

base = "https://search.maven.org/remotecontent?filepath=%s/%s/%s/%s-%s-%s" % args
else:
args = (groupId.replace('.', '/'), artifactId, version, artifactId, version)
base = "https://search.maven.org/remotecontent?filepath=%s/%s/%s/%s-%s" % args
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a fair bit of duplication here, not sure how to fix it.

Copy link
Member

@eregon eregon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

"112ff54474f1f04ccf1384c92e39fdc566f0bb5e",
"BSD-new"),

"JNR_UNIXSOCKET": mavenLib(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use this project.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh you're right. I'm sure we were. I think I even remember making commits to it to make it work for us.

@chrisseaton chrisseaton merged commit f55c9ba into truffle-head Dec 9, 2016
@chrisseaton chrisseaton deleted the truffle-mx-no-core branch December 9, 2016 21:14
@enebo enebo modified the milestone: truffle-dev Jan 10, 2017
@enebo enebo added this to the Non-Release milestone Dec 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants