diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2008-12-08 13:29:09 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2008-12-08 13:29:09 +0000 |
commit | 3bb88621d3a61d700c50487fc79ebba066e57c63 (patch) | |
tree | 4fb4aefda9b836211d5dc9c81504a4adb71f65db | |
parent | 710b6200c9a051aca5bc11d3bd5c2c99f084b7de (diff) |
CWS-TOOLING: integrate CWS rt35
2008-12-02 08:25:35 +0100 rt r264658 : Do not print useless outdated version info.
checkdeliver: store errors to file to ease later analysis.
2008-12-01 17:40:03 +0100 rt r264622 : #i96749# Only copy when file exists
2008-12-01 15:28:07 +0100 rt r264610 : #i96749# Avoid collisions when creating zip archive of files delivered into common tree.
2008-11-28 13:20:52 +0100 rt r264545 : #i90846# Old 'cmake' makefile, must be obsolete since ages.
2008-11-28 13:18:12 +0100 rt r264544 : #i90846# Remove old StarDivision copyright notices.
-rw-r--r-- | postprocess/checkdeliver/checkdeliver.pl | 21 | ||||
-rw-r--r-- | postprocess/checkdeliver/makefile.mk | 2 | ||||
-rwxr-xr-x | postprocess/packconfig/packconfig.pl | 4 | ||||
-rwxr-xr-x | postprocess/rebase/rebase.pl | 4 | ||||
-rw-r--r-- | postprocess/signing/signing.pl | 4 |
5 files changed, 18 insertions, 17 deletions
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl index 6c4a12be220d..986ba3657dbd 100644 --- a/postprocess/checkdeliver/checkdeliver.pl +++ b/postprocess/checkdeliver/checkdeliver.pl @@ -39,6 +39,7 @@ eval 'exec perl -wS $0 ${1+"$@"}' use strict; use Getopt::Long; use File::stat; +use IO::Handle; #### globals ##### @@ -144,11 +145,12 @@ sub check my %delivered; my $module; my $islinked = 0; + STDOUT->autoflush(1); # which module are we checking? if ( $listname =~ /\/([\w-]+?)\/deliver\.log$/o) { $module = $1; } else { - print STDERR "Error: cannot determine module name from \'$listname\'\n"; + print "Error: cannot determine module name from \'$listname\'\n"; return 1; } # is module physically accessible? @@ -166,7 +168,7 @@ sub check # print STDERR "Warning: module '$module' not found. Skipping.\n"; return $error; } - print STDERR "Error: module '$module' not found.\n"; + print "Error: module '$module' not found.\n"; $error++; return $error; } @@ -180,15 +182,13 @@ sub check foreach ( <DELIVERLOG> ) { next if ( /^LINK / ); # For now we concentrate on binaries, located in 'bin' or 'lib'. - # It probably is a good idea to check all files but this requires some - # d.lst cleanup which is beyond the current scope. -> TODO next if ( ! / $module\/$platform\/[bl]i[nb]\// ); next if ( /\.html$/ ); chomp; if ( /^\w+? (\S+) (\S+)\s*$/o ) { $delivered{$1} = $2; } else { - print STDERR "Warning: cannot parse \'$listname\' line\n\'$_\'\n"; + print "Warning: cannot parse \'$listname\' line\n\'$_\'\n"; } } close( DELIVERLOG ); @@ -222,19 +222,20 @@ sub check # rebasing, but only increase. It must not happen that a file on # solver is older than it's source. if ( ( $orgfile_stats->mtime - $delivered_stats->mtime ) gt 1 ) { - print STDERR "Error: "; - print STDERR "delivered file is older than it's source '$ofile' '$sfile'\n"; + print "Error: "; + print "delivered file is older than it's source '$ofile' '$sfile'\n"; $error ++; } } else { - print STDERR "Error: no such file '$ofile'\n" if ( ! $orgfile_stats ); - print STDERR "Error: no such file '$sfile'\n" if ( ! $delivered_stats ); + print "Error: no such file '$ofile'\n" if ( ! $orgfile_stats ); + print "Error: no such file '$sfile'\n" if ( ! $delivered_stats ); $error ++; } } if ( $error ) { - print STDERR "Errors found: Module '$module' not delivered correctly?\n\n"; + print "$error errors found: Module '$module' not delivered correctly?\n\n"; } + STDOUT->autoflush(0); return $error; } diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk index 63fb4f4b9283..3a515a6449d7 100644 --- a/postprocess/checkdeliver/makefile.mk +++ b/postprocess/checkdeliver/makefile.mk @@ -42,5 +42,5 @@ TARGET=checkdeliver ALLTAR : $(MISC)$/checkdeliver.done $(MISC)$/checkdeliver.done .PHONY: - $(PERL) checkdeliver.pl + $(PERL) checkdeliver.pl > $@ || cat $@ diff --git a/postprocess/packconfig/packconfig.pl b/postprocess/packconfig/packconfig.pl index cd62ec7189bb..0d4728497d75 100755 --- a/postprocess/packconfig/packconfig.pl +++ b/postprocess/packconfig/packconfig.pl @@ -56,11 +56,11 @@ my $do_rebuild = 0; # is rebuilding zipfile required? ( my $script_name = $0 ) =~ s/^.*\b(\w+)\.pl$/$1/; my $script_rev; -my $id_str = ' $Revision: 1.3 $ '; +my $id_str = ' $Revision$ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); -print "$script_name -- version: $script_rev\n"; +#print "$script_name -- version: $script_rev\n"; #### main ##### diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl index 0d061a6f0023..6e4afc58428d 100755 --- a/postprocess/rebase/rebase.pl +++ b/postprocess/rebase/rebase.pl @@ -80,10 +80,10 @@ sub script_id ( my $script_name = $0 ) =~ s/^.*[\\\/]([\w\.]+)$/$1/; my $script_rev; - my $id_str = ' $Revision: 1.5 $ '; + my $id_str = ' $Revision$ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); - print "\n$script_name -- version: $script_rev\n"; +# print "\n$script_name -- version: $script_rev\n"; return $script_name; } diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl index 03bbbc4fb592..a2703f80d225 100644 --- a/postprocess/signing/signing.pl +++ b/postprocess/signing/signing.pl @@ -77,10 +77,10 @@ sub script_id ( my $script_name = $0 ) =~ s/^.*[\\\/]([\w\.]+)$/$1/; my $script_rev; - my $id_str = ' $Revision: 1.3 $ '; + my $id_str = ' $Revision$ '; $id_str =~ /Revision:\s+(\S+)\s+\$/ ? ($script_rev = $1) : ($script_rev = "-"); - print "\n$script_name -- version: $script_rev\n"; +# print "\n$script_name -- version: $script_rev\n"; return $script_name; } |