diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-12-22 09:49:39 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-12-22 10:44:27 +0000 |
| commit | c7c8e801650a86f14178b63eb40790eea591f934 (patch) | |
| tree | a12204939478b613da1885e5eac0c29ccd0a2a1e /solenv | |
| parent | f7a3f2ac423d1f040415b7aaaa7cf807fe3d9bb1 (diff) | |
lower java build-time verbosity
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/settings.mk | 6 | ||||
| -rw-r--r-- | solenv/inc/tg_jar.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/tg_java.mk | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 559c9842abda..6180e303bf1e 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -963,10 +963,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc VERBOSITY=-verbose .ELSE COMMAND_ECHO=@ - .IF "$(VERBOSE)" == "FALSE" - VERBOSITY=-quiet - ZIP_VERBOSITY=-q - .ENDIF + VERBOSITY=-quiet + ZIP_VERBOSITY=-q .ENDIF # "$(VERBOSE)" == "TRUE" COMPILE_ECHO_SWITCH= COMPILE_ECHO_FILE=$(<:f) diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk index 1885a2197fbd..6faf113aeaa5 100644 --- a/solenv/inc/tg_jar.mk +++ b/solenv/inc/tg_jar.mk @@ -26,7 +26,7 @@ #************************************************************************* -.IF "$(VERBOSE)"=="FALSE" +.IF "$(VERBOSE)"!="TRUE" ZIP_VERBOSITY=-q .ENDIF diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk index 5c00f2bbf7f5..1f6a50347b79 100644 --- a/solenv/inc/tg_java.mk +++ b/solenv/inc/tg_java.mk @@ -53,23 +53,23 @@ $(CLASSDIR)/%.class .NOINFER .IGNORE : %.java $(JAVATARGET) : $(JAVAFILES) $(JAVACLASSFILES) .IF "$(JAVARESPONSE)"!="" - $(JAVAC) @<< + $(COMMAND_ECHO)$(JAVAC) @<< $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) <<keep .ELSE # "$(JAVARESPONSE)"!="" .IF "$(use_jdep)"!="" - $(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) + $(COMMAND_ECHO)$(JAVAC) -depend $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) .ELSE # "$(use_jdep)"!="" .IF "$(javauno)"!="" .IF "$(JAVAFILES:d)"=="" - $(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) + $(COMMAND_ECHO)$(JAVAC) $(JAVACPS) $(CLASSPATH) -d $(CLASSDIR) $(JAVAFLAGS) $(JAVAFILES) .ELSE # "$(JAVAFILES:d)"=="" @@$(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 .ENDIF # "$(JAVAFILES:d)"=="" .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 # "$(use_jdep)"!="" .ENDIF # "$(JAVARESPONSE)"!="" |