summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:18:51 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:18:51 +0200
commite5d0618b34bfcd1d51f053b35771f20d40a0813e (patch)
tree3046d67e4103bfb85a609ce707b2e3f9bec5160d
parentf096fb3b28bc9da2581d15cc61c80babc1516b5e (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit 634552bb653af74dc0c76090ca00f8c1bbc2b3c7 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:45 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 28074451d6e974855f121fc3cb834175db14c1cd Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:29 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit cc61189c518e1a943d4568d43a8a4d37e2a358fd Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:58 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 94a54c7ff4f2424e0b7a29919bf9eb0b150133c5 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:09 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: postprocess_libreoffice-3.3.1.1 split repo tag: postprocess_libreoffice-3.3.1.2
-rw-r--r--postprocess/checkdeliver/checkdeliver.pl4
-rw-r--r--postprocess/checkxml/checkxml.pl2
-rwxr-xr-xpostprocess/packconfig/packconfig.pl20
-rwxr-xr-xpostprocess/rebase/rebase.pl22
-rw-r--r--postprocess/signing/signing.pl68
5 files changed, 58 insertions, 58 deletions
diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 4ab64cdb39af..b68b8eea654d 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -278,7 +278,7 @@ sub is_moduledirectory
sub print_logged
# Print routine.
-# If a log file name is specified with '-l' option, print_logged() prints to that file
+# If a log file name is specified with '-l' option, print_logged() prints to that file
# as well as to STDOUT. If '-l' option is not set, print_logged() just writes to STDOUT
{
my $message = shift;
diff --git a/postprocess/checkxml/checkxml.pl b/postprocess/checkxml/checkxml.pl
index 385784a019e9..21af072be8a0 100644
--- a/postprocess/checkxml/checkxml.pl
+++ b/postprocess/checkxml/checkxml.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
diff --git a/postprocess/packconfig/packconfig.pl b/postprocess/packconfig/packconfig.pl
index 5dcb48fa8c0a..835c20b257c5 100755
--- a/postprocess/packconfig/packconfig.pl
+++ b/postprocess/packconfig/packconfig.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -83,14 +83,14 @@ sub parse_options
my $opt_help;
my $p = Getopt::Long::Parser->new();
my $success =$p->getoptions(
- '-h' => \$opt_help,
+ '-h' => \$opt_help,
'-o=s' => \$out_file,
'-i=s' => \$files_path,
'-v' => \$verbose,
'-vv' => \$extra_verbose
);
- if ( $opt_help || !$success || !$out_file || !$files_path )
+ if ( $opt_help || !$success || !$out_file || !$files_path )
{
usage();
exit(1);
@@ -116,9 +116,9 @@ sub parse_options
sub get_files
{
local @main::file_list;
-
+
find_files(\%files_hash);
-
+
if ( !keys %files_hash ) {
print_error("can't find any image lists in '$files_path'", 3);
}
@@ -132,31 +132,31 @@ sub find_files
find({ wanted => \&wanted, no_chdir => 0 }, "$files_path");
foreach ( @main::file_list ) {
/^\Q$files_path\E\/(.*)$/o;
- $files_hash_ref->{$1}++;
+ $files_hash_ref->{$1}++;
}
}
sub wanted
{
my $file = $_;
-
+
if ( $file =~ /.*\.xml$/ && -f $file ) {
push @main::file_list, $File::Find::name;
}
}
-sub is_file_newer
+sub is_file_newer
{
my $test_hash_ref = shift;
my $reference_stamp = 0;
-
+
print_message("checking timestamps ...") if $verbose;
if ( -e $out_file ) {
$reference_stamp = (stat($out_file))[9];
print_message("found $out_file with $reference_stamp ...") if $verbose;
}
return 1 if $reference_stamp == 0;
-
+
foreach ( sort keys %{$test_hash_ref} ) {
my $path = $files_path;
$path .= "/" if "$path" ne "";
diff --git a/postprocess/rebase/rebase.pl b/postprocess/rebase/rebase.pl
index 5d40668dec73..c440dc39974a 100755
--- a/postprocess/rebase/rebase.pl
+++ b/postprocess/rebase/rebase.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -29,16 +29,16 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#*************************************************************************
#
-# rebase.pl - rebase windows dlls
+# rebase.pl - rebase windows dlls
#
-# This perl script is to rebase all windows dlls. In principle this could
+# This perl script is to rebase all windows dlls. In principle this could
# be done with one simple command line like f.e.
# rebase -b 0x68000000 -d -R foo_dir -N bar.txt $(SOLARBINDIR)$/*.dll
-# That would work fine for creating complete office install sets, but it
-# could fail as soon as we are going to ship single dlls for a product
+# That would work fine for creating complete office install sets, but it
+# could fail as soon as we are going to ship single dlls for a product
# patch. Therefore, this wrapper perl script is used. It reads a given base
# address file and rebases all files mentioned to the same address as
-# previously. New dlls get appended to the list.
+# previously. New dlls get appended to the list.
use strict;
@@ -46,7 +46,7 @@ use strict;
my $myname = '';
my $options_string = ''; # order of options is important
-my %options_hash;
+my %options_hash;
my $rebase_files;
my $misc_dir = $ENV{TEMP};
my $lastaddress;
@@ -58,7 +58,7 @@ my @new_files;
$myname = script_id();
parse_options();
my %lastrun = read_coffbase( \$lastaddress );
-# Get files specified on command line. Differ between those already
+# Get files specified on command line. Differ between those already
# listed in coffbase (%options_hash{'C'}) and additional ones.
get_files( \@old_files, \@new_files );
# Rebase libraries already listed in coffbase to the addresses given there.
@@ -83,11 +83,11 @@ sub script_id
return $script_name;
}
-
+
sub parse_options
{
use Getopt::Std;
- if ( !getopts('C:b:de:l:m:R:N:v', \%options_hash) || ($#ARGV < 0) ) {
+ if ( !getopts('C:b:de:l:m:R:N:v', \%options_hash) || ($#ARGV < 0) ) {
print STDERR "Error: invalid command line.\n\n";
usage ();
exit 1;
@@ -298,5 +298,5 @@ sub usage
print "\t -v Verbose.\n";
return;
}
-
+
diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index f28d348a022f..203ed3536706 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -4,7 +4,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
+#
# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
@@ -32,21 +32,21 @@ use strict;
use Getopt::Long;
my $debug = 0;
-my $max_files = 20; # sign $max_files with one command line
+my $max_files = 20; # sign $max_files with one command line
#### globals #####
-my $myname = "";
-my $opt_dir = "";
+my $myname = "";
+my $opt_dir = "";
my $opt_exclude = ""; # file with a list of not signable dll and exe files
my $opt_verbose = 0;
-my $opt_help = 0;
-my $opt_log = ""; # for logging
-my $opt_pass = ""; # password for signing
-my $opt_pfxfile = ""; # Personal Information Exchange file
+my $opt_help = 0;
+my $opt_log = ""; # for logging
+my $opt_pass = ""; # password for signing
+my $opt_pfxfile = ""; # Personal Information Exchange file
my $opt_timestamp_url = ""; # timestamp url
-my %exclude_files = (); # list of not signable dll and exe files
+my %exclude_files = (); # list of not signable dll and exe files
my $signtool = "signtool.exe sign";
-my @args = ();
+my @args = ();
my @files_to_sign = ();
#### main #####
@@ -81,7 +81,7 @@ sub script_id
}
############################################################################
-sub parse_options #09.07.2007 08:13
+sub parse_options #09.07.2007 08:13
############################################################################
{
# e exclude list file
@@ -99,10 +99,10 @@ sub parse_options #09.07.2007 08:13
exit(1);
}
return @ARGV;
-} ##parse_options
+} ##parse_options
############################################################################
-sub get_exclude_files #09.07.2007 10:12
+sub get_exclude_files #09.07.2007 10:12
############################################################################
{
if ( -e $opt_exclude ) {
@@ -110,17 +110,17 @@ sub get_exclude_files #09.07.2007 10:12
open( IN, "<$opt_exclude") || die "Can't open exclude file $opt_exclude\n";
while ( my $line = <IN> ) {
chomp($line);
- $exclude_files{$line} = 1; # fill hash
+ $exclude_files{$line} = 1; # fill hash
print "$line - $exclude_files{$line}\n" if ($debug);
}
} else
{
print_error("Can't open $opt_exclude file!\n");
}
-} ##get_exclude_files
+} ##get_exclude_files
############################################################################
-sub get_files #10.07.2007 10:19
+sub get_files #10.07.2007 10:19
############################################################################
{
use File::Basename;
@@ -146,10 +146,10 @@ sub get_files #10.07.2007 10:19
}
print "\n";
return @files;
-} ##get_files
+} ##get_files
############################################################################
-sub sign_files #09.07.2007 10:36
+sub sign_files #09.07.2007 10:36
############################################################################
{
my $files_to_sign = shift;
@@ -178,14 +178,14 @@ sub sign_files #09.07.2007 10:36
{
exec_single_sign($files_to_sign, $commandline_base);
}
-} ##sign_files
+} ##sign_files
############################################################################
-sub exec_single_sign #11.07.2007 09:05
+sub exec_single_sign #11.07.2007 09:05
############################################################################
{
my $files_to_sign = shift;
- my $commandline_base = shift; # contains whole stuff without the file name
+ my $commandline_base = shift; # contains whole stuff without the file name
my $file = "";
my $commandline = "";
@@ -195,16 +195,16 @@ sub exec_single_sign #11.07.2007 09:05
print "$commandline\n" if ($debug);
execute($commandline);
} #foreach
-} ##exec_single_sign
+} ##exec_single_sign
############################################################################
-sub exec_multi_sign #11.07.2007 08:56
+sub exec_multi_sign #11.07.2007 08:56
############################################################################
{
# sign multiple file with one command line
my $files_to_sign = shift;
- my $commandline_base = shift; # contains whole stuff without the file name
- my $commandline = $commandline_base; # contains stuff which will be executed
+ my $commandline_base = shift; # contains whole stuff without the file name
+ my $commandline = $commandline_base; # contains stuff which will be executed
my $file = "";
my $counter = 0;
@@ -214,15 +214,15 @@ sub exec_multi_sign #11.07.2007 08:56
++$counter;
if ( $counter >= $max_files ) {
execute($commandline);
- $counter = 0; # reset counter
+ $counter = 0; # reset counter
$commandline = $commandline_base; # reset command line
}
}
execute($commandline) if ($counter > 0);
-} ##exec_multi_sign
+} ##exec_multi_sign
############################################################################
-sub execute #11.07.2007 10:02
+sub execute #11.07.2007 10:02
############################################################################
{
my $commandline = shift;
@@ -238,21 +238,21 @@ sub execute #11.07.2007 10:02
} # if error
} # while
close PIPE;
-} ##execute
+} ##execute
############################################################################
-sub print_error #09.07.2007 11:21
+sub print_error #09.07.2007 11:21
############################################################################
{
my $text = shift;
print "ERROR: $text\n";
print LOG "ERROR: $text\n" if ($opt_log); # logging
- close LOG if ($opt_log); # logging
+ close LOG if ($opt_log); # logging
exit(1);
-} ##print_error
+} ##print_error
############################################################################
-sub usage #09.07.2007 08:39
+sub usage #09.07.2007 08:39
############################################################################
{
print "Usage:\t $myname <-e filename> <-f filename> <-p password> <-t timestamp> [-l filename] [-v] <file[list]> \n";
@@ -266,7 +266,7 @@ sub usage #09.07.2007 08:39
print "\t\t\t\t\tMandatory.\n";
print "\t -l log_filename\t\tFile for logging.\n";
print "\t -v\t\t\t\tVerbose.\n";
-} ##usage
+} ##usage