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@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

3 files changed, 53 insertions, 30 deletions

diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l
index df36c708f2a8..700a044555c2 100755
--- a/soltools/HIDCompiler/hidclex.l
+++ b/soltools/HIDCompiler/hidclex.l
@@ -80,6 +80,7 @@ static int nInputFileDepth = 0;
 #include <ctype.h>
 
 int alloc_cnt = 0;
+static bool bVerbose = false;
 void freestring( char const * ); //forward
 
 char* dot2underline( char* str )
@@ -156,19 +157,19 @@ void adjust_levelbuffer()
 
 void freestring( char const * ptr )
 {
-	 alloc_cnt--;
-	 adjust_levelbuffer();
-	 //fprintf(stderr,"%sinfo: freestring line %d\n",levelbuffer, __LINE__);
-	 free(const_cast< char * >(ptr)), ptr = NULL;
+    alloc_cnt--;
+    adjust_levelbuffer();
+    if ( bVerbose )
+	    fprintf(stdout,"%sinfo: freestring line %d\n",levelbuffer, __LINE__);
+    free(const_cast< char * >(ptr)), ptr = NULL;
 }
 
 void makestring(char** newstr, char* oldstr)
 {
 	alloc_cnt++;
 	adjust_levelbuffer();
-	/*
-	fprintf(stderr,"%sinfo: makestring on line %d\n",levelbuffer,__LINE__);
-	*/
+	if ( bVerbose )
+	    fprintf(stdout,"%sinfo: makestring on line %d\n",levelbuffer,__LINE__);
 	strcpy( (*newstr=(char*)malloc(strlen(oldstr)+1)), oldstr);
 	if( *newstr==NULL ) {
 		fprintf( stderr,
@@ -284,10 +285,11 @@ public:
 							if( ring[ringpos] != NULL )
 								freestring( ring[ringpos] ); /*otherwise: memory lost*/
 							ring[ ringpos ] = id;
-							//fprintf(stderr,
-							//	"info: ring[%d] == %s broken==%d \n"
-							//	,ringpos,ring[ringpos],broken
-							// );
+							if ( bVerbose )
+							    fprintf(stdout,
+								    "info: ring[%d] == %s broken==%d \n"
+								    ,ringpos,ring[ringpos],broken
+							    );
 
 							if( !(ringpos==0 && last==-1) )
 								last = (++last) % MAXRING;
@@ -492,7 +494,7 @@ num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
 				FILE* pFile = NULL;
 				pFile = fopen( NewFile, "r" );
 				if( pFile == NULL ) {
-					fprintf( stderr, "warning: could not open inputfile %s \n", NewFile );
+					fprintf( stdout, "warning: could not open inputfile %s \n", NewFile );
 					// try the new *_tmpl.src version instead
 					// this hack was introduced to allow localisation of included src files
 					const char* sStrTmpl = "_tmpl";
@@ -513,7 +515,8 @@ num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
 				InputFiles[ nInputFileDepth ] = yy_create_buffer( pFile, YY_BUF_SIZE );
                 yy_switch_to_buffer( InputFiles[ nInputFileDepth ] );
 
-				printf( "%s //ATTENTION!! %s gets included here\n", yytext, NewFile );
+                if ( bVerbose )
+				    fprintf( stdout, "%s //ATTENTION!! %s gets included here\n", yytext, NewFile );
 				fprintf( outfile, "// %s //ATTENTION!! %s gets included here\n\n", yytext, NewFile );
 			}
 
@@ -573,7 +576,8 @@ num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
 
 <EXCLUDE_STATE>"{" 		{
 				exclude_bracelevel += 1;
-				//fprintf( stderr,"info: lev %d : found {\n", exclude_bracelevel );
+			    if ( bVerbose )
+				    fprintf( stdout,"info: lev %d : found {\n", exclude_bracelevel );
 			}
 
 
@@ -616,8 +620,8 @@ num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
 					globalKLASSE= ares->klasse;
 				}
 
-				//fprintf(stderr,"info: { level: %d\n", level);
-				//
+                if ( bVerbose )
+				    fprintf(stdout,"info: { level: %d\n", level);
 
 				lasttoken = TOK_OPENBRACE;
 				ring->set_zero();
@@ -626,7 +630,8 @@ num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
 <EXCLUDE_STATE>"}" 		{
 				//-----------------------------
 				exclude_bracelevel -= 1;
-				//fprintf( stderr,"info: lev %d : found }\n", exclude_bracelevel );
+				if ( bVerbose )
+				    fprintf( stdout,"info: lev %d : found }\n", exclude_bracelevel );
 				if( exclude_bracelevel==1 ) {
 					BEGIN INITIAL;
 					exclude_bracelevel=0;
@@ -636,7 +641,8 @@ num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
 
 \n			|
 "}" 		{
-				//fprintf(stderr,"info:   } level: %d\n",level);
+				if ( bVerbose )
+				    fprintf(stdout,"info:   } level: %d\n",level);
 
 				if( !strcmp(yytext,"}") )
 					;
@@ -781,7 +787,8 @@ num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
 {resstringlist} {
 			BEGIN EXCLUDE_STATE;
 			exclude_bracelevel = 1;
-			//fprintf( stderr,"info: lev %d : found exclusion\n", exclude_bracelevel );
+			if ( bVerbose )
+			    fprintf( stdout,"info: lev %d : found exclusion\n", exclude_bracelevel );
 			}
 
 ^[ \t]*#define		|
@@ -803,12 +810,13 @@ num4tag		(([Pp][Oo][Ss][Ss][Ii][Zz][Ee]))
 <INITIAL,EXCLUDE_STATE>{string}	{
 			ring->set_broken();
             lasttoken = TOK_STRING;
-			//printf("%6s %11s %8d %s \n",project,filename,yylineno, yytext);
+            if ( bVerbose )
+			    fprintf(stdout, "%6s %11s %8d %s \n",project,filename,yylineno, yytext);
 			}
 
 
-<INITIAL,EXCLUDE_STATE>.	{ //fprintf( stderr,"warning: unused input on line %d of %s \n%s\n",
-					//yylineno, filename, yytext);
+<INITIAL,EXCLUDE_STATE>.	{ if ( bVerbose ) fprintf( stdout,"warning: unused input on line %d of %s \n%s\n",
+					yylineno, filename, yytext);
 	}
 
 <EXCLUDE_STATE>\n	{
@@ -838,16 +846,27 @@ int main( int argc, char* argv[] )
 	static char HIDCompiler[100];
 	static char Version[100];
 
+    // check for switches given on the command line
+    if ( ( argc > 0 ) && ( 0 == strcmp( argv[0], "-verbose" ) ) )
+    {
+        bVerbose = true;
+        for ( size_t i=0; i<argc-1; ++i )
+        {
+            argv[i] = argv[i+1];
+            --argc;
+        }
+    }
 
 	makeversion( Version );
 	strcpy( HIDCompiler, Compiler );
 	strcat( HIDCompiler, Version  );
 	strcat( HIDCompiler, Author   );
-	fprintf( stderr, "\n %s \n\n", HIDCompiler);
+	if ( bVerbose )
+	    fprintf( stdout, "\n %s \n\n", HIDCompiler);
 	if(argc < 4) {
 		fprintf(
 		stderr,
-		"usage: hidc file.src file.c project \n"
+		"usage: hidc [-verbose] file.src file.c project\n"
 		"\n"
 		"You must give exactly 3 arguments.\n"
 		"1 - an existing SRC file.\n"
diff --git a/soltools/checkdll/checkdll.c b/soltools/checkdll/checkdll.c
index 85f526c4632f..722aa7ba979b 100644
--- a/soltools/checkdll/checkdll.c
+++ b/soltools/checkdll/checkdll.c
@@ -47,33 +47,39 @@ static const char *psymbol      = "GetVersionInfo";
 
 void usage()
 {
-    fprintf(stderr, "usage: %s <dllname>\n", pprog_name);
+    fprintf(stderr, "usage: %s [-s] <dllname>\n", pprog_name);
     return;
 }
 
 int main(int argc, char *argv[])
 {
     int     rc;
+    int     silent=0;
     void    *phandle;
     char    *(*pfun)(void);
 
-    if ( argc < 2 || argc > 3) {
+    if ( argc < 2 || argc > 4) {
         usage();
         return 1;
     }
 
+    if ( !strcmp(argv[1],"-s") ) {
+        silent = 1;
+        ++argv, --argc;
+    }
+
     if ( (rc = access( argv[1], R_OK )) == -1 ) {
         fprintf(stderr, "%s: ERROR: %s: %s\n",
                 pprog_name, argv[1], strerror(errno));
         return 2;
     }
 
-    printf("Checking DLL %s ...", argv[1]);
+    if (!silent) printf("Checking DLL %s ...", argv[1]);
     fflush(stdout);
 
     if ( (phandle = dlopen(argv[1], RTLD_NOW)) != NULL ) {
         if  ( (pfun = (char *(*)(void))dlsym(phandle, psymbol)) != NULL ) {
-            printf(": ok\n");
+            if (!silent) printf(": ok\n");
         }
         else
         {
diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c
index be15eb0a13c0..134bf0075cf2 100644
--- a/soltools/cpp/_cpp.c
+++ b/soltools/cpp/_cpp.c
@@ -30,8 +30,6 @@ __cdecl
     time_t t;
     char ebuf[BUFSIZ];
 
-    fprintf(stderr,"%s","cpp version 17.8.1999\n");
-
     setbuf(stderr, ebuf);
     t = time(NULL);
     curtime = ctime(&t);