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

Reviewed-by: dholmes, ohair
This commit is contained in:
Stuart Marks 2011-11-30 13:11:16 -08:00
parent 8b11c10364
commit af629d027c

View File

@ -233,13 +233,15 @@ classes : $(CLASSES_INIT) .delete.classlist .compile.classlist
@$(MKDIR) -p $(CLASSDESTDIR) @$(MKDIR) -p $(CLASSDESTDIR)
@$(RM) $<.filtered @$(RM) $<.filtered
@$(CAT) $< | $(NAWK) 'length>0' | $(SORT) -u > $<.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) @$(java-vm-cleanup)
clobber clean:: clobber clean::