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

Commits on Oct 20, 2016

  1. Copy the full SHA
    cf29cfa View commit details
  2. Copy the full SHA
    538c7da View commit details
Showing with 41 additions and 13 deletions.
  1. +41 −13 mx.jruby/suite.py
54 changes: 41 additions & 13 deletions mx.jruby/suite.py
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
# GNU General Public License version 2
# GNU Lesser General Public License version 2.1

def mavenLib(mavenDep, sha1, sourceSha1):
def mavenLib(mavenDep, sha1, sourceSha1, license):
groupId, artifactId, version = mavenDep.split(':')
args = (groupId.replace('.', '/'), artifactId, version, artifactId, version)
base = "https://search.maven.org/remotecontent?filepath=%s/%s/%s/%s-%s" % args
@@ -22,13 +22,12 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"artifactId": artifactId,
"version": version,
},
"license": "EPL", # fake
"license": license
}

suite = {
"mxversion": "5.36.1",
"mxversion": "5.51.0",
"name": "jrubytruffle",
"defaultLicense": "EPL",

"imports": {
"suites": [
@@ -45,10 +44,30 @@ def mavenLib(mavenDep, sha1, sourceSha1):
},

"licenses": {
"EPL": {
"name": "EPL",
"EPL-1.0": {
"name": "Eclipse Public License 1.0",
"url": "https://opensource.org/licenses/EPL-1.0",
},
"BSD-simplified" : {
"name" : "Simplified BSD License (2-clause BSD license)",
"url" : "http://opensource.org/licenses/BSD-2-Clause"
},
"MIT" : {
"name" : "MIT License",
"url" : "http://opensource.org/licenses/MIT"
},
"Apache-2.0" : {
"name" : "Apache License 2.0",
"url" : "https://opensource.org/licenses/Apache-2.0"
},
"GPLv2" : {
"name" : "GNU General Public License, version 2",
"url" : "http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"
},
"zlib" : {
"name" : "The zlib License",
"url" : "https://opensource.org/licenses/zlib"
},
},

"libraries": {
@@ -58,12 +77,14 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"ANTLR4_RUNTIME": mavenLib(
"org.antlr:antlr4-runtime:4.5.1-1",
"66144204f9d6d7d3f3f775622c2dd7e9bd511d97",
"e0057705e96c77719e7d49cb64dc014d023e7a9b"),
"e0057705e96c77719e7d49cb64dc014d023e7a9b",
"BSD-new"),

"SNAKEYAML": mavenLib(
"org.yaml:snakeyaml:1.14",
"c2df91929ed06a25001939929bff5120e0ea3fd4",
"4c6bcedc3efa772a5ae1c2fd01efee8e4d15edac"),
"4c6bcedc3efa772a5ae1c2fd01efee8e4d15edac",
"Apache-2.0"),
},

"projects": {
@@ -75,6 +96,7 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"sourceDirs": [ "core/src/main/java" ],
"watch": [ "core/src" ],
"jar": "lib/jruby.jar",
"license": [ "EPL-1.0", "BSD-new", "BSD-simplified", "MIT", "Apache-2.0" ],
},

"jruby-truffle": {
@@ -91,12 +113,14 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"javaCompliance": "1.8",
"workingSets": "JRubyTruffle",
"checkPackagePrefix": "false",
"license": [ "EPL-1.0", "BSD-new", "BSD-simplified", "MIT", "Apache-2.0" ],
},

"jruby-truffle-ruby": {
"class": "ArchiveProject",
"outputDir": "truffle/src/main/ruby",
"prefix": "jruby-truffle",
"license": [ "EPL-1.0", "BSD-new" ],
},

"jruby-truffle-test": {
@@ -109,12 +133,14 @@ def mavenLib(mavenDep, sha1, sourceSha1):
],
"javaCompliance": "1.8",
"checkPackagePrefix": "false",
"license": "EPL-1.0",
},

"jruby-truffle-ruby-test": {
"class": "ArchiveProject",
"outputDir": "truffle/src/test/ruby",
"prefix": "src/test/ruby",
"license": "EPL-1.0",
},

# Depends on jruby-core extracting jni libs in lib/jni
@@ -123,6 +149,7 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"outputDir": "lib/jni",
"prefix": "lib/jni",
"dependencies": [ "jruby-core" ],
"license": [ "Apache-2.0", "MIT" ],
},

# Depends on jruby-core installing gems in lib/ruby
@@ -131,9 +158,10 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"outputDir": "lib/ruby",
"prefix": "lib/ruby",
"dependencies": [ "jruby-core" ],
"license": [ "EPL-1.0", "MIT", "BSD-simplified", "GPLv2", "LGPLv21", "zlib" ],
},

"jruby-licences": {
"jruby-licenses": {
"class": "LicensesProject",
"outputDir": "",
"prefix": "",
@@ -159,7 +187,7 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"truffle:TRUFFLE_DEBUG",
],
"description": "JRuby+Truffle",
"license": "EPL"
"license": [ "EPL-1.0", "BSD-new", "BSD-simplified", "MIT", "Apache-2.0" ],
},

# Set of extra files to extract to run Ruby
@@ -169,13 +197,13 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"dependencies": [
"jruby-lib-jni",
"jruby-lib-ruby",
"jruby-licences",
"jruby-licenses",
],
"overlaps": [
"RUBY",
],
"description": "JRuby+Truffle Native Libs",
"license": "EPL"
"license": [ "EPL-1.0", "MIT", "BSD-simplified", "GPLv2", "LGPLv21", "zlib" ],
},

"RUBY-TEST": {
@@ -191,7 +219,7 @@ def mavenLib(mavenDep, sha1, sourceSha1):
"RUBY",
"truffle:TRUFFLE_TCK"
],
"license" : "EPL",
"license": "EPL-1.0",
},
},
}