Skip to content

Commit

Permalink
[GR-17457] Update all env files to use include lists, be consistent a…
Browse files Browse the repository at this point in the history
…nd have a clear relation between them

PullRequest: truffleruby/3320
  • Loading branch information
eregon committed May 3, 2022
2 parents 4abd9b2 + 0d4e4dd commit 50a95cf
Show file tree
Hide file tree
Showing 13 changed files with 46 additions and 33 deletions.
14 changes: 14 additions & 0 deletions mx.truffleruby/env_files.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Here is how the various env files relate to each other:
* `jvm`
* `jvm-ce`: + Graal CE
* `jvm-ce-ntl`: + native toolchain launchers
* `jvm-ce-libgraal`: + libgraal
* `native`: + librubyvm
* `jvm-ee`: + Graal EE
* `jvm-ee-ntl`: + native toolchain launchers
* `jvm-ee-libgraal`: + libgraal
* `native-ee`: + librubyvm
* `native-ee-g1`: + Native Image G1
* `jvm-gu`: + Graal Updater
* `jvm-js`: + Graal.js
* `jvm-py`: + GraalPython
4 changes: 2 additions & 2 deletions mx.truffleruby/jvm-ce
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DYNAMIC_IMPORTS=/compiler,/tools
COMPONENTS=TruffleRuby,GraalVM compiler,suite:tools
DYNAMIC_IMPORTS=/tools,/compiler
COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler
8 changes: 3 additions & 5 deletions mx.truffleruby/jvm-ce-libgraal
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
DYNAMIC_IMPORTS=/compiler,/substratevm,/tools
COMPONENTS=TruffleRuby,GraalVM compiler,SubstrateVM,LibGraal,suite:tools
# NATIVE_IMAGES=lib:jvmcicompiler,graalvm-native-*
FORCE_BASH_LAUNCHERS=truffleruby
SKIP_LIBRARIES=false
DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,LibGraal
NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
9 changes: 3 additions & 6 deletions mx.truffleruby/jvm-ce-ntl
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# "ntl" stands for native toolchain launchers
DYNAMIC_IMPORTS=/substratevm,/tools
COMPONENTS=TruffleRuby,SubstrateVM,suite:tools
# NATIVE_IMAGES=graalvm-native-*
FORCE_BASH_LAUNCHERS=truffleruby
DISABLE_INSTALLABLES=false
DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM
NATIVE_IMAGES=suite:sulong
4 changes: 2 additions & 2 deletions mx.truffleruby/jvm-ee
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DYNAMIC_IMPORTS=/graal-enterprise,/tools
COMPONENTS=TruffleRuby,GraalVM enterprise compiler,suite:tools
DYNAMIC_IMPORTS=/tools,/graal-enterprise
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler
8 changes: 3 additions & 5 deletions mx.truffleruby/jvm-ee-libgraal
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
DYNAMIC_IMPORTS=/graal-enterprise,/substratevm-enterprise,/tools
COMPONENTS=TruffleRuby,GraalVM enterprise compiler,SubstrateVM Enterprise,LibGraal,suite:tools
# NATIVE_IMAGES=lib:jvmcicompiler,graalvm-native-*
FORCE_BASH_LAUNCHERS=truffleruby
SKIP_LIBRARIES=false
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise,LibGraal
NATIVE_IMAGES=suite:sulong,lib:jvmcicompiler
3 changes: 3 additions & 0 deletions mx.truffleruby/jvm-ee-ntl
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise
NATIVE_IMAGES=suite:sulong
4 changes: 2 additions & 2 deletions mx.truffleruby/jvm-gu
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DYNAMIC_IMPORTS=/vm,/tools
COMPONENTS=TruffleRuby,gu,suite:tools
DYNAMIC_IMPORTS=/tools,/vm
COMPONENTS=TruffleRuby,suite:tools,gu
2 changes: 1 addition & 1 deletion mx.truffleruby/jvm-js
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DYNAMIC_IMPORTS=/tools,/graal-js
COMPONENTS=TruffleRuby,Graal.js,suite:tools
COMPONENTS=TruffleRuby,suite:tools,Graal.js
2 changes: 1 addition & 1 deletion mx.truffleruby/jvm-py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DYNAMIC_IMPORTS=/tools,graalpython
COMPONENTS=TruffleRuby,Graal.Python,suite:tools
COMPONENTS=TruffleRuby,suite:tools,Graal.Python
7 changes: 4 additions & 3 deletions mx.truffleruby/native
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
DYNAMIC_IMPORTS=/substratevm,/tools
COMPONENTS=TruffleRuby,SubstrateVM,suite:tools
NATIVE_IMAGES=true
DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM
NATIVE_IMAGES=suite:sulong,lib:rubyvm
# To also create the standalone
DISABLE_INSTALLABLES=false
7 changes: 4 additions & 3 deletions mx.truffleruby/native-ee
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
DYNAMIC_IMPORTS=/substratevm-enterprise,/tools
COMPONENTS=TruffleRuby,SubstrateVM Enterprise,suite:tools
NATIVE_IMAGES=true
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise
NATIVE_IMAGES=suite:sulong,lib:rubyvm
EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+AuxiliaryEngineCache rubyvm:-H:ReservedAuxiliaryImageBytes=1073741824
# To also create the standalone
DISABLE_INSTALLABLES=false
7 changes: 4 additions & 3 deletions mx.truffleruby/native-ee-g1
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
DYNAMIC_IMPORTS=/substratevm-enterprise,substratevm-enterprise-gcs,/tools
COMPONENTS=TruffleRuby,SubstrateVM Enterprise,SubstrateVM Enterprise GC,suite:tools
NATIVE_IMAGES=true
DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise,substratevm-enterprise-gcs
COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise,SubstrateVM Enterprise GC
NATIVE_IMAGES=suite:sulong,lib:rubyvm
EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UseG1GC
# To also create the standalone
DISABLE_INSTALLABLES=false

0 comments on commit 50a95cf

Please sign in to comment.