Always build a GraalVM and remove the development launcher

PullRequest: truffleruby/624

Author: chrisseaton

.gitignore

@@ -18,20 +18,6 @@ nbproject
 .factorypath
 
 # C extensions
-lib/cext/truffleposix.so
-lib/cext/truffleposix.dylib
-lib/cext/sulongmock.o
-lib/cext/ruby.su
-lib/cext/ruby.o
-lib/cext/sulong-libs
-lib/cext/include/sulong/polyglot.h
-lib/mri/openssl.su
-lib/mri/zlib.su
-lib/mri/psych.su
-lib/mri/syslog.su
-lib/mri/nkf.su
-lib/mri/etc.su
-lib/mri/rbconfig/sizeof.su
 /.ext
 
 bench/chunky_png/oily_png/ext/oily_png/Makefile
@@ -50,11 +36,13 @@ src/main/c/*/*.bc
 src/main/c/*/*.su
 src/main/c/*/extconf.h
 src/main/c/*/mkmf.log
+src/main/c/cext/ruby.o
 src/main/c/etc/constdefs.h
 src/main/c/sulongmock/sulongmock.c
+src/main/c/sulongmock/sulongmock.o
 src/main/c/truffleposix/truffleposix.o
-src/main/c/truffleposix/truffleposix.so
-src/main/c/truffleposix/truffleposix.dylib
+src/main/c/truffleposix/libtruffleposix.so
+src/main/c/truffleposix/libtruffleposix.dylib
 
 test/truffle/cexts/**/Makefile
 test/truffle/cexts/**/*.bc
@@ -96,41 +84,6 @@ test/mri/tests/cext-c/**/*.o
 /bench-results.json
 /bench-results-processed.json
 
