mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CWS-TOOLING: integrate CWS buildverbosity

Browse Source 
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@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@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
This commit is contained in:
Vladimir Glazounov
2009-10-21 10:43:22 +00:00
parent e4d3404145
commit d7851c0ddb
8 changed files with 126 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rsc/inc/rscerror.h
View File

@@ -120,9 +120,17 @@ public:
class RscId;
class RscTop;
enum RscVerbosity
{
RscVerbositySilent = 0,
RscVerbosityNormal = 1,
RscVerbosityVerbose = 2
};
class RscError
{
FILE * fListing;
RscVerbosity m_verbosity;
void WriteError( const ERRTYPE& rError, const char * pMessage );
void StdLstOut( const char * pStr );
@@ -131,9 +139,10 @@ class RscError
const RscId & aId );
public:
sal_uInt32 nErrors;// Anzahl der Fehler
RscError(){
RscError( RscVerbosity _verbosity ) {
fListing = NULL;
nErrors = 0;
m_verbosity = _verbosity;
};
void SetListFile( FILE * fList ){
fListing = fList;
@@ -141,7 +150,8 @@ public:
FILE * GetListFile(){
return fListing;
};
virtual void StdOut( const char * );
RscVerbosity GetVerbosity() const { return m_verbosity; }
virtual void StdOut( const char *, const RscVerbosity _verbosityLevel = RscVerbosityNormal );
virtual void StdErr( const char * );
virtual void LstOut( const char * );
virtual void Error( const ERRTYPE& rError, RscTop* pClass, const RscId &aId,

13
rsc/source/parser/erscerr.cxx
View File

@@ -69,14 +69,15 @@ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError )
|* Letzte Aenderung MM 06.05.91
|*
*************************************************************************/
void RscError::StdOut( const char * pStr )
void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
{
#ifndef WIN
if( pStr ){
printf( "%s", pStr );
fflush( stdout );
if ( m_verbosity >= _verbosityLevel )
{
if( pStr ){
printf( "%s", pStr );
fflush( stdout );
}
}
#endif
}
/*************************************************************************

2
rsc/source/parser/rscyacc.cxx
View File

@@ -190,7 +190,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
ObjNode * pNode = new ObjNode( aName1, S.Top().pData,
pFI->GetFileIndex() );
pTC->pEH->StdOut( "." );
pTC->pEH->StdOut( ".", RscVerbosityVerbose );
if( !aName1.IsId() )
pTC->pEH->Error( ERR_IDEXPECTED, pHeader->pClass, aName1 );

16
rsc/source/prj/gui.cxx
View File

@@ -57,6 +57,20 @@ static RscCompiler * pRscCompiler = NULL;
delete pRscCompiler;
}
RscVerbosity lcl_determineVerbosity( int argc, char ** argv )
{
for ( int i = 0; i < argc; ++i )
{
if ( argv[i] == NULL )
continue;
if ( rsc_stricmp( argv[i], "-verbose" ) == 0 )
return RscVerbosityVerbose;
if ( rsc_stricmp( argv[i], "-quiet" ) == 0 )
return RscVerbositySilent;
}
return RscVerbosityNormal;
}
#if defined( UNX ) || ( defined( OS2 ) && ( defined( CSET ) || defined ( GCC ))) || defined (WTC) || defined(ICC) || defined(__MINGW32__)
int main ( int argc, char ** argv) {
#else
@@ -80,7 +94,7 @@ int cdecl main ( int argc, char ** argv) {
ERRTYPE aError;
InitRscCompiler();
RscError* pErrHdl = new RscError();
RscError* pErrHdl = new RscError( lcl_determineVerbosity( argc, argv ) );
#ifdef MTW
RscCmdLine* pCmdLine = new RscCmdLine( argc, (char **)argv, pErrHdl );
#else

88
rsc/source/prj/start.cxx
View File

@@ -56,6 +56,7 @@
#endif // UNX
#include <rsctools.hxx>
#include <rscerror.h>
#include <tools/fsys.hxx>
/*************** C O D E ************************************************/
@@ -111,25 +112,38 @@ static BOOL CallPrePro( const ByteString& rPrePro,
if( !fRspFile )
aNewCmdL.Append( rsc_strdup( rPrePro.GetBuffer() ) );
for( i = 1; i < int(pCmdLine->GetCount() -1); i++ ){
if( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-u", 2 )
|| !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-i", 2 )
|| !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-d", 2 ) )
bool bVerbose = false;
for( i = 1; i < int(pCmdLine->GetCount() -1); i++ )
{
if ( 0 == rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-verbose" ) )
{
bVerbose = true;
continue;
}
if ( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-u", 2 )
|| !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-i", 2 )
|| !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-d", 2 )
)
{
aNewCmdL.Append( rsc_strdup( (char *)pCmdLine->GetEntry( i ) ) );
}
};
}
aNewCmdL.Append( rsc_strdup( rInput.GetBuffer() ) );
aNewCmdL.Append( rsc_strdup( rOutput.GetBuffer() ) );
aNewCmdL.Append( (void *)0 );
printf( "Preprocessor commandline: " );
for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
if ( bVerbose )
{
printf( " " );
printf( "%s", (const char *)pCmdL->GetEntry( i ) );
printf( "Preprocessor commandline: " );
for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
{
printf( " " );
printf( "%s", (const char *)pCmdL->GetEntry( i ) );
}
printf( "\n" );
}
printf( "\n" );
if( fRspFile )
{
@@ -150,13 +164,16 @@ static BOOL CallPrePro( const ByteString& rPrePro,
}
fclose( fRspFile );
printf( "Preprocessor startline: " );
for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
if ( bVerbose )
{
printf( " " );
printf( "%s", (const char *)pCmdL->GetEntry( i ) );
printf( "Preprocessor startline: " );
for( i = 0; i < (int)(pCmdL->GetCount() -1); i++ )
{
printf( " " );
printf( "%s", (const char *)pCmdL->GetEntry( i ) );
}
printf( "\n" );
}
printf( "\n" );
}
#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
@@ -194,7 +211,6 @@ static BOOL CallRsc2( ByteString aRsc2Name,
ByteString aSrsName,
RscPtrPtr * pCmdLine )
{
RscPtrPtr aNewCmdL; // Kommandozeile
int i, nExit;
ByteString* pString;
ByteString aRspFileName; // Response-Datei
@@ -203,21 +219,21 @@ static BOOL CallRsc2( ByteString aRsc2Name,
aRspFileName = ::GetTmpFileName();
fRspFile = fopen( aRspFileName.GetBuffer(), "w" );
printf( "Rsc2 commandline: " );
aNewCmdL.Append( rsc_strdup( aRsc2Name.GetBuffer() ) );
printf( "%s", (const char *)aNewCmdL.GetEntry( aNewCmdL.GetCount() -1 ) );
printf( " " );
ByteString aTmpStr( '@' );
aTmpStr += aRspFileName;
aNewCmdL.Append( rsc_strdup( aTmpStr.GetBuffer() ) );
printf( "%s", (const char *)aNewCmdL.GetEntry( aNewCmdL.GetCount() -1 ) );
aNewCmdL.Append( (void *)0 );
printf( "\n" );
RscVerbosity eVerbosity = RscVerbosityNormal;
if( fRspFile )
{
for( i = 1; i < (int)(pCmdLine->GetCount() -1); i++ )
{
if ( !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-verbose" ) )
{
eVerbosity = RscVerbosityVerbose;
continue;
}
if ( !rsc_stricmp( (char *)pCmdLine->GetEntry( i ), "-quiet" ) )
{
eVerbosity = RscVerbositySilent;
continue;
}
if( !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-fp=", 4 )
|| !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-fo=", 4 )
|| !rsc_strnicmp( (char *)pCmdLine->GetEntry( i ), "-pp=", 4 )
@@ -261,6 +277,22 @@ static BOOL CallRsc2( ByteString aRsc2Name,
fclose( fRspFile );
};
RscPtrPtr aNewCmdL; // Kommandozeile
aNewCmdL.Append( rsc_strdup( aRsc2Name.GetBuffer() ) );
ByteString aTmpStr( '@' );
aTmpStr += aRspFileName;
aNewCmdL.Append( rsc_strdup( aTmpStr.GetBuffer() ) );
aNewCmdL.Append( (void *)0 );
if ( eVerbosity >= RscVerbosityVerbose )
{
printf( "Rsc2 commandline: " );
printf( "%s", (const char *)aNewCmdL.GetEntry( 0 ) );
printf( " " );
printf( "%s", (const char *)aNewCmdL.GetEntry( 1 ) );
printf( "\n" );
}
#if ((defined OS2 || defined WNT) && (defined TCPP || defined tcpp)) || defined UNX || defined OS2
nExit = spawnvp( P_WAIT, aRsc2Name.GetBuffer(), (char* const*)aNewCmdL.GetBlock() );
#elif defined CSET
@@ -328,8 +360,6 @@ int cdecl main ( int argc, char ** argv)
aRsc2Name += aDelim;
aRsc2Name += ByteString("rsc2");
printf( "VCL Resource Compiler 3.0\n" );
pStr = ::ResponseFile( &aCmdLine, argv, argc );
if( pStr )
{

51
rsc/source/rsc/rsc.cxx
View File

@@ -520,15 +520,18 @@ printf( "khg\n" );
}
};
pTC->pEH->StdOut( "Files: " );
pFName = pTC->aFileTab.First();
while( pFName )
if ( pTC->pEH->GetVerbosity() >= RscVerbosityVerbose )
{
pTC->pEH->StdOut( pFName->aFileName.GetBuffer() );
pTC->pEH->StdOut( " " );
pFName = pTC->aFileTab.Next();
};
pTC->pEH->StdOut( "\n" );
pTC->pEH->StdOut( "Files: " );
pFName = pTC->aFileTab.First();
while( pFName )
{
pTC->pEH->StdOut( pFName->aFileName.GetBuffer() );
pTC->pEH->StdOut( " " );
pFName = pTC->aFileTab.Next();
};
pTC->pEH->StdOut( "\n" );
}
if( aError.IsOk() )
aError = Link();
@@ -554,9 +557,9 @@ void RscCompiler::EndCompile()
{
if( pCL->aOutputSrs.Len() && (pCL->nCommands & NOLINK_FLAG) )
{
pTC->pEH->StdOut( "Writing file " );
pTC->pEH->StdOut( pCL->aOutputSrs.GetBuffer() );
pTC->pEH->StdOut( ".\n" );
pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
pTC->pEH->StdOut( pCL->aOutputSrs.GetBuffer(), RscVerbosityVerbose );
pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
// kopiere von TMP auf richtigen Namen
unlink( pCL->aOutputSrs.GetBuffer() ); // Zieldatei loeschen
@@ -588,9 +591,9 @@ void RscCompiler::EndCompile()
if ( aTmpOutputHxx.Len() )
{
pTC->pEH->StdOut( "Writing file " );
pTC->pEH->StdOut( pCL->aOutputHxx.GetBuffer() );
pTC->pEH->StdOut( ".\n" );
pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
pTC->pEH->StdOut( pCL->aOutputHxx.GetBuffer(), RscVerbosityVerbose );
pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
// kopiere von TMP auf richtigen Namen
unlink( pCL->aOutputHxx.GetBuffer() ); // Zieldatei loeschen
@@ -601,9 +604,9 @@ void RscCompiler::EndCompile()
if( aTmpOutputCxx.Len() )
{
pTC->pEH->StdOut( "Writing file " );
pTC->pEH->StdOut( pCL->aOutputCxx.GetBuffer() );
pTC->pEH->StdOut( ".\n" );
pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
pTC->pEH->StdOut( pCL->aOutputCxx.GetBuffer(), RscVerbosityVerbose );
pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
// kopiere von TMP auf richtigen Namen
unlink( pCL->aOutputCxx.GetBuffer() ); // Zieldatei loeschen
@@ -614,9 +617,9 @@ void RscCompiler::EndCompile()
if( aTmpOutputRcCtor.Len() )
{
pTC->pEH->StdOut( "Writing file " );
pTC->pEH->StdOut( pCL->aOutputRcCtor.GetBuffer() );
pTC->pEH->StdOut( ".\n" );
pTC->pEH->StdOut( "Writing file ", RscVerbosityVerbose );
pTC->pEH->StdOut( pCL->aOutputRcCtor.GetBuffer(), RscVerbosityVerbose );
pTC->pEH->StdOut( ".\n", RscVerbosityVerbose );
// kopiere von TMP auf richtigen Namen
unlink( pCL->aOutputRcCtor.GetBuffer() ); // Zieldatei loeschen
@@ -776,14 +779,14 @@ ERRTYPE RscCompiler :: ParseOneFile( ULONG lFileKey,
{
RscFileInst aFileInst( pTC, lFileKey, lFileKey, finput );
pTC->pEH->StdOut( "reading file " );
pTC->pEH->StdOut( aParseFile.GetBuffer() );
pTC->pEH->StdOut( " " );
pTC->pEH->StdOut( "reading file ", RscVerbosityVerbose );
pTC->pEH->StdOut( aParseFile.GetBuffer(), RscVerbosityVerbose );
pTC->pEH->StdOut( " ", RscVerbosityVerbose );
aError = ::parser( &aFileInst );
if( aError.IsError() )
pTC->Delete( lFileKey );//Resourceobjekte loeschen
pTC->pEH->StdOut( "\n" );
pTC->pEH->StdOut( "\n", RscVerbosityVerbose );
fclose( finput );
};

6
vcl/source/window/makefile.mk
View File

@@ -96,10 +96,10 @@ SLOFILES= \
$(INCCOM)$/cuilib.hxx: makefile.mk
.IF "$(GUI)"=="UNX"
$(RM) $@
echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
@$(RM) $@
@echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
.ELSE
echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
@echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
.ENDIF
$(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx

4
vcl/unx/source/gdi/makefile.mk
View File

@@ -107,8 +107,8 @@ ALLTAR : $(MACOSXRC)
XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST)
$(INCCOM)$/rtsname.hxx:
rm -f $(INCCOM)$/rtsname.hxx ; \
echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
@rm -f $(INCCOM)$/rtsname.hxx ; \
echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
$(SLO)$/salpimpl.obj : $(INCCOM)$/rtsname.hxx
$(SLO)$/salprnpsp.obj : $(INCCOM)$/rtsname.hxx