Fix RUN_JAVA_PROGRAM semantics

Fix RUN_JAVA_PROGRAM semantics
79d080a29f60ef6f33d1197ed0bbfd103efeb60a

1 files changed, 9 insertions, 6 deletions

diff --git a/build/conf/java.conf b/build/conf/java.conf
index 6e5c3bfe8f..3d16350556 100644
--- a/build/conf/java.conf
+++ b/build/conf/java.conf
@@ -239,10 +239,13 @@ multimodule JTEST_FOR {
     }
 }
 
+# TODO Something for using tool in RUN_JAVA_PROGRAM
+_SEM_JAR_RUNNABLE=
 multimodule JAVA_CONTRIB_PROGRAM {
     module JAR_RUNNABLE: _JAR_RUNNABLE {
         .IGNORED=JAVA_SRCS RUN_JAR_PROGRAM RUN_JAVA_PROGRAM JAR_RESOURCE SRC_RESOURCE LOCAL_JAR
         .PEERDIRSELF=JAR_COMPILATION
+        .SEM=_SEM_JAR_RUNNABLE
 
         SET(MODULE_TYPE JAVA_PROGRAM)
         ENABLE(DISABLE_SCRIPTGEN)
@@ -419,21 +422,21 @@ _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:CWD} \
-    && runs-in ${IN} \
+    && 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} \
-    && runs-out ${OUT} \
+    && runs-in_noparse ${IN_NOPARSE} ${hide;input;context=TEXT:IN_NOPARSE} \
+    && runs-out ${OUT} ${hide;output:OUT} ${OUT_NOAUTO} ${hide;output;noauto:OUT_NOAUTO} ${hide;output;suf=.$_HASH_HELPER($CLASSPATH $IN_DIR $IN $IN_NOPARSE $TOOL $Args).gentar:OUT_DIR} \
     && runs-out_dir ${OUT_DIR} \
-    && runs-tool ${TOOL}
+    && 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="", Args...) {
     _LATE_GLOB(${IN_DIRS_VAR} ${suf=/**/*:IN_DIR})
     _CHECK_RUN_JAVA_PROG_CLASSPATH($CLASSPATH)
     .PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
     .CMD=${kv;hide:"p RJ"} ${kv;hide:"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} ${output;hide:STDOUT} ${pre=--file=:STDOUT_NOAUTO} ${output;hide;noauto: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($CLASSPATH $IN_DIR $IN $IN_NOPARSE $TOOL $Args OUT_DIR $OUT_DIR) ${input;hide:IN} ${input;context=TEXT;hide:IN_NOPARSE} ${output;noauto;hide:OUT_NOAUTO} ${output;hide:OUT} ${tool;hide:TOOL} ${IN_DIRS_INPUTS}
-    .SEM=_SEM_RUN_JAVA_PROGRAM
+    .SEM=$_SEM_RUN_JAVA_PROGRAM
 }
 
 # tag:java-specific