[Libreoffice-commits] .: 3 commits - solenv/inc

[Caolán McNamara]

 solenv/inc/ant.mk         |   20 +++++++++-----------
 solenv/inc/antsettings.mk |    9 ++++++++-
 solenv/inc/settings.mk    |    6 ++----
 solenv/inc/tg_jar.mk      |    4 ++--
 solenv/inc/tg_java.mk     |   10 +++++-----
 5 files changed, 26 insertions(+), 23 deletions(-)

New commits:
commit 456ee0df6ec3d801d41ba570bc45a391531dd96d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 22 09:49:39 2010 +0000

    lower java build-time verbosity

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 559c984..6180e30 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 1885a21..6faf113 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 5c00f2b..1f6a503 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)"!=""
commit 50af7e18056c5de3ce83ede69a713afab9151985
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 22 09:45:08 2010 +0000

    little bit less java verbosity

diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index d1109ec..1885a21 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -57,7 +57,7 @@ $(JARMANIFEST) .PHONY : $(CUSTOMMANIFESTFILEDEP)
     @@-$(RM) $@
     $(COMMAND_ECHO)echo Manifest-Version: 1.0 > $@
 .IF "$(JARCLASSPATH)" != ""
-    echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@
+    $(COMMAND_ECHO)echo $(USQ)Class-Path: $(JARCLASSPATH)$(USQ) >> $@
 .ENDIF
 # $(RSCREVISION) contains chars that must be quoted (for *NIX shells)
     $(COMMAND_ECHO)echo $(USQ)Solar-Version: $(RSCREVISION)$(USQ) >> $@
commit da618efe39391cf8144ff4782d5d325a59443986
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 22 09:37:19 2010 +0000

    get ant stuff to follow VERBOSE

diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index 2d182a6..1ffa7fd 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -65,13 +65,13 @@ $(CLASSDIR)/solar.properties : $(SOLARVERSION)/$(INPATH)/inc$(UPDMINOREXT)/minor
     @cat $(DMAKEROOT)/../ant.properties >> $@
 
 ANTBUILD .PHONY:
-    $(ANT) $(ANT_FLAGS)
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS)
 
 clean  .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 prepare .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 main: .PHONY:
     $(ANT) $(ANT_FLAGS) $@
@@ -80,21 +80,19 @@ info: .PHONY
     $(ANT) $(ANT_FLAGS) $@
 
 jar .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 compile .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 depend .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 javadoc .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 config .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
 
 test .PHONY:
-    $(ANT) $(ANT_FLAGS) $@
-
-
+    $(COMMAND_ECHO)$(ANT) $(ANT_FLAGS) $@
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index a06d7c9..fda4a82 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -68,6 +68,12 @@ ANT_OPT=on
 .ENDIF
 .ENDIF
 
+.IF "$(VERBOSE)" == "TRUE"
+    ANT_VERBOSE=-v
+.ELSE
+    ANT_VERBOSE=-q
+.ENDIF
+
 .IF "$(JDK)"=="gcj"
 JAVA_HOME=
 .EXPORT : JAVA_HOME
@@ -78,7 +84,8 @@ ANT_FLAGS!:=$(ANT_COMPILER_FLAGS) -Dprj=$(PRJ) -Dprjname=$(PRJNAME) $(ANT_JAVA_V
  -Dout=$(OUT) -Dinpath=$(INPATH) -Dproext="$(PROEXT)" -Dsolar.bin=$(SOLARBINDIR) \
  -Dsolar.jar=$(SOLARBINDIR) -Dsolar.doc=$(SOLARDOCDIR) -Dcommon.jar=$(SOLARCOMMONBINDIR) \
  -Dcommon.doc=$(SOLARCOMMONDOCDIR) -Dsolar.sourceversion=$(SOURCEVERSION) \
- -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) -emacs
+ -Dsolar.lastminor=$(LAST_MINOR) -Dsolar.build=$(BUILD) -f $(ANT_BUILDFILE) $(ANT_FLAGS) \
+ -emacs $(ANT_VERBOSE)
 .ELSE # No java
 ANT=
 ANT_FLAGS=