7116322: enhance javac make rule with a little bit of instrumentation

Reviewed-by: dholmes, ohair

7116322: enhance javac make rule with a little bit of instrumentation
Reviewed-by: dholmes, ohair
7756546b · smarks · 3e00a900 · 7756546b
隐藏空白更改
内联并排

Showing with 9 addition and 7 deletion

make/common/Rules.gmk make/common/Rules.gmk +9 -7

未找到文件。
--- a/make/common/Rules.gmk
+++ b/make/common/Rules.gmk
@@ -233,13 +233,15 @@ classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
 	@$(MKDIR) -p $(CLASSDESTDIR)
 	@$(RM) $<.filtered
 	@$(CAT) $< | $(NAWK) 'length>0' | $(SORT) -u > $<.filtered
-	@if [ `$(CAT) $<.filtered | $(WC) -l` -ge 1 ] ; then \
+	@numfiles=`$(WC) -l < $<.filtered` ; \
-	  $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
+	  if [ $$numfiles -ge 1 ] ; then \
-	  $(CAT) $<.filtered; \
+	    $(ECHO) "# Java sources to be compiled: (listed in file $<)"; \
-	  $(ECHO) "# Running javac:"; \
+	    $(CAT) $<.filtered; \
-	  $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
+	    $(ECHO) "# Running javac: $$numfiles files; in $(CURDIR)"; \
-	  $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
+	    $(ECHO) $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
-	fi
+	    $(JAVAC_CMD) -sourcepath "$(SOURCEPATH)" -d $(CLASSDESTDIR) @$<.filtered; \
+	    $(ECHO) "# javac finished"; \
+	  fi
 	@$(java-vm-cleanup)
 clobber clean::