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
This commit is contained in:
Vladimir Glazounov
parent
78a8eaf882
commit
78fb90c1b0
@ -69,11 +69,15 @@ public:
|
||||
|
||||
const StringVector& getInputFiles() const { return m_inputFiles; }
|
||||
bool readStdin() const { return m_stdin; }
|
||||
bool verbose() const { return m_verbose; }
|
||||
bool quiet() const { return m_quiet; }
|
||||
|
||||
protected:
|
||||
::rtl::OString m_program;
|
||||
StringVector m_inputFiles;
|
||||
bool m_stdin;
|
||||
bool m_verbose;
|
||||
bool m_quiet;
|
||||
OptionMap m_options;
|
||||
};
|
||||
|
||||
|
||||
@ -56,11 +56,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|
||||
|
||||
sal_Int32 nErrors = 0;
|
||||
if (options.readStdin()) {
|
||||
fprintf(
|
||||
stdout, "%s: compile stdin...\n",
|
||||
options.getProgramName().getStr());
|
||||
if ( !options.quiet() )
|
||||
fprintf(
|
||||
stdout, "%s: Compiling stdin\n",
|
||||
options.getProgramName().getStr());
|
||||
nErrors = compileFile(0);
|
||||
if (idlc()->getWarningCount() > 0) {
|
||||
if ( ( idlc()->getWarningCount() > 0 ) && !options.quiet() ) {
|
||||
fprintf(
|
||||
stdout, "%s: detected %lu warnings compiling stdin\n",
|
||||
options.getProgramName().getStr(),
|
||||
@ -85,16 +86,23 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|
||||
idlc()->reset();
|
||||
}
|
||||
StringVector const & files = options.getInputFiles();
|
||||
if ( options.verbose() )
|
||||
{
|
||||
fprintf( stdout, "%s: compiling %i source files ... \n",
|
||||
options.getProgramName().getStr(), (int)files.size() );
|
||||
fflush( stdout );
|
||||
}
|
||||
for (StringVector::const_iterator i(files.begin());
|
||||
i != files.end() && nErrors == 0; ++i)
|
||||
{
|
||||
OString sysFileName( convertToAbsoluteSystemPath(*i) );
|
||||
|
||||
fprintf(stdout, "%s: compile '%s' ... \n",
|
||||
options.getProgramName().getStr(), (*i).getStr());
|
||||
if ( !options.quiet() )
|
||||
fprintf(stdout, "Compiling: %s\n",
|
||||
(*i).getStr());
|
||||
nErrors = compileFile(&sysFileName);
|
||||
|
||||
if ( idlc()->getWarningCount() )
|
||||
if ( idlc()->getWarningCount() && !options.quiet() )
|
||||
fprintf(stdout, "%s: detected %lu warnings compiling file '%s'\n",
|
||||
options.getProgramName().getStr(),
|
||||
sal::static_int_cast< unsigned long >(
|
||||
@ -128,15 +136,16 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
|
||||
|
||||
if ( nErrors > 0 )
|
||||
{
|
||||
fprintf(stdout, "%s: detected %ld errors%s",
|
||||
fprintf(stderr, "%s: detected %ld errors%s",
|
||||
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());
|
||||
if ( options.verbose() )
|
||||
fprintf(stdout, "%s: returned successful%s",
|
||||
options.getProgramName().getStr(),
|
||||
options.prepareVersion().getStr());
|
||||
}
|
||||
return nErrors;
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
|
||||
using namespace rtl;
|
||||
|
||||
Options::Options(): m_stdin(false)
|
||||
Options::Options(): m_stdin(false), m_verbose(false), m_quiet(false)
|
||||
{
|
||||
}
|
||||
|
||||
@ -190,6 +190,22 @@ sal_Bool Options::initOptions(int ac, char* av[], sal_Bool bCmdFile)
|
||||
} else
|
||||
throw IllegalArgument(OString(av[j]) + ", please check your input");
|
||||
break;
|
||||
case 'v':
|
||||
if ( 0 == strcmp( &av[j][1], "verbose" ) )
|
||||
{
|
||||
m_verbose = true;
|
||||
}
|
||||
else
|
||||
throw IllegalArgument(OString(av[j]) + ", please check your input");
|
||||
break;
|
||||
case 'q':
|
||||
if ( 0 == strcmp( &av[j][1], "quiet" ) )
|
||||
{
|
||||
m_quiet = true;
|
||||
}
|
||||
else
|
||||
throw IllegalArgument(OString(av[j]) + ", please check your input");
|
||||
break;
|
||||
case 'w':
|
||||
if (av[j][2] == 'e' && av[j][3] == '\0') {
|
||||
if (m_options.count("-we") == 0)
|
||||
|
||||
@ -164,14 +164,14 @@ ALLTAR : $(UCR)$/types.db \
|
||||
$(UNOTYPE_STATISTICS)
|
||||
|
||||
$(UCR)$/types.db : $(UCR)$/offapi.db $(SOLARBINDIR)$/udkapi.rdb
|
||||
-$(RM) $(REGISTRYCHECKFLAG)
|
||||
$(GNUCOPY) -f $(UCR)$/offapi.db $@
|
||||
$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
|
||||
@-$(RM) $(REGISTRYCHECKFLAG)
|
||||
@$(GNUCOPY) -f $(UCR)$/offapi.db $@
|
||||
$(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi.rdb
|
||||
|
||||
$(OUT)$/ucrdoc$/types_doc.db : $(OUT)$/ucrdoc$/offapi_doc.db $(SOLARBINDIR)$/udkapi_doc.rdb
|
||||
-$(RM) $(REGISTRYCHECKFLAG)
|
||||
$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
|
||||
$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
|
||||
@-$(RM) $(REGISTRYCHECKFLAG)
|
||||
@$(GNUCOPY) -f $(OUT)$/ucrdoc$/offapi_doc.db $@
|
||||
$(COMMAND_ECHO)$(REGMERGE) $@ / $(SOLARBINDIR)$/udkapi_doc.rdb
|
||||
|
||||
#JSC: The type library has changed, all temporary not checked types are removed
|
||||
# and will be check from now on.
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#*************************************************************************
|
||||
|
||||
$(OUT)$/misc$/$(TARGET).idls: makefile.mk
|
||||
-$(RM) $@
|
||||
$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
|
||||
$(COMMAND_ECHO)-$(RM) $@
|
||||
$(COMMAND_ECHO)$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
|
||||
|
||||
ALLTAR: $(OUT)$/misc$/$(TARGET).idls
|
||||
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#*************************************************************************
|
||||
|
||||
$(OUT)$/misc$/$(TARGET).idls: makefile.mk
|
||||
-$(RM) $@
|
||||
$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
|
||||
$(COMMAND_ECHO)-$(RM) $@
|
||||
$(COMMAND_ECHO)$(TYPE) $(mktmp $(foreach,i,$(IDLFILES) $(PACKAGE)$/$i)) >>$@
|
||||
|
||||
ALLTAR: $(OUT)$/misc$/$(TARGET).idls
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user