[ooo-build-commit] patches/dev300

[Thorsten Behrens]

 patches/dev300/quiet-build-more.diff |   85 +++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)

New commits:
commit 61b6bd66b367323b8dc6c7c3ce07e8ac8bc6e5c5
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Sat Jun 20 01:30:49 2009 +0200

    Silenced idlc and deliver
    
    * patches/dev300/quiet-build-more.diff: removed useless success msg
      from idlc, made idlc calls in makefiles echo-less; silenced useless
      version blurp from deliver (now we should start fixing the compiler
      warnings...)

diff --git a/patches/dev300/quiet-build-more.diff b/patches/dev300/quiet-build-more.diff
index ca6753f..695ce0f 100644
--- a/patches/dev300/quiet-build-more.diff
+++ b/patches/dev300/quiet-build-more.diff
@@ -727,3 +727,88 @@ index 44c554b..10164d1 100644
  		}
  		else
  		{
+diff --git idlc/source/idlcmain.cxx idlc/source/idlcmain.cxx
+index 792cd59..f56b945 100644
+--- idlc/source/idlcmain.cxx
++++ idlc/source/idlcmain.cxx
+@@ -132,11 +132,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+             options.getProgramName().getStr(),
+             sal::static_int_cast< long >(nErrors), 
+             options.prepareVersion().getStr());
+-    } else
+-    {
+-        fprintf(stdout, "%s: returned successful%s",
+-            options.getProgramName().getStr(),
+-            options.prepareVersion().getStr());
+     }
+     return nErrors;
+ }
+diff --git solenv/bin/deliver.pl solenv/bin/deliver.pl
+index bfd947e..afc5fd2 100755
+--- solenv/bin/deliver.pl
++++ solenv/bin/deliver.pl
+@@ -399,7 +399,7 @@ sub parse_options
+ {
+     my $arg;
+     my $dontdeletecommon = 0;
+-    $opt_silent = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE');
++    $opt_silent = 1 if ( !defined $ENV{VERBOSE} || (defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'FALSE'));
+     $opt_verbose = 1 if ( defined $ENV{VERBOSE} && $ENV{VERBOSE} eq 'TRUE');
+     while ( $arg = shift @ARGV ) {
+         $arg =~ /^-force$/      and $opt_force  = 1  and next;
+diff --git solenv/inc/target.mk solenv/inc/target.mk
+index 635da62..75b4802 100644
+--- solenv/inc/target.mk
++++ solenv/inc/target.mk
+@@ -1395,38 +1395,38 @@ $(EXTUPDATEINFO_DEST) : $(EXTUPDATEINFO_SOURCE)
+ 
+ makedoc:
+ 		@@-mkdir $(OUT)$/ucrdoc
+-		$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))		
++		$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(DEPIDLFILES:+"\n"))		
+ #		-$(UNOIDL) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -Bdoc -P..$/$(PRJNAME)$/$(IDLPACKAGE) -OH$(PRJ)$/..$/unodoc $(DOCIDLFILES) $(IDLFILES)
+ 
+ .IF "$(LOCALDBTARGET)"!=""
+ $(LOCALDBTARGET) : $(URDFILES) $(DEPIDLFILES)
+-	$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
+-	-$(RM) $@
+-	$(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDFILES))
++	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -O$(OUT)$/ucr$/$(IDLPACKAGE) $(all_outdated_idl))
++	@-$(RM) $@
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDFILES))
+ .ENDIF
+ 
+ .IF "$(LOCALDOCDBTARGET)"!=""
+ $(LOCALDOCDBTARGET) : $(URDDOCFILES) $(DEPIDLFILES)
+-	$(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
+-	-$(RM) $@
+-	$(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDDOCFILES))
++	$(QUIET_BUILD) $(IDLC) @$(mktmp $(IDLCFLAGS) $(UNOIDLDEFS) $(UNOIDLINCEXTRA) $(UNOIDLINC) -C -O$(OUT)$/ucrdoc$/$(IDLPACKAGE) $(all_outdated_idl))
++	@-$(RM) $@
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ UCR @$(mktmp $(URDDOCFILES))
+ .ENDIF
+ 
+ .IF "$(UNOIDLDBTARGET)"!=""
+ $(UNOIDLDBTARGET) : $(UNOIDLDBFILES) $(UNOIDLDBREGS)
+-	-$(RM) $@
+-	$(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
++	@-$(RM) $@
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBFILES) $(UNOIDLDBREGS))
+ .IF "$(LOCALREGDB)"!=""
+-	$(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
+ .ENDIF
+ .ENDIF			# "$(UNOIDLDBTARGET)"!=""
+ 
+ .IF "$(UNOIDLDBDOCTARGET)"!=""
+ $(UNOIDLDBDOCTARGET) : $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS)
+-	-$(RM) $@
+-	$(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
++	@-$(RM) $@
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $@ / @$(mktmp $(UNOIDLDBDOCFILES) $(UNOIDLDBDOCREGS))
+ .IF "$(LOCALREGDB)"!=""
+-	$(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
++	$(QUIET_BUILD) $(REGMERGE) $(REGMERGEFLAGS) $(LOCALREGDB) / $@
+ .ENDIF
+ .ENDIF			# "$(UNOIDLDBDOCTARGET)"!=""
+