Skip to content

Commit ac1617a

Browse files
committed
[GR-16271] Remove ArchiveProject in mx and merge core with the org.truffleruby project.
PullRequest: truffleruby/876
2 parents f36a3db + c6db388 commit ac1617a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+12
-40
lines changed

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Lint/InheritException:
175175
- runtime_error
176176
- standard_error
177177
Exclude:
178-
- src/main/ruby/core/exception.rb
178+
- src/main/ruby/truffleruby/core/exception.rb
179179

180180
Lint/LiteralAsCondition:
181181
Description: Checks of literals used in conditions.

3rd_party_licenses.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -487,11 +487,11 @@ SnakeYAML (Copyright the SnakeYAML authors, Apache 2.0 licence)
487487
truffle-api and truffle-debug (Copyright Oracle and/or its affiliates, GPL
488488
v2, with classpath exception)
489489

490-
Parts of the core library implementation in truffle/src/main/ruby/core
490+
Parts of the core library implementation in src/main/ruby/truffleruby/core
491491
are copyright (c) 2011, Evan Phoenix, and released under the 3-clause BSD
492492
license.
493493

494-
Parts of the core library implementation in truffle/src/main/ruby/core
494+
Parts of the core library implementation in src/main/ruby/truffleruby/core
495495
are copyright (c) 2007-2015, Evan Phoenix and contributors, and released under
496496
the 3-clause BSD license.
497497

doc/contributor/static-analysis.md

Lines changed: 1 addition & 1 deletion

doc/legal/legal.md

Lines changed: 1 addition & 1 deletion

mx.truffleruby/mx_truffleruby.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,6 @@
1818
_suite = mx.suite('truffleruby')
1919
root = _suite.dir
2020

21-
# Project classes
22-
23-
class ArchiveProject(mx.ArchivableProject):
24-
def __init__(self, suite, name, deps, workingSets, theLicense, **args):
25-
mx.ArchivableProject.__init__(self, suite, name, deps, workingSets, theLicense, **args)
26-
assert 'prefix' in args
27-
assert 'outputDir' in args
28-
29-
def output_dir(self):
30-
return join(self.dir, self.outputDir)
31-
32-
def archive_prefix(self):
33-
return self.prefix
34-
35-
def getResults(self):
36-
return mx.ArchivableProject.walk(self.output_dir())
37-
3821
# Utilities
3922

4023
class VerboseMx:

mx.truffleruby/suite.py

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"lib/mri",
9696
"lib/truffle",
9797
],
98-
"load_path": ["src/main/ruby/core"],
98+
"load_path": ["src/main/ruby/truffleruby/core"],
9999
"test": ["spec", "test"],
100100
"excluded": [
101101
"bench",
@@ -169,7 +169,7 @@
169169

170170
"org.truffleruby": {
171171
"dir": "src/main",
172-
"sourceDirs": ["java"],
172+
"sourceDirs": ["java", "ruby"],
173173
"dependencies": [
174174
"truffleruby:TRUFFLERUBY-ANNOTATIONS",
175175
"truffleruby:TRUFFLERUBY-SHARED",
@@ -196,7 +196,7 @@
196196
"externalProjects": {
197197
"ruby-core": {
198198
"type": "ruby",
199-
"path": "ruby",
199+
"path": "ruby/truffleruby",
200200
"source": ["core", "post-boot"],
201201
"load_path": ["core"]
202202
}
@@ -218,16 +218,6 @@
218218
"license": ["EPL-1.0"],
219219
},
220220

221-
"org.truffleruby.core": {
222-
"class": "ArchiveProject",
223-
"outputDir": "src/main/ruby",
224-
"prefix": "truffleruby",
225-
"license": [
226-
"EPL-1.0", # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
227-
"BSD-new", # Rubinius
228-
],
229-
},
230-
231221
"org.truffleruby.test": {
232222
"dir": "src/test",
233223
"sourceDirs": ["java", "ruby"],
@@ -330,7 +320,6 @@
330320
"mainClass": "org.truffleruby.launcher.RubyLauncher",
331321
"dependencies": [
332322
"org.truffleruby",
333-
"org.truffleruby.core",
334323
],
335324
"distDependencies": [
336325
"truffle:TRUFFLE_API",
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)