-# Gem dirs
-lib/ruby/gems/2.4.0/*
-!lib/ruby/gems/2.4.0/gems
-lib/ruby/gems/2.4.0/gems/*
-!lib/ruby/gems/2.4.0/gems/did_you_mean-1.1.0
-!lib/ruby/gems/2.4.0/gems/minitest-5.10.1
-!lib/ruby/gems/2.4.0/gems/net-telnet-0.1.1
-!lib/ruby/gems/2.4.0/gems/power_assert-0.4.1
-!lib/ruby/gems/2.4.0/gems/rake-12.0.0
-!lib/ruby/gems/2.4.0/gems/test-unit-3.2.3
-!lib/ruby/gems/2.4.0/gems/xmlrpc-0.2.1
-
-!lib/ruby/gems/2.4.0/specifications
-!lib/ruby/gems/2.4.0/specifications/truffleruby_gem_dir_marker.txt
-lib/ruby/gems/2.4.0/specifications/*
-!lib/ruby/gems/2.4.0/specifications/default
-!lib/ruby/gems/2.4.0/specifications/did_you_mean-1.1.0.gemspec
-!lib/ruby/gems/2.4.0/specifications/minitest-5.10.1.gemspec
-!lib/ruby/gems/2.4.0/specifications/net-telnet-0.1.1.gemspec
-!lib/ruby/gems/2.4.0/specifications/power_assert-0.4.1.gemspec
-!lib/ruby/gems/2.4.0/specifications/rake-12.0.0.gemspec
-!lib/ruby/gems/2.4.0/specifications/test-unit-3.2.3.gemspec
-!lib/ruby/gems/2.4.0/specifications/xmlrpc-0.2.1.gemspec
-
-# Bin directory
-bin/*
-!bin/gem
-!bin/irb
-!bin/rake
-!bin/rdoc
-!bin/ri
-!bin/ruby
-!bin/truffleruby.sh
-!bin/testrb
-
 # Diagnostic output directory
 dumps/
 

bin/ruby

@@ -76,9 +76,7 @@ local part_definitions = {
     build: {
       setup+: [
         ["mx", "sversions"],
-      ] + self.before_build + [
-        ["mx", "build_truffleruby"],
-      ] + self.after_build,
+      ] + self.before_build + jt(["build"]) + self.after_build,
     },
 
     truffleruby: {
@@ -316,23 +314,6 @@ local part_definitions = {
         path+:: ["$JAVA_HOME/bin"],
       },
     },
-
-    oraclejdk11: {
-      downloads+: {
-        JAVA_HOME: {
-          name: "oraclejdk",
-          version: "11+20",
-          platformspecific: true,
-        },
-
-        # We need a JDK 8 to compile TruffleRuby
-        EXTRA_JAVA_HOMES: $.jdk.labsjdk8.downloads["JAVA_HOME"],
-      },
-
-      environment+: {
-        path+:: ["$JAVA_HOME/bin"],
-      },
-    },
   },
 
   platform: {
@@ -380,7 +361,6 @@ local part_definitions = {
       capabilities+: self["$.cap"].normal_machine,
       targets+: ["deploy", "post-merge"],
     },
-    fast_cpu: { capabilities+: ["fast"] },
     bench: { capabilities+: self["$.cap"].bench_machine },
     x52_18_override: {
       is_after+:: ["$.cap.bench"],
@@ -553,38 +533,30 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
 
   test_builds:
     {
-      local shared = $.jdk.labsjdk8 + $.use.common + $.use.build + $.cap.gate +
-                     $.run.test_unit_tck_specs + { timelimit: "35:00" },
-
-      "ruby-test-specs-linux": $.platform.linux + shared,
-      "ruby-test-specs-darwin": $.platform.darwin + shared,
-    } +
-
-    {
-      "ruby-test-fast-java11-linux": $.platform.linux + $.jdk.oraclejdk11 + $.use.common + $.use.build + $.cap.gate +
-                                    $.run.test_fast + { timelimit: "30:00" },
+      "ruby-lint": $.platform.linux + $.cap.gate + $.jdk.labsjdk8 + $.use.common + $.run.lint + { timelimit: "30:00" },
     } +
 
     {
-      local linux_gate = $.platform.linux + $.cap.gate + $.jdk.labsjdk8 + $.use.common + { timelimit: "01:00:00" },
+      local linux_gate = $.platform.linux + $.cap.gate + $.jdk.labsjdk8 + $.use.common + $.use.build + { timelimit: "01:00:00" },
 
-      "ruby-lint": linux_gate + $.run.lint + { timelimit: "30:00" },
-      "ruby-test-mri-linux": $.cap.fast_cpu + linux_gate + $.use.build + $.run.test_mri + { timelimit: "25:00" },
-      "ruby-test-integration": linux_gate + $.use.build + $.run.test_integration,
-      "ruby-test-cexts-linux": linux_gate + $.use.build + $.use.gem_test_pack + $.run.test_cexts,
-      "ruby-test-gems": linux_gate + $.use.build + $.use.gem_test_pack + $.run.test_gems,
-      "ruby-test-ecosystem": linux_gate + $.use.build + $.use.gem_test_pack + $.run.test_ecosystem,
+      "ruby-test-specs-linux": linux_gate + $.run.test_unit_tck_specs + { timelimit: "35:00" },
+      "ruby-test-fast-linux":  linux_gate + $.run.test_fast + { timelimit: "30:00" }, # To catch missing slow tags
+      "ruby-test-mri-linux":   linux_gate + $.run.test_mri + { timelimit: "25:00" },
+      "ruby-test-integration": linux_gate + $.run.test_integration,
+      "ruby-test-cexts-linux": linux_gate + $.use.gem_test_pack + $.run.test_cexts,
+      "ruby-test-gems":        linux_gate + $.use.gem_test_pack + $.run.test_gems,
+      "ruby-test-ecosystem":   linux_gate + $.use.gem_test_pack + $.run.test_ecosystem,
 
-      "ruby-test-compiler-graal-core": linux_gate + $.use.build + $.use.truffleruby + $.graal.core +
-                                       $.run.test_compiler,
+      "ruby-test-compiler-graal-core": linux_gate + $.use.truffleruby + $.graal.core + $.run.test_compiler,
       # TODO was commented out, needs to be rewritten?
       # {name: "ruby-test-compiler-graal-enterprise"} + linux_gate + $.graal_enterprise + {run: jt(["test", "compiler"])},
     } +
 
     {
       local darwin_gate = $.platform.darwin + $.cap.gate + $.jdk.labsjdk8 + $.use.common + $.use.build + { timelimit: "01:00:00" },
 
-      "ruby-test-mri-darwin": darwin_gate + $.run.test_mri,
+      "ruby-test-specs-darwin": darwin_gate + $.run.test_unit_tck_specs + { timelimit: "35:00" },
+      "ruby-test-mri-darwin":   darwin_gate + $.run.test_mri,
       "ruby-test-cexts-darwin": darwin_gate + $.use.gem_test_pack + $.run.test_cexts,
     } +
 
@@ -603,7 +575,7 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
     } + {
       local shared = $.use.build + $.svm.enterprise + { timelimit: "01:15:00" },
 
-      "ruby-test-svm-graal-enterprise-linux": shared + svm_test_platforms.linux + $.cap.fast_cpu,
+      "ruby-test-svm-graal-enterprise-linux": shared + svm_test_platforms.linux,
       "ruby-test-svm-graal-enterprise-darwin": shared + svm_test_platforms.darwin,
     },
 

bin/truffleruby.sh

@@ -21,7 +21,12 @@ extern "C" {
 #define TRUFFLERUBY
 
 #include <sulong/truffle.h>
+
+#ifdef SULONG_POLYGLOT_H
+#include SULONG_POLYGLOT_H
+#else
 #include <sulong/polyglot.h>
+#endif
 
 #include <ctype.h> // isdigit