[ooo-build-commit] Branch 'ooo/OOO310' - 2 commits - scp2/source solenv/bin
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Jun 9 17:02:45 PDT 2009
scp2/source/calc/file_calc.scp | 6 +-
scp2/source/ooo/file_library_ooo.scp | 4 -
solenv/bin/modules/installer/environment.pm | 1
solenv/bin/modules/installer/epmfile.pm | 57 ++++++++++++++--------------
solenv/bin/modules/installer/globals.pm | 1
5 files changed, 37 insertions(+), 32 deletions(-)
New commits:
commit 87398f0239ad564740d632bf4da42801023d6af9
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 9 07:12:06 2009 +0000
CWS-TOOLING: integrate CWS ooo31osol
2009-05-14 15:49:09 +0200 ihi r271896 : #i101913# added missing solaris entries
2009-05-14 12:36:19 +0200 ihi r271885 : #i101913# ARCH -> all
2009-05-13 11:14:52 +0200 jl r271846 : #i101457# Do not search for Java every time OOo starts
2009-05-13 08:49:28 +0200 jl r271838 : #tr6585548# Redone last change. On Solaris we do not scan the directories anymore and instead just ckeck /usr/jdk/latest
2009-05-12 17:10:03 +0200 jl r271828 : #i64357# We scan on Unix only for a java in different folders if we haven't found one by looking into JAVA_HOME or PATH
2009-05-12 13:17:04 +0200 releng r271819 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
2009-05-12 13:08:28 +0200 is r271816 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index ad28175..95ffca4 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -109,6 +109,7 @@ sub set_global_environment_variables
if ( $ENV{'MAX_LANG_LENGTH'} ) { $installer::globals::max_lang_length = $ENV{'MAX_LANG_LENGTH'}; }
if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
+ if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
}
1;
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index d26b76e..0d04416 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2371,39 +2371,42 @@ sub create_packages_without_epm
# compressing packages
- my $faspac = "faspac-so.sh";
+ if ( ! $installer::globals::solarisdontcompress )
+ {
+ my $faspac = "faspac-so.sh";
- my $compressorref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$faspac, $includepatharrayref, 0);
- if ($$compressorref ne "")
- {
- # Saving original pkginfo, to set time stamp later
- my $pkginfoorig = "$destinationdir/$packagename/pkginfo";
- my $pkginfotmp = "$destinationdir/$packagename" . ".pkginfo.tmp";
- $systemcall = "cp -p $pkginfoorig $pkginfotmp";
- make_systemcall($systemcall);
+ my $compressorref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$faspac, $includepatharrayref, 0);
+ if ($$compressorref ne "")
+ {
+ # Saving original pkginfo, to set time stamp later
+ my $pkginfoorig = "$destinationdir/$packagename/pkginfo";
+ my $pkginfotmp = "$destinationdir/$packagename" . ".pkginfo.tmp";
+ $systemcall = "cp -p $pkginfoorig $pkginfotmp";
+ make_systemcall($systemcall);
- $faspac = $$compressorref;
- $infoline = "Found compressor: $faspac\n";
- push( @installer::globals::logfileinfo, $infoline);
+ $faspac = $$compressorref;
+ $infoline = "Found compressor: $faspac\n";
+ push( @installer::globals::logfileinfo, $infoline);
- installer::logger::print_message( "... $faspac ...\n" );
- installer::logger::include_timestamp_into_logfile("Starting $faspac");
+ installer::logger::print_message( "... $faspac ...\n" );
+ installer::logger::include_timestamp_into_logfile("Starting $faspac");
- $systemcall = "/bin/sh $faspac -a -q -d $destinationdir $packagename"; # $faspac has to be the absolute path!
- make_systemcall($systemcall);
+ $systemcall = "/bin/sh $faspac -a -q -d $destinationdir $packagename"; # $faspac has to be the absolute path!
+ make_systemcall($systemcall);
- # Setting time stamp for pkginfo, because faspac-so.sh changed the pkginfo file,
- # updated the size and checksum, but not the time stamp.
- $systemcall = "touch -r $pkginfotmp $pkginfoorig";
- make_systemcall($systemcall);
- if ( -f $pkginfotmp ) { unlink($pkginfotmp); }
+ # Setting time stamp for pkginfo, because faspac-so.sh changed the pkginfo file,
+ # updated the size and checksum, but not the time stamp.
+ $systemcall = "touch -r $pkginfotmp $pkginfoorig";
+ make_systemcall($systemcall);
+ if ( -f $pkginfotmp ) { unlink($pkginfotmp); }
- installer::logger::include_timestamp_into_logfile("End of $faspac");
- }
- else
- {
- $infoline = "Not found: $faspac\n";
- push( @installer::globals::logfileinfo, $infoline);
+ installer::logger::include_timestamp_into_logfile("End of $faspac");
+ }
+ else
+ {
+ $infoline = "Not found: $faspac\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ }
}
# Setting unix rights to "775" for all created directories inside the package
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 18334da..f82f708 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -180,6 +180,7 @@ BEGIN
$englishlicenseset = 0;
$englishlicense = "";
$englishsolarislicensename = "LICENSE_en-US";
+ $solarisdontcompress = 0;
$patharray = "";
$is_special_epm = 0;
commit ed6f09cd6442b70d77284aba9d7ae9f4adb5ca4e
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 9 06:07:51 2009 +0000
CWS-TOOLING: integrate CWS calc311fixes
2009-05-26 16:43:50 +0200 nn r272311 : patch flags
2009-05-26 15:20:08 +0200 nn r272306 : CWS-TOOLING: rebase CWS calc311fixes to branches/OOO310 at 272261 (milestone: OOO310:m12)
2009-05-26 13:39:20 +0200 nn r272298 : #i101960# UpdateExternalRefLinks: set document modified
2009-05-20 20:02:01 +0200 dr r272148 : #i102056# drag and drop of note cells loses cell contents
2009-05-19 17:37:04 +0200 nn r272091 : #i101273# #i101304# #i101319# copied from CWS calclinkfixes
2009-05-13 18:46:19 +0200 nn r271869 : #i101690# copied from CWS calc50
2009-05-13 17:45:18 +0200 nn r271867 : #i101869# DeleteRange: before broadcasting, check if EndListening removed the note cells
2009-05-11 18:44:54 +0200 nn r271784 : #i101725# don't copy hash_set with pointers from the other collection
2009-05-11 18:39:33 +0200 nn r271782 : #i101512# copied from CWS calc50
2009-05-11 18:39:22 +0200 nn r271781 : #i101512# copied from CWS calc50
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index adc5be4..947b169 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -45,11 +45,11 @@ STD_UNO_LIB_FILE( gid_File_Lib_Calc, calc)
STD_UNO_LIB_FILE( gid_File_Lib_Date, date)
-STD_UNO_LIB_FILE( gid_File_Lib_Sc, sc)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_Sc, sc)
-STD_LIB_FILE( gid_File_Lib_Scui, scui)
+STD_LIB_FILE_PATCH( gid_File_Lib_Scui, scui)
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_LIB_FILE_PATCH( gid_File_Lib_Scfilt, scfilt)
STD_UNO_LIB_FILE( gid_File_Lib_Scd, scd)
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 477cd1d..70a8651 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1789,6 +1789,6 @@ End
STD_UNO_LIB_FILE(gid_File_Lib_Unordf, unordf)
-STD_UNO_LIB_FILE( gid_File_Lib_For, for)
-STD_LIB_FILE( gid_File_Lib_Forui, forui)
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_For, for)
+STD_LIB_FILE_PATCH( gid_File_Lib_Forui, forui)
More information about the ooo-build-commit
mailing list