[ooo-build-commit] Branch 'ooo/master' - writerfilter/source

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Oct 22 02:28:50 PDT 2009 

 writerfilter/source/doctok/makefile.mk        |   16 ++++++---
 writerfilter/source/ooxml/makefile.mk         |   43 ++++++++++++++++----------
 writerfilter/source/resourcemodel/makefile.mk |   35 ++++++++++++---------
 3 files changed, 58 insertions(+), 36 deletions(-)

New commits:
commit 85b915b86857ba5790a98dbdbccda4f709abaa97
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Wed Oct 21 10:43:22 2009 +0000

    CWS-TOOLING: integrate CWS buildverbosity
    2009-10-13 15:51:48 +0200 fs  r276867 : allow building with 'nodep'==''
    2009-10-11 22:39:56 +0200 fs  r276820 : silence a compiler warning in a file only used when VERBOSE!=""
    2009-10-09 14:37:43 +0200 fs  r276807 : let not override the non-presence of $VERBOSE the given command line arguments
    2009-10-09 14:36:25 +0200 fs  r276806 : also deliver spirit/home/classic/debug/impl
    2009-10-08 13:38:07 +0200 fs  r276789 : not that many line feeds in --show mode
    2009-10-08 13:13:01 +0200 fs  r276788 : minor adjustments requested by hjs:
    - replaced space/tab mixes at beginning of lines with mere tab
    - made "nothing to update" message for the ZIPALLTARGET target more prominent
    - removed useless "echo > /dev/nul" statements
    2009-10-07 13:32:12 +0200 fs  r276753 : #i105585#
    2009-10-07 11:31:59 +0200 fs  r276742 : #i10000# missing dependency between stoc/security and stoc/util
    2009-10-06 22:59:59 +0200 fs  r276729 : CWS-TOOLING: rebase CWS buildverbosity to trunk at 276699 (milestone: DEV300:m61)
    2009-09-29 12:04:58 +0200 fs  r276518 : #i10000#
    2009-09-29 12:04:25 +0200 fs  r276517 : oops
    2009-09-29 12:01:07 +0200 fs  r276516 : #i84497# removed some more (non-diagnostic) 'echo ------' directives
    2009-09-29 11:59:29 +0200 fs  r276515 : #i84497# removed some more (non-diagnostic) 'echo ------' directives
    2009-09-29 11:52:32 +0200 fs  r276514 : #i84497# removed the various 'echo ------------' directives from verbose mode, as per hjs' request
    2009-09-29 11:44:16 +0200 fs  r276513 : do not duplicate IDLC call commands with different verbosity switches
    2009-09-28 21:43:50 +0200 thb  r276502 : #i84497# fixed potential recursive macro def + extra ls
     * solenv/inc/settings.mk: now setting via VERBOSE!:=, removes warning
       and my spurious "recursive macro definition" error
     * solenv/inc/tg_app.mk: one extra ls silenced for app target (and
       quiet mode, that goes without saying)
    2009-09-23 08:57:01 +0200 fs  r276366 : use ULFEX_VERBOSITY instead of duplicating the ULFEX call
    2009-09-21 11:42:26 +0200 fs  r276320 : ignore output paths
    2009-09-21 11:04:27 +0200 fs  r276318 : silence another compiler warning, which only hits us when actually using this (debug) file, which is the case only when slideshow is compiled with a env variable VERBOSE, thus came up in CWS buildverbosity
    2009-09-21 10:30:14 +0200 fs  r276313 : make some output depend on VERBOSE==TRUE, not COMMAND_ECHO=""
    While both are equivalent at the moment, COMMAND_ECHO finally is an implementation
    default of the VERBOSE flag only, so better rely on VERBOSE as the primary verbosity flag
    2009-09-21 09:56:57 +0200 fs  r276311 : forgot to re-generate from tg_zip before committing
    2009-09-21 09:52:11 +0200 fs  r276310 : #i84497# even less verbosity
    2009-09-17 11:02:47 +0200 fs  r276232 : #i84497# verbose implies VERBOSE nowadays, and VERBOSE==FALSE should not lead to -DVERBOSE
    2009-09-15 22:59:37 +0200 fs  r276189 : #i105022# copy fix for this P1 into this CWS
    2009-09-15 11:56:35 +0200 fs  r276165 : CWS-TOOLING: rebase CWS buildverbosity to trunk at 276043 (milestone: DEV300:m58)
    2009-09-14 17:45:10 +0200 fs  r276137 : #i84497# don't duplicate zip lines w/ and w/o -q switch, use a variable instead (maintenance)
    2009-09-14 15:01:33 +0200 fs  r276124 : #i10000#
    2009-09-11 23:58:46 +0200 thb  r276083 : #i84497#: More quiet-build fine tuning
     - silenced rsc for real (properly filtering options for
       cpp, and a pretty brutal amputation of the tool blurp,
       which would have needed cmd opt parser duplication)
     - silenced deliver.pl
     - silenced checkdll.sh
     - silenced zip via -q (in quiet mode)
     - silenced various idl, resource, transex whatever tool,
       passing appropriate options down to them '-QQ' sometimes
     - silenced dmake, pointless blurb that something does *not*
       need update removed
     - silenced the old starview idl compiler, to not output
       tool's name & progress chars in quiet mode
    2009-09-11 21:13:59 +0200 thb  r276081 : #i84497#: More bits on the quiet mode of the build.
    The bulk of the changes is disabling those annoying
    "echo ------------------" lines for the quiet build,
    which has the stretch goal of outputting *exactly*
    one line per file compiled/linked/processed.
    Apart from that, silenced a few especialy annoying
    module-specific makefiles (basically adding
    $(COMMAND_ECHO) in front of a gazillion rules).
    Additionally, slightly tweaked what idlc regards
    verbose, normal, and quiet mode; this was to have it
    echo exactly one line per idl file processed (the
    fact that quiet mode did not echo *anything* for idl
    files was a bit too much for my taste)
    2009-09-04 09:14:35 +0200 fs  r275777 : don't emit the link parameters if VERBOSE!=TRUE
    2009-09-02 10:31:15 +0200 fs  r275700 : #i10000#
    2009-09-02 08:44:14 +0200 fs  r275697 : update svn:ignore to ignore the output paths
    2009-09-02 08:40:54 +0200 fs  r275695 : #i84497# less verbose output during build, unless a dedicated '-verbose' switch is given
    2009-09-02 08:40:28 +0200 fs  r275694 : GRAPHITE is missing in the BUILD_TYPE
    2009-09-02 08:40:05 +0200 fs  r275693 : #i84497# less verbose output during build, unless a dedicated '-verbose' switch is given
    2009-09-02 08:39:25 +0200 fs  r275692 : #i84497# less verbose output during build, unless a dedicated '-verbose' switch is given
    2009-09-02 08:39:02 +0200 fs  r275691 : #i84497# less verbose output during build, unless a dedicated '-verbose' switch is given
    2009-09-02 08:38:09 +0200 fs  r275690 : #i84497# less verbose output during build
    2009-09-02 08:37:06 +0200 fs  r275689 : #i84497# don't emit that much noise, unless a '-verbose' switch is given

