[ooo-build-commit] Branch 'ooo/master' - 3 commits - solenv/bin solenv/config
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Aug 31 17:08:23 PDT 2009
solenv/bin/deliver.pl | 32 ++++++++++++++++++++++++++++----
solenv/config/sdev300.ini | 18 +++++++++---------
2 files changed, 37 insertions(+), 13 deletions(-)
New commits:
commit d521caa5cdec4866509bfed84ff00fad89007a54
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Mon Aug 31 15:04:32 2009 +0000
#i10000#: update unxlngx6 environment
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 1d68384..d8b87b5 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -939,7 +939,7 @@ unxlngx6
COPYALL TRUE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+ PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
SOLARROOT %SOL_TMP%$/r
SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -951,7 +951,7 @@ unxlngx6
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+ PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
SOLARROOT %SOL_TMP%$/r
SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -963,7 +963,7 @@ unxlngx6
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+ PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
SOLARROOT %SOL_TMP%$/r
SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -1004,7 +1004,7 @@ unxlngx6
{
COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
DEVROOT %SOLAR_ENV_ROOT%
- PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin/perl
+ PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
PKGFORMAT rpm
PTHREAD_CFLAGS -DNPTL
SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
@@ -1013,7 +1013,7 @@ unxlngx6
SOLARROOT %SOLAR_ENV_ROOT%
SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
+ SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32
SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
@@ -1024,7 +1024,7 @@ unxlngx6
common2
{
ENABLE_GRAPHITE TRUE
- BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
+ BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
COM GCC
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
COMMON_ENV_TOOLS %SOLARROOT%$/etools
@@ -1033,7 +1033,7 @@ unxlngx6
CVER C341
ENABLE_KAB TRUE
ENABLE_KDE TRUE
- ENV_TOOLS %SOLARROOT%/et_linux_libc2.11/%WORK_STAMP%/bin
+ ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
GLIBC 2REDHAT60
GUI UNX
GUIBASE unx
commit 0f08bd11127c6d6280bec59bfc1a64e76ae2b7fe
Author: Oliver Bolte <obo at openoffice.org>
Date: Mon Aug 31 11:32:02 2009 +0000
#100000#,#160112# MAXPROC missing for cygwin + lucopy
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 44cc579..1d68384 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -3738,7 +3738,7 @@ wntmsci12
sh
{
400: if [ $COPYALL ]; then
- 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 410: perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
415: fi
600: umask 002
800: hash -r
@@ -3757,7 +3757,7 @@ wntmsci12
}
csh
{
- 400: if ( ${?COPYALL} ) perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET
+ 400: if ( ${?COPYALL} ) perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $ZIPSOURCE $BTARGET $MAXPROC
600: umask 002
800: rehash
850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
commit e8d7d0690bde35be08cf7aaca34eb99d29fb6253
Author: Rüdiger Timm <rt at openoffice.org>
Date: Mon Aug 31 08:48:51 2009 +0000
#i10000# 'deliver' sometimes fails in cases where several platforms simultaneously try to create the same big zip file in solver's 'common.pro' zip directory.
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index b165e37..3f22fa4 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -1225,7 +1225,19 @@ sub zip_files
$work_file =~ s/\.zip$//;
$work_file .= (sprintf('.%d-%d', $$, time())) . ".zip";
die "Error: temp file $work_file already exists" if ( -e $work_file);
- copy($zip_file, $work_file) if ( -e $zip_file );
+ if ( -e $zip_file ) {
+ if ( -z $zip_file) {
+ # sometimes there are files of 0 byte size - remove them
+ unlink $zip_file or print_error("can't remove empty file '$zip_file': $!",0);
+ } else {
+ if ( ! copy($zip_file, $work_file)) {
+ # give a warning, not an error:
+ # we can zip from scratch instead of just updating the old zip file
+ print_warning("can't copy'$zip_file' into '$work_file': $!", 0);
+ unlink $work_file;
+ }
+ }
+ }
} else {
# No pre processing necessary, working directly on solver.
$work_file = $zip_file;
@@ -1267,9 +1279,21 @@ sub zip_files
} elsif ( $zip_file eq $common_zip_file) {
# rename work file back
if ( -e $work_file ) {
- if (! rename($work_file, $zip_file)) {
- print_error("can't rename temporary file to $zip_file: $!",0);
- unlink $work_file;
+ if ( -e $zip_file) {
+ # do some tricks to be fast. otherwise we may disturb other platforms
+ # by unlinking a file which just gets copied -> stale file handle.
+ my $buffer_file=$work_file . '_rm';
+ rename($zip_file, $buffer_file) or warn "Warning: can't rename old zip file '$zip_file': $!";
+ if (! rename($work_file, $zip_file)) {
+ print_error("can't rename temporary file to $zip_file: $!",0);
+ unlink $work_file;
+ }
+ unlink $buffer_file;
+ } else {
+ if (! rename($work_file, $zip_file)) {
+ print_error("can't rename temporary file to $zip_file: $!",0);
+ unlink $work_file;
+ }
}
}
}
More information about the ooo-build-commit
mailing list