Skip to content

Commit

Permalink
Apply black formatting from the style gate
Browse files Browse the repository at this point in the history
Signed-off-by: Stefan Marr <[email protected]>
  • Loading branch information
smarr committed Oct 4, 2024
1 parent 41020f6 commit 10c2b3f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
30 changes: 17 additions & 13 deletions mx.trufflesom/mx_trufflesom.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,19 +124,21 @@ def build_native_image_tool(args, **kwargs):
svm_path = get_svm_path()
mx.run_mx(["build"], svm_path)


BASE_DIR = suite.dir
TRUFFLE_DIR = BASE_DIR + '/../graal'
TRUFFLE_DIR = BASE_DIR + "/../graal"

MODULE_PATH_ENTRIES = [
BASE_DIR + '/mxbuild/dists/trufflesom.jar',
TRUFFLE_DIR + '/sdk/mxbuild/dists/graal-sdk.jar',
TRUFFLE_DIR + '/sdk/mxbuild/dists/collections.jar',
TRUFFLE_DIR + '/sdk/mxbuild/dists/polyglot.jar',
TRUFFLE_DIR + '/sdk/mxbuild/dists/word.jar',
TRUFFLE_DIR + '/sdk/mxbuild/dists/jniutils.jar',
TRUFFLE_DIR + '/truffle/mxbuild/dists/truffle-runtime.jar',
TRUFFLE_DIR + '/substratevm/mxbuild/dists/truffle-runtime-svm.jar',
TRUFFLE_DIR + '/truffle/mxbuild/dists/truffle-api.jar']
BASE_DIR + "/mxbuild/dists/trufflesom.jar",
TRUFFLE_DIR + "/sdk/mxbuild/dists/graal-sdk.jar",
TRUFFLE_DIR + "/sdk/mxbuild/dists/collections.jar",
TRUFFLE_DIR + "/sdk/mxbuild/dists/polyglot.jar",
TRUFFLE_DIR + "/sdk/mxbuild/dists/word.jar",
TRUFFLE_DIR + "/sdk/mxbuild/dists/jniutils.jar",
TRUFFLE_DIR + "/truffle/mxbuild/dists/truffle-runtime.jar",
TRUFFLE_DIR + "/substratevm/mxbuild/dists/truffle-runtime-svm.jar",
TRUFFLE_DIR + "/truffle/mxbuild/dists/truffle-api.jar",
]


@mx.command(
Expand Down Expand Up @@ -173,7 +175,8 @@ def build_native(args, **kwargs):
"--no-fallback",
"--link-at-build-time",
"-H:+ReportExceptionStackTraces",
"-H:+UnlockExperimentalVMOptions", "-H:-DeleteLocalSymbols",
"-H:+UnlockExperimentalVMOptions",
"-H:-DeleteLocalSymbols",
"-Dsom.interp=" + opt.type,
]

Expand All @@ -197,12 +200,13 @@ def build_native(args, **kwargs):
# -H:+EnforceMaxRuntimeCompileMethods

cmd += [
'--module-path', ':'.join(MODULE_PATH_ENTRIES),
"--module-path",
":".join(MODULE_PATH_ENTRIES),
"-o",
suite.dir + output_name,
]

if opt.use_g1 and opt.graalvm and os.uname().sysname != 'Darwin':
if opt.use_g1 and opt.graalvm and os.uname().sysname != "Darwin":
cmd += ["--gc=G1"]

cmd += ["trufflesom.Launcher"]
Expand Down
4 changes: 3 additions & 1 deletion mx.trufflesom/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@
},
},
"dependencies": ["trufflesom"],
"distDependencies": ["truffle:TRUFFLE_API"], # , "tools:TRUFFLE_COVERAGE", "tools:TRUFFLE_PROFILER"
"distDependencies": [
"truffle:TRUFFLE_API"
], # , "tools:TRUFFLE_COVERAGE", "tools:TRUFFLE_PROFILER"
},
"TRUFFLESOM_TEST": {
"description": "TruffleSOM JUnit Tests",
Expand Down

0 comments on commit 10c2b3f

Please sign in to comment.