diff --git a/writerfilter/source/doctok/makefile.mk b/writerfilter/source/doctok/makefile.mk
index 15124d4..fd344d2 100644
--- a/writerfilter/source/doctok/makefile.mk
+++ b/writerfilter/source/doctok/makefile.mk
@@ -127,22 +127,26 @@ DOCTOKGENHEADERS=$(DOCTOKRESOURCEIDSHXX) $(SPRMIDSHXX) $(RESOURCESHXX)
 DOCTOKGENFILES=$(DOCTOKGENHEADERS) $(RESOURCESCXX)
 
 $(DOCTOKHXXOUTDIRCREATED):
-    $(MKDIRHIER) $(DOCTOKHXXOUTDIR)
-    $(TOUCH) $@
+    @$(MKDIRHIER) $(DOCTOKHXXOUTDIR)
+    @$(TOUCH) $@
 
 $(DOCTOKGENHEADERS): $(DOCTOKHXXOUTDIRCREATED)
 
 $(RESOURCESHXX): $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL)
-    $(XSLTPROC) $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCESXSL) $(DOCTOKMODEL) > $@
 
 $(SPRMIDSHXX): $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
-    $(XSLTPROC) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL) > $@
 
 $(RESOURCESCXX): $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) $(DOCTOKRESOURCEIDSHXX) $(DOCTOKRESOURCETOOLS)
-    $(XSLTPROC) $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCESIMPLXSL) $(DOCTOKMODEL) > $@
 
 $(DOCTOKRESOURCEIDSHXX):  $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL)
-    $(XSLTPROC) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCEIDSXSL) $(DOCTOKMODEL) > $@
 
 $(SLOFILES) : $(DOCTOKGENHEADERS)
 
diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk
index e63ac5e..2daad7a 100644
--- a/writerfilter/source/ooxml/makefile.mk
+++ b/writerfilter/source/ooxml/makefile.mk
@@ -181,57 +181,68 @@ GENERATEDFILES= \
     $(TOKENXML)
 
 $(TOKENXMLTMP): $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt
-    $(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
+    @$(TYPE) $(SOLARVER)$/$(INPATH)$/inc$(UPDMINOREXT)$/oox$/token.txt | $(SED) "s#\(.*\)#<fasttoken>\1</fasttoken>#" > $@
 
 $(TOKENXML): tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter
-    $(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
+    @$(TYPE) tokenxmlheader $(TOKENXMLTMP) tokenxmlfooter > $@
 
 $(MODELPROCESSED): $(OOXMLPREPROCESSXSL) $(OOXMLMODEL)
-    $(XSLTPROC) $(OOXMLPREPROCESSXSL) $(OOXMLMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLPREPROCESSXSL) $(OOXMLMODEL) > $@
 
 $(OOXMLHXXOUTDIRCREATED):
-    $(MKDIRHIER) $(OOXMLHXXOUTDIR)
-    $(TOUCH) $@
+    @$(MKDIRHIER) $(OOXMLHXXOUTDIR)
+    @$(TOUCH) $@
 
 $(OOXMLGENHEADERS): $(OOXMLHXXOUTDIRCREATED)
 
 $(OOXMLFASTTOKENSHXX): $(OOXMLFASTTOKENSXSL) $(TOKENXML)
-    $(XSLTPROC) $(OOXMLFASTTOKENSXSL) $(TOKENXML) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFASTTOKENSXSL) $(TOKENXML) > $@
 
 $(OOXMLFASTRESOURCESHXX): $(OOXMLFASTRESOURCESXSL) $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLFASTRESOURCESXSL) $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFASTRESOURCESXSL) $(MODELPROCESSED) > $@
 
 $(OOXMLFASTRESOURCESCXX): $(OOXMLFASTRESOURCEHXXS) \
     $(OOXMLFASTRESOURCESIMPLXSL) $(MODELPROCESSED) 
-    $(XSLTPROC) $(OOXMLFASTRESOURCESIMPLXSL) $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLFASTRESOURCESIMPLXSL) $(MODELPROCESSED) > $@
 
 $(OOXMLFASTRESOURCECXXS): $(MODELPROCESSED)
 
 $(OOXMLFASTRESOURCEHXXS): $(MODELPROCESSED)
 
 $(OOXMLCXXOUTDIR)$/OOXMLfastresources%.cxx: fastresourcesimpl%.xsl
-    $(XSLTPROC) $< $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $< $(MODELPROCESSED) > $@
 
 $(OOXMLHXXOUTDIR)$/OOXMLfastresources%.hxx: fastresources%.xsl
-    $(XSLTPROC) $< $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $< $(MODELPROCESSED) > $@
 
 $(OOXMLVALUESHXX): $(OOXMLVALUESXSL) $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLVALUESXSL) $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLVALUESXSL) $(MODELPROCESSED) > $@
 
 $(OOXMLVALUESCXX): $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) \
     $(OOXMLFASTRESOURCESHXX)
-    $(XSLTPROC) $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLVALUESIMPLXSL) $(MODELPROCESSED) > $@
 
 $(OOXMLRESOURCEIDSHXX):  $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCEIDSXSL) \
     $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED) > $@
 
 $(OOXMLNAMESPACEIDSHXX):  $(OOXMLHXXOUTDIRCREATED) $(OOXMLNAMESPACEIDSXSL) \
     $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLNAMESPACEIDSXSL) $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLNAMESPACEIDSXSL) $(MODELPROCESSED) > $@
 
 $(GPERFFASTTOKENHXX): $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLGPERFFASTTOKENXSL) $(MODELPROCESSED) | tr -d '\r' | gperf -I -t -E -S1 -c -G -LC++ > $@
 
 $(SLOFASTNAMESPACES): $(OOXMLFASTRESOURCESCXX) $(OOXMLGENHEADERS)
 
@@ -248,7 +259,7 @@ $(SLOFASTNAMESPACES): OOXMLFastHelper.hxx
 .PHONY: genclean genmake genheaders
 
 genclean:
-    rm -f $(GENERATEDFILES)
+    @rm -f $(GENERATEDFILES)
 
 genmake: $(GENERATEDFILES)
 
