Fix RUN_JAVA_PROGRAM classpath in old_commands

Fix RUN_JAVA_PROGRAM classpath in old_commands
commit_hash:6709ff44e57146fa40f8cba21da81613736bd2d4

1 files changed, 1 insertions, 14 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index a3cbe607c3..bc18623f91 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -475,25 +475,12 @@ JDK_LATEST_PEERDIR=build/platform/java/jdk/jdk${JDK_LATEST_VERSION}
 
 # tag:java-specific
 # Fill semantic by RUN_JAVA_PROGRAM()
-_SEM_RUN_JAVA_PROGRAM=runs-ITEM \
-    && runs-args ${Args} \
-    && runs-classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} \
-    && runs-cwd ${CWD} ${hide;cwd:CWD} \
-    && runs-in ${IN} ${hide;input:IN} \
-    && runs-in_dir ${IN_DIR} \
-    && runs-in_dirs_inputs ${IN_DIRS_INPUTS} \
-    && runs-in_noparse ${IN_NOPARSE} ${hide;context=TEXT;input:IN_NOPARSE} \
-    && runs-out ${OUT} ${hide;output:OUT} ${OUT_NOAUTO} ${hide;noauto;output:OUT_NOAUTO} \
-    $_GENTAR_HELPER(HASH_SUF $HASH_SUF OUT_DIR $OUT_DIR) \
-    && runs-out_dir ${OUT_DIR} \
-    && runs-tool ${TOOL} ${hide;tool:TOOL}
-
 macro _DO_2_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq_", IN_DIRS_INPUTS[], IN{input}[], IN_NOPARSE{input}[], IN_DIR[], OUT_NOAUTO{output}[], OUT{output}[], TOOL{tool}[], OUT_DIR[], CLASSPATH[], ADD_SRCS_TO_CLASSPATH?"yes":"no", CWD="${ARCADIA_BUILD_ROOT}", STDOUT="", STDOUT_NOAUTO="", HASH_SUF="hash_suf", Args...) {
     _LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR})
     _CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH)
     .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
     .CMD=${hide;kv:"p RJ"} ${hide;kv:"pc blue"} ${hide:JAVA_FAKEID} ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} ${pre=--file=:STDOUT} ${hide;output:STDOUT} ${pre=--file=:STDOUT_NOAUTO} ${hide;noauto;output:STDOUT_NOAUTO} $YMAKE_PYTHON ${input:"build/scripts/fix_java_command_file_cp.py"} --build-root ${ARCADIA_BUILD_ROOT} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} ${Args} && $_GENTAR_HELPER(HASH_SUF $HASH_SUF OUT_DIR $OUT_DIR) ${hide;input:IN} ${hide;context=TEXT;input:IN_NOPARSE} ${hide;noauto;output:OUT_NOAUTO} ${hide;output:OUT} ${hide;tool:TOOL} ${IN_DIRS_INPUTS}
-    .SEM=$_SEM_RUN_JAVA_PROGRAM
+    .SEM=runs-ITEM && runs-args ${Args} && runs-classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} && runs-cwd ${CWD} ${hide;cwd:CWD} && runs-in ${IN} ${hide;input:IN} && runs-in_dir ${IN_DIR} && runs-in_dirs_inputs ${IN_DIRS_INPUTS} && runs-in_noparse ${IN_NOPARSE} ${hide;context=TEXT;input:IN_NOPARSE} && runs-out ${OUT} ${hide;output:OUT} ${OUT_NOAUTO} ${hide;noauto;output:OUT_NOAUTO} $_GENTAR_HELPER(HASH_SUF $HASH_SUF OUT_DIR $OUT_DIR) && runs-out_dir ${OUT_DIR} && runs-tool ${TOOL} ${hide;tool:TOOL}
 }
 
 # tag:java-specific