diff options
| author | ruki <[email protected]> | 2026-02-27 23:00:14 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-02-27 23:00:14 +0800 |
| commit | 71e10b70334401d46c47f574c8f46fcd20ccf818 (patch) | |
| tree | 49912fb7396cec8b0d40b43618f53560dcec0dd5 | |
| parent | 07ece4e1121e1e5ed899e65302423ce4e08c6948 (diff) | |
| parent | 95d7fb54eeb5851326244591e7ba656d12228b2b (diff) | |
Merge pull request #7352 from binLep/dev
do not fix the JDK version in the swig rules
| -rw-r--r-- | xmake/rules/swig/build_module_file.lua | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/xmake/rules/swig/build_module_file.lua b/xmake/rules/swig/build_module_file.lua index a8a678cf7..9dfc9d6e5 100644 --- a/xmake/rules/swig/build_module_file.lua +++ b/xmake/rules/swig/build_module_file.lua @@ -66,7 +66,13 @@ function jar_build(target, fileconfig, opt) -- compile to class file progress.show(opt.progress, "${color.build.object}compiling.javac %s class file", target:name()) - os.vrunv(javac.program, {"--release", "17", "-d", java_class_dir, "@" .. filelistname}) + local argv = {"-d", java_class_dir, "@" .. filelistname} + local java_release = target:extraconf("rules", "swig.c", "java_release") or target:extraconf("rules", "swig.cpp", "java_release") + if java_release then + table.insert(argv, 1, tostring(java_release)) + table.insert(argv, 1, "--release") + end + os.vrunv(javac.program, argv) -- generate jar file progress.show(opt.progress, "${color.build.object}compiling.jar %s", target:name() .. ".jar") |