diff --git a/writerfilter/source/resourcemodel/makefile.mk b/writerfilter/source/resourcemodel/makefile.mk
index 0f2dfbb..b854432 100644
--- a/writerfilter/source/resourcemodel/makefile.mk
+++ b/writerfilter/source/resourcemodel/makefile.mk
@@ -139,18 +139,21 @@ GENERATEDFILES= \
     $(SPRMCODETOSTRTMP)
 
 $(OOXMLQNAMETOSTRTMP): $(OOXMLQNAMETOSTRXSL) $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLQNAMETOSTRXSL:s!\!/!) $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLQNAMETOSTRXSL:s!\!/!) $(MODELPROCESSED) > $@
 
 $(DOCTOKQNAMETOSTRTMP): $(DOCTOKQNAMETOSTRXSL) $(DOCTOKMODEL)
-    $(XSLTPROC) $(DOCTOKQNAMETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKQNAMETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
 
 $(QNAMETOSTRCXX): $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrheader qnametostrfooter $(OOXMLRESOURCESTOOLSXSL) $(DOCTOKRESOURCETOOLS)
-    $(TYPE) qnametostrheader $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrfooter > $@
+    @$(TYPE) qnametostrheader $(OOXMLQNAMETOSTRTMP) $(DOCTOKQNAMETOSTRTMP) qnametostrfooter > $@
 $(SPRMCODETOSTRTMP): $(DOCTOKSPRMCODETOSTRXSL) $(DOCTOKMODEL)
-    $(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMCODETOSTRXSL:s!\!/!) $(DOCTOKMODEL) > $@
 
 $(SPRMCODETOSTRCXX): sprmcodetostrheader $(SPRMCODETOSTRTMP) sprmcodetostrfooter
-    $(TYPE) $< > $@
+    @$(TYPE) $< > $@
 
 $(SLO)$/sprmcodetostr.obj: $(SPRMCODETOSTRCXX)
 $(SLO)$/qnametostr.obj: $(QNAMETOSTRCXX)
@@ -158,29 +161,33 @@ $(SLO)$/qnametostr.obj: $(QNAMETOSTRCXX)
 $(SLOFILES): $(GENERATEDHEADERS)
 
 $(DOCTOKHXXOUTDIRCREATED):
-    $(MKDIRHIER) $(DOCTOKHXXOUTDIR)
-    $(TOUCH) $@
+    @$(MKDIRHIER) $(DOCTOKHXXOUTDIR)
+    @$(TOUCH) $@
 
 $(DOCTOKRESOURCEIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKRESOURCETOOLS) $(DOCTOKRESOURCEIDSXSL)
-    $(XSLTPROC) $(DOCTOKRESOURCEIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKRESOURCEIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
 
 $(OOXMLHXXOUTDIRCREATED):
-    $(MKDIRHIER) $(OOXMLHXXOUTDIR)
-    $(TOUCH) $@
+    @$(MKDIRHIER) $(OOXMLHXXOUTDIR)
+    @$(TOUCH) $@
 
 $(MODELPROCESSED): $(OOXMLMODEL) $(OOXMLRESOURCESTOOLSXSL) $(OOXMLPREPROCESSXSL)
-    $(XSLTPROC) $(OOXMLPREPROCESSXSL:s!\!/!) $(OOXMLMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLPREPROCESSXSL:s!\!/!) $(OOXMLMODEL) > $@
 
 $(OOXMLRESOURCEIDSHXX): $(OOXMLHXXOUTDIRCREATED) $(OOXMLRESOURCESTOOLSXSL) $(OOXMLRESOURCEIDSXSL) $(MODELPROCESSED)
-    $(XSLTPROC) $(OOXMLRESOURCEIDSXSL:s!\!/!) $(MODELPROCESSED) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(OOXMLRESOURCEIDSXSL:s!\!/!) $(MODELPROCESSED) > $@
 
 $(SPRMIDSHXX): $(DOCTOKHXXOUTDIRCREATED) $(DOCTOKSPRMIDSXSL) $(DOCTOKMODEL)
-    $(XSLTPROC) $(DOCTOKSPRMIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
+    @echo "Making:   " $(@:f)
+    $(COMMAND_ECHO)$(XSLTPROC) $(DOCTOKSPRMIDSXSL:s!\!/!) $(DOCTOKMODEL) > $@
 
 .PHONY: genclean genmake gendirs
 
 genclean: 
-    rm -f $(GENERATEDFILES)
+    @rm -f $(GENERATEDFILES)
 
 genmake: $(GENERATEDFILES)

More information about the ooo-build-commit mailing list