diff options
| author | snermolaev <[email protected]> | 2023-08-23 13:13:14 +0300 |
|---|---|---|
| committer | snermolaev <[email protected]> | 2023-08-23 13:39:26 +0300 |
| commit | 44c8fb2f95b53dd472c1948a570ca8b1839cce12 (patch) | |
| tree | fbb973bd8bea7c55de8af18d7871a45aa3be4464 | |
| parent | c2b7e433f01acec50fecd31ceef90b2855e11c79 (diff) | |
java.conf cleanup
| -rw-r--r-- | build/conf/java.conf | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index ce4ab88975e..e010434ef56 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -928,6 +928,8 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE { .SEM=IGNORED .ALIASES=JAVA_SRCS=_MARK_JAVA_PROG_WITH_SOURCES GENERATE_SCRIPT=_YMAKE_GENERATE_SCRIPT .ALLOWED=WITH_JDK + .PEERDIR_POLICY=as_build_from + MODULE_SUFFIX=.run.cp.jar CONSUME_NON_MANAGEABLE_PEERS=yes @@ -960,23 +962,6 @@ module _JAR_RUNNABLE: _COMPILABLE_JAR_BASE { } # tag:java-specific -multimodule JAR_PROGRAM { - module JAR_RUNNABLE: _JAR_RUNNABLE { - .ALLOWED=JAVA_RUNTIME_PEERDIR JAVA_RUNTIME_EXCLUDE - .IGNORED=JAVA_SRCS RUN_JAVA_PROGRAM - .ALIASES=EXCLUDE=_NOOP_MACRO PEERDIR=_NOOP_MACRO DEPENDENCY_MANAGEMENT=_NOOP_MACRO JAVA_RUNTIME_PEERDIR=PEERDIR JAVA_RUNTIME_EXCLUDE=EXCLUDE - .PEERDIRSELF=JAR_COMPILATION - - SET(MODULE_TYPE JAVA_PROGRAM) - } - module JAR_COMPILATION: JAR_LIBRARY { - .ALIASES=JAVA_RUNTIME_PEERDIR=_NOOP_MACRO JAVA_RUNTIME_EXCLUDE=_NOOP_MACRO - .FINAL_TARGET=no - SET(MODULE_TYPE JAVA_PROGRAM) - } -} - -# tag:java-specific LINK_JAR_TEST=${hide:JAVA_FAKEID} ${WRITER_PY} --file ${BINDIR}/run-bf.txt -Q -m --ya-start-command-file ${ext=.jar:MANAGED_PEERS_CLOSURE} --ya-end-command-file && ${YMAKE_PYTHON} ${input:"build/scripts/make_manifest_from_bf.py"} ${BINDIR}/run-bf.txt ${TARGET} ${kv;hide:"p JT"} YMAKE_JAVA_TEST= module _JAR_TEST: _COMPILABLE_JAR_BASE { |