summaryrefslogtreecommitdiff
path: root/scp2/source/templates
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-10-21 10:43:22 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-10-21 10:43:22 +0000
commite89f88f7f11bd05a8695550c4d80d3c316b41a1a (patch)
tree567449345c6b72ca7778b0c3160d7ce020b5941f /scp2/source/templates
parentab3936a9825db6afc03009b7c046d224a0b2b1c1 (diff)
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
Diffstat (limited to 'scp2/source/templates')
-rwxr-xr-xscp2/source/templates/makefile.mk2
-rwxr-xr-xscp2/source/templates/modules.pl22
2 files changed, 20 insertions, 4 deletions
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 03b359068b26..59f5dab89f9e 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -52,5 +52,5 @@ PHONYTEMPL=.PHONY
.ENDIF # "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
$(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
@@-$(RENAME) $@ $@.tmp
- $(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+ $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
@echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
diff --git a/scp2/source/templates/modules.pl b/scp2/source/templates/modules.pl
index e022a0a71739..2b77662a95b8 100755
--- a/scp2/source/templates/modules.pl
+++ b/scp2/source/templates/modules.pl
@@ -36,6 +36,7 @@ my $infile = "";
my @infile = ();
my $globalcounter = 0;
my $globallinecounter = 0;
+my $verbose = 0;
if ( !defined $completelangiso_var) {
print STDERR "ERROR: No language defined!\n";
@@ -61,7 +62,7 @@ check_counter();
sub check_counter
{
- print STDERR "Wrote modules for $globalcounter languages ($globallinecounter lines)!\n";
+ print STDERR "Wrote modules for $globalcounter languages ($globallinecounter lines)!\n" if $verbose;
if ( $globalcounter == 0 )
{
print STDERR "ERROR: No languages found!\n";
@@ -113,6 +114,21 @@ sub write_ALL_MODULES
sub startup_check
{
my $i;
+
+ if ( $#ARGV >= 0 )
+ {
+ if ( $ARGV[0] eq "-verbose" )
+ {
+ $verbose = 1;
+ shift @ARGV;
+ }
+ elsif ( $ARGV[0] eq "-quiet" )
+ {
+ # no special quiet flag/mode
+ shift @ARGV;
+ }
+ }
+
for ( $i=0; $i <= $#ARGV; $i++) {
if ( "$ARGV[$i]" eq "-o" ) {
if ( defined $ARGV[ $i + 1] ) {
@@ -137,7 +153,7 @@ sub startup_check
open INFILE, "$infile" or die "$0 - ERROR: $infile exists but isn't readable.\n";
@infile = <INFILE>;
close( INFILE );
- print STDERR "Reading template file: $infile\n";
+ print STDERR "Reading template file: $infile\n" if $verbose;
my $num = $#infile + 1;
# print STDERR "Number of lines: $num\n";
} else {
@@ -168,6 +184,6 @@ sub startup_check
sub usage
{
print STDERR "Generate language modules from language script particle template (*.sct file)\n";
- print STDERR "perl $0 -o outputfile -i inputfile\n";
+ print STDERR "perl $0 [-verbose] -o outputfile -i inputfile\n";
exit 1;
}