diff options
| author | svidyuk <svidyuk@yandex-team.com> | 2024-12-10 05:46:10 +0300 |
|---|---|---|
| committer | svidyuk <svidyuk@yandex-team.com> | 2024-12-10 06:06:32 +0300 |
| commit | eebc72eb00185f8053096ff6181ce862516bc68c (patch) | |
| tree | 7b4703acd834602adc33ff98810e26e78a3a1beb /build/plugins/java.py | |
| parent | 09e8c873de1528ff579725de6fc52f100d1165f8 (diff) | |
| download | ydb-eebc72eb00185f8053096ff6181ce862516bc68c.tar.gz | |
Clean dead jbuild related code from java plugin
commit_hash:4ca69fda6fd766a1225e818c8fadbc0aeaf4b72a
Diffstat (limited to 'build/plugins/java.py')
| -rw-r--r-- | build/plugins/java.py | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/build/plugins/java.py b/build/plugins/java.py index 1b7fe247c8..b3a4de384b 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -72,8 +72,6 @@ def onjava_module(unit, *args): 'JAVA_SRCS': extract_macro_calls(unit, 'JAVA_SRCS_VALUE', args_delim), 'JAVAC_FLAGS': extract_macro_calls(unit, 'JAVAC_FLAGS_VALUE', args_delim), 'ANNOTATION_PROCESSOR': extract_macro_calls(unit, 'ANNOTATION_PROCESSOR_VALUE', args_delim), - 'EXTERNAL_JAR': [], - 'MAVEN_GROUP_ID': [], 'JAR_INCLUDE_FILTER': extract_macro_calls(unit, 'JAR_INCLUDE_FILTER_VALUE', args_delim), 'JAR_EXCLUDE_FILTER': extract_macro_calls(unit, 'JAR_EXCLUDE_FILTER_VALUE', args_delim), # TODO remove when java test dart is in prod @@ -170,15 +168,14 @@ def onjava_module(unit, *args): ) data['WITH_JDK'] = extract_macro_calls(unit, 'WITH_JDK_VALUE', args_delim) - if not data['EXTERNAL_JAR']: - # IMPORTANT before switching vcs_info.py to python3 the value was always evaluated to $YMAKE_PYTHON but no - # code in java dart parser extracts its value only checks this key for existance. - data['EMBED_VCS'] = [['yes']] - # FORCE_VCS_INFO_UPDATE is responsible for setting special value of VCS_INFO_DISABLE_CACHE__NO_UID__ - macro_val = extract_macro_calls(unit, 'FORCE_VCS_INFO_UPDATE', args_delim) - macro_str = macro_val[0][0] if macro_val and macro_val[0] and macro_val[0][0] else '' - if macro_str and macro_str == 'yes': - data['VCS_INFO_DISABLE_CACHE__NO_UID__'] = macro_val + # IMPORTANT before switching vcs_info.py to python3 the value was always evaluated to $YMAKE_PYTHON but no + # code in java dart parser extracts its value only checks this key for existance. + data['EMBED_VCS'] = [['yes']] + # FORCE_VCS_INFO_UPDATE is responsible for setting special value of VCS_INFO_DISABLE_CACHE__NO_UID__ + macro_val = extract_macro_calls(unit, 'FORCE_VCS_INFO_UPDATE', args_delim) + macro_str = macro_val[0][0] if macro_val and macro_val[0] and macro_val[0][0] else '' + if macro_str and macro_str == 'yes': + data['VCS_INFO_DISABLE_CACHE__NO_UID__'] = macro_val for java_srcs_args in data['JAVA_SRCS']: external = None @@ -236,18 +233,7 @@ def on_add_detekt_report_check(unit, *args): unit.onadd_check(['detekt.report'] + list(args)) -# Ymake java modules related macroses - - -def onexternal_jar(unit, *args): - args = list(args) - flat, kv = common.sort_by_keywords({'SOURCES': 1}, args) - if not flat: - ymake.report_configure_error('EXTERNAL_JAR requires exactly one resource URL of compiled jar library') - res = flat[0] - resid = res[4:] if res.startswith('sbr:') else res - unit.set(['JAR_LIB_RESOURCE', resid]) - unit.set(['JAR_LIB_RESOURCE_URL', res]) +# Ymake java modules related macros def on_check_java_srcdir(unit, *args): |