diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-18 16:52:31 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-18 16:52:31 +0300 |
| commit | 0b4d0ede021bd3bafd57a12ba2c2bd1e169d3b98 (patch) | |
| tree | f5dad0c0972b3bd7a0f347f98e92f8a5c0ab092c /build/plugins/java.py | |
| parent | 08175bcf3740a32777cc5d96808cfebd8964015f (diff) | |
| download | ydb-0b4d0ede021bd3bafd57a12ba2c2bd1e169d3b98.tar.gz | |
intermediate changes
ref:229e63fc55edd4f3ea20281b9912eee8e8551533
Diffstat (limited to 'build/plugins/java.py')
| -rw-r--r-- | build/plugins/java.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build/plugins/java.py b/build/plugins/java.py index 5bff16027f..7fd7d98e2e 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -110,7 +110,6 @@ def onjava_module(unit, *args): 'SYSTEM_PROPERTIES': extract_macro_calls(unit, 'SYSTEM_PROPERTIES_VALUE', args_delim), 'JVM_ARGS': extract_macro_calls(unit, 'JVM_ARGS_VALUE', args_delim), 'TEST_CWD': extract_macro_calls(unit, 'TEST_CWD_VALUE', args_delim), - 'TEST_DATA': extract_macro_calls(unit, '__test_data', args_delim), 'TEST_FORK_MODE': extract_macro_calls(unit, 'TEST_FORK_MODE', args_delim), 'SPLIT_FACTOR': extract_macro_calls(unit, 'TEST_SPLIT_FACTOR', args_delim), 'TIMEOUT': extract_macro_calls(unit, 'TEST_TIMEOUT', args_delim), @@ -286,6 +285,7 @@ def on_fill_jar_copy_resources_cmd(unit, *args): var += ' && $FS_TOOLS copy_files {} {} {}'.format(srcdir if srcdir.startswith('"$') else '${CURDIR}/' + srcdir, dest_dir, reslist) unit.set([varname, var]) + def on_fill_jar_gen_srcs(unit, *args): varname, jar_type, srcdir, base_classes_dir, java_list, kt_list, groovy_list, res_list = tuple(args[0:8]) resolved_srcdir = unit.resolve_arc_path(srcdir) @@ -365,10 +365,11 @@ def on_ymake_generate_script(unit, *args): for out, tmpl, props in parse_words(list(args)): unit.on_add_gen_java_script([out, tmpl] + list(props)) + def on_jdk_version_macro_check(unit, *args): if len(args) != 1: unit.message(["error", "Invalid syntax. Single argument required."]) jdk_version = args[0] - availible_versions = ('10', '11', '12', '13', '14', '15', '16', '17',) - if jdk_version not in availible_versions: - unit.message(["error", "Invalid jdk version: {}. {} are availible".format(jdk_version, availible_versions)]) + available_versions = ('10', '11', '12', '13', '14', '15', '16', '17',) + if jdk_version not in available_versions: + unit.message(["error", "Invalid jdk version: {}. {} are available".format(jdk_version, available_versions)]) |