Skip to content

Commit eebc72e

Browse files
committed
Clean dead jbuild related code from java plugin
commit_hash:4ca69fda6fd766a1225e818c8fadbc0aeaf4b72a
1 parent 09e8c87 commit eebc72e

File tree

1 file changed

+9
-23
lines changed

1 file changed

+9
-23
lines changed

build/plugins/java.py

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ def onjava_module(unit, *args):
7272
'JAVA_SRCS': extract_macro_calls(unit, 'JAVA_SRCS_VALUE', args_delim),
7373
'JAVAC_FLAGS': extract_macro_calls(unit, 'JAVAC_FLAGS_VALUE', args_delim),
7474
'ANNOTATION_PROCESSOR': extract_macro_calls(unit, 'ANNOTATION_PROCESSOR_VALUE', args_delim),
75-
'EXTERNAL_JAR': [],
76-
'MAVEN_GROUP_ID': [],
7775
'JAR_INCLUDE_FILTER': extract_macro_calls(unit, 'JAR_INCLUDE_FILTER_VALUE', args_delim),
7876
'JAR_EXCLUDE_FILTER': extract_macro_calls(unit, 'JAR_EXCLUDE_FILTER_VALUE', args_delim),
7977
# TODO remove when java test dart is in prod
@@ -170,15 +168,14 @@ def onjava_module(unit, *args):
170168
)
171169
data['WITH_JDK'] = extract_macro_calls(unit, 'WITH_JDK_VALUE', args_delim)
172170

173-
if not data['EXTERNAL_JAR']:
174-
# IMPORTANT before switching vcs_info.py to python3 the value was always evaluated to $YMAKE_PYTHON but no
175-
# code in java dart parser extracts its value only checks this key for existance.
176-
data['EMBED_VCS'] = [['yes']]
177-
# FORCE_VCS_INFO_UPDATE is responsible for setting special value of VCS_INFO_DISABLE_CACHE__NO_UID__
178-
macro_val = extract_macro_calls(unit, 'FORCE_VCS_INFO_UPDATE', args_delim)
179-
macro_str = macro_val[0][0] if macro_val and macro_val[0] and macro_val[0][0] else ''
180-
if macro_str and macro_str == 'yes':
181-
data['VCS_INFO_DISABLE_CACHE__NO_UID__'] = macro_val
171+
# IMPORTANT before switching vcs_info.py to python3 the value was always evaluated to $YMAKE_PYTHON but no
172+
# code in java dart parser extracts its value only checks this key for existance.
173+
data['EMBED_VCS'] = [['yes']]
174+
# FORCE_VCS_INFO_UPDATE is responsible for setting special value of VCS_INFO_DISABLE_CACHE__NO_UID__
175+
macro_val = extract_macro_calls(unit, 'FORCE_VCS_INFO_UPDATE', args_delim)
176+
macro_str = macro_val[0][0] if macro_val and macro_val[0] and macro_val[0][0] else ''
177+
if macro_str and macro_str == 'yes':
178+
data['VCS_INFO_DISABLE_CACHE__NO_UID__'] = macro_val
182179

183180
for java_srcs_args in data['JAVA_SRCS']:
184181
external = None
@@ -236,18 +233,7 @@ def on_add_detekt_report_check(unit, *args):
236233
unit.onadd_check(['detekt.report'] + list(args))
237234

238235

239-
# Ymake java modules related macroses
240-
241-
242-
def onexternal_jar(unit, *args):
243-
args = list(args)
244-
flat, kv = common.sort_by_keywords({'SOURCES': 1}, args)
245-
if not flat:
246-
ymake.report_configure_error('EXTERNAL_JAR requires exactly one resource URL of compiled jar library')
247-
res = flat[0]
248-
resid = res[4:] if res.startswith('sbr:') else res
249-
unit.set(['JAR_LIB_RESOURCE', resid])
250-
unit.set(['JAR_LIB_RESOURCE_URL', res])
236+
# Ymake java modules related macros
251237

252238

253239
def on_check_java_srcdir(unit, *args):

0 commit comments

Comments
 (0)