Kaydet (Commit) c7c8e801 authored tarafından Caolán McNamara's avatar Caolán McNamara

lower java build-time verbosity

üst f7a3f2ac
...@@ -963,10 +963,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc ...@@ -963,10 +963,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
VERBOSITY=-verbose VERBOSITY=-verbose
.ELSE .ELSE
COMMAND_ECHO=@ COMMAND_ECHO=@
.IF "$(VERBOSE)" == "FALSE" VERBOSITY=-quiet
VERBOSITY=-quiet ZIP_VERBOSITY=-q
ZIP_VERBOSITY=-q
.ENDIF
.ENDIF # "$(VERBOSE)" == "TRUE" .ENDIF # "$(VERBOSE)" == "TRUE"
COMPILE_ECHO_SWITCH= COMPILE_ECHO_SWITCH=
COMPILE_ECHO_FILE=$(<:f) COMPILE_ECHO_FILE=$(<:f)
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#************************************************************************* #*************************************************************************
.IF "$(VERBOSE)"=="FALSE" .IF "$(VERBOSE)"!="TRUE"
ZIP_VERBOSITY=-q ZIP_VERBOSITY=-q
.ENDIF .ENDIF
......
...@@ -53,23 +53,23 @@ $(CLASSDIR)/%.class .NOINFER .IGNORE : %.java ...@@ -53,23 +53,23 @@ $(CLASSDIR)/%.class .NOINFER .IGNORE : %.java
$(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES) $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES)
.IF "$(JAVARESPONSE)"!="" .IF "$(JAVARESPONSE)"!=""
$(JAVAC) @<< $(COMMAND_ECHO)$(JAVAC) @<<
$(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
<<keep <<keep
.ELSE # "$(JAVARESPONSE)"!="" .ELSE # "$(JAVARESPONSE)"!=""
.IF "$(use_jdep)"!="" .IF "$(use_jdep)"!=""
$(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) $(COMMAND_ECHO)$(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
.ELSE # "$(use_jdep)"!="" .ELSE # "$(use_jdep)"!=""
.IF "$(javauno)"!="" .IF "$(javauno)"!=""
.IF "$(JAVAFILES:d)"=="" .IF "$(JAVAFILES:d)"==""
$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES)
.ELSE # "$(JAVAFILES:d)"=="" .ELSE # "$(JAVAFILES:d)"==""
@@$(TOUCH) $(INPATH)_$(VCSID)_a_dummy.java @@$(TOUCH) $(INPATH)_$(VCSID)_a_dummy.java
$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java")) $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) ./*.java $(uniq $(JAVAFILES:d:+"*.java"))
@@-$(RM) $(INPATH)_$(VCSID)_a_dummy.java @@-$(RM) $(INPATH)_$(VCSID)_a_dummy.java
.ENDIF # "$(JAVAFILES:d)"=="" .ENDIF # "$(JAVAFILES:d)"==""
.ELSE # "$(javauno)"!="" .ELSE # "$(javauno)"!=""
$(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES))) $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) "$(CLASSPATH)" -d $(CLASSDIR) $(JAVAFLAGS) @$(mktmp $(strip $(JAVAFILES)))
.ENDIF # "$(javauno)"!="" .ENDIF # "$(javauno)"!=""
.ENDIF # "$(use_jdep)"!="" .ENDIF # "$(use_jdep)"!=""
.ENDIF # "$(JAVARESPONSE)"!="" .ENDIF # "$(JAVARESPONSE)"!=""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment