[GR-16271] Remove ArchiveProject in mx and merge core with the org.truffleruby project.

PullRequest: truffleruby/876

Author: eregon

.rubocop.yml

@@ -175,7 +175,7 @@ Lint/InheritException:
   - runtime_error
   - standard_error
   Exclude:
-  - src/main/ruby/core/exception.rb
+  - src/main/ruby/truffleruby/core/exception.rb
 
 Lint/LiteralAsCondition:
   Description: Checks of literals used in conditions.

3rd_party_licenses.txt

@@ -487,11 +487,11 @@ SnakeYAML (Copyright the SnakeYAML authors, Apache 2.0 licence)
 truffle-api and truffle-debug (Copyright Oracle and/or its affiliates, GPL
 v2, with classpath exception)
 
-Parts of the core library implementation in truffle/src/main/ruby/core
+Parts of the core library implementation in src/main/ruby/truffleruby/core
 are copyright (c) 2011, Evan Phoenix, and released under the 3-clause BSD
 license.
 
-Parts of the core library implementation in truffle/src/main/ruby/core
+Parts of the core library implementation in src/main/ruby/truffleruby/core
 are copyright (c) 2007-2015, Evan Phoenix and contributors, and released under
 the 3-clause BSD license.
 

doc/contributor/static-analysis.md

@@ -18,23 +18,6 @@
 _suite = mx.suite('truffleruby')
 root = _suite.dir
 
-# Project classes
-
-class ArchiveProject(mx.ArchivableProject):
-    def __init__(self, suite, name, deps, workingSets, theLicense, **args):
-        mx.ArchivableProject.__init__(self, suite, name, deps, workingSets, theLicense, **args)
-        assert 'prefix' in args
-        assert 'outputDir' in args
-
-    def output_dir(self):
-        return join(self.dir, self.outputDir)
-
-    def archive_prefix(self):
-        return self.prefix
-
-    def getResults(self):
-        return mx.ArchivableProject.walk(self.output_dir())
-
 # Utilities
 
 class VerboseMx:

doc/legal/legal.md

@@ -95,7 +95,7 @@
                 "lib/mri",
                 "lib/truffle",
             ],
-            "load_path": ["src/main/ruby/core"],
+            "load_path": ["src/main/ruby/truffleruby/core"],
             "test": ["spec", "test"],
             "excluded": [
                 "bench",
@@ -169,7 +169,7 @@
 
         "org.truffleruby": {
             "dir": "src/main",
-            "sourceDirs": ["java"],
+            "sourceDirs": ["java", "ruby"],
             "dependencies": [
                 "truffleruby:TRUFFLERUBY-ANNOTATIONS",
                 "truffleruby:TRUFFLERUBY-SHARED",
@@ -196,7 +196,7 @@
             "externalProjects": {
                 "ruby-core": {
                     "type": "ruby",
-                    "path": "ruby",
+                    "path": "ruby/truffleruby",
                     "source": ["core", "post-boot"],
                     "load_path": ["core"]
                 }
@@ -218,16 +218,6 @@
             "license": ["EPL-1.0"],
         },
 
-        "org.truffleruby.core": {
-            "class": "ArchiveProject",
-            "outputDir": "src/main/ruby",
-            "prefix": "truffleruby",
-            "license": [
-                "EPL-1.0",          # JRuby (we're choosing EPL out of EPL,GPL,LGPL)
-                "BSD-new",          # Rubinius
-            ],
-        },
-
         "org.truffleruby.test": {
             "dir": "src/test",
             "sourceDirs": ["java", "ruby"],
@@ -330,7 +320,6 @@
             "mainClass": "org.truffleruby.launcher.RubyLauncher",
             "dependencies": [
                 "org.truffleruby",
-                "org.truffleruby.core",
             ],
             "distDependencies": [
                 "truffle:TRUFFLE_API",

mx.truffleruby/mx_truffleruby.py

@@ -1,4 +1,4 @@
-file = 'src/main/ruby/core/truffle/ffi/pointer_access.rb'
+file = 'src/main/ruby/truffleruby/core/truffle/ffi/pointer_access.rb'
 
 code = <<RUBY
 # frozen_string_literal: true

mx.truffleruby/suite.py

@@ -33,7 +33,7 @@
 RUBOCOP_INCLUDE_LIST = %w[
   lib/cext
   lib/truffle
-  src/main/ruby
+  src/main/ruby/truffleruby
   src/test/ruby
   tool/generate-sulongmock.rb
   spec/truffle
@@ -698,7 +698,7 @@ def run_ruby(*args)
     ruby_args += args
 
     if core_load_path
-      vm_args << "--experimental-options" << "--core-load-path=#{TRUFFLERUBY_DIR}/src/main/ruby"
+      vm_args << "--experimental-options" << "--core-load-path=#{TRUFFLERUBY_DIR}/src/main/ruby/truffleruby"
     end
 
     ruby_bin = find_launcher(native)
@@ -1282,7 +1282,7 @@ def test_specs(command, *args)
       else
         running_local_build = true
         options += %w[-T--vm.ea -T--vm.esa -T--vm.Xmx2G]
-        options << "-T--core-load-path=#{TRUFFLERUBY_DIR}/src/main/ruby"
+        options << "-T--core-load-path=#{TRUFFLERUBY_DIR}/src/main/ruby/truffleruby"
         options << "-T--polyglot" # For Truffle::Interop.export specs
       end