[ooo-build-commit] Branch 'ooo/master' - 2 commits - scp2/source solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Jun 12 17:01:26 PDT 2009
scp2/source/ooo/file_library_ooo.scp | 2
scp2/source/ooo/module_hidden_ooo.scp | 1
solenv/bin/modules/installer/environment.pm | 2
solenv/bin/modules/installer/epmfile.pm | 57 ++++++++++++++--------------
solenv/bin/modules/installer/globals.pm | 1
solenv/inc/libs.mk | 2
6 files changed, 37 insertions(+), 28 deletions(-)
New commits:
commit 63c51b4f7da6511209d4421f3e61f1235ea6b95b
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jun 12 20:38:47 2009 +0000
CWS-TOOLING: integrate CWS ooo31osol_DEV300
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 119cde6..a7bc4dc 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -109,8 +109,8 @@ 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{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
+ 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 7077a1a..d3996ac 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2402,39 +2402,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 9b4e153..1e2436b 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -183,6 +183,7 @@ BEGIN
$englishlicenseset = 0;
$englishlicense = "";
$englishsolarislicensename = "LICENSE_en-US";
+ $solarisdontcompress = 0;
$patharray = "";
$is_special_epm = 0;
commit 956691f281422560959fc1f0bdfefcfa2ca1d46c
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Fri Jun 12 09:36:34 2009 +0000
CWS-TOOLING: integrate CWS unifypaper01
2009-05-27 17:14:41 +0200 cmc r272362 : #i92819#, psprint moved into vcl
2009-05-19 15:45:46 +0200 cmc r272083 : #i92819# having difficultly in getting this right under windows
2009-05-18 18:04:22 +0200 cmc r272043 : #i92819# missing some export magic somewhere
2009-05-18 15:34:18 +0200 cmc r272028 : #i92819# get depends right
2009-05-18 11:50:43 +0200 cmc r272010 : ##i92819# fix import/export stuff
2009-05-18 10:07:00 +0200 cmc r272000 : #i92819# fix window imp name
2009-05-16 15:17:23 +0200 cmc r271975 : #i92819# fix win paper names
2009-05-16 11:11:29 +0200 cmc r271974 : #i92819# std::abs prolematic for msvc
2009-05-15 15:36:56 +0200 cmc r271941 : #i92819# handle missing setting, at least on mac
2009-05-15 10:13:44 +0200 cmc r271927 : #i92819# adjust for moved page dialog
2009-05-14 13:47:14 +0200 cmc r271887 : remove dead files that reappeared
2009-05-14 09:57:17 +0200 cmc r271872 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 271830 (milestone: DEV300:m48)
2009-05-11 12:27:18 +0200 cmc r271763 : #i92819# check return value
2009-05-06 17:28:25 +0200 cmc r271602 : #i92819# these B4/B5s are the JIS ones according to their dimensions
2009-05-06 17:17:03 +0200 cmc r271601 : #i92819# micro-optimization
2009-05-03 18:20:48 +0200 cmc r271434 : #i92819# paper libs
2009-05-03 16:08:32 +0200 cmc r271433 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 271427 (milestone: DEV300:m47)
2009-04-06 15:33:37 +0200 cmc r270556 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 270033 (milestone: DEV300:m45)
2009-03-12 14:36:35 +0100 cmc r269415 : #i92819# merge paper utilities
2009-03-11 13:44:27 +0100 cmc r269328 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 269297 (milestone: DEV300:m43)
2009-03-09 14:42:07 +0100 cmc r269190 : remove config_office from synced version
2009-03-09 14:34:50 +0100 cmc r269187 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 268395 (milestone: DEV300:m42)
2009-03-09 12:11:29 +0100 cmc r269077 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 265758 (milestone: DEV300:m38)
2009-03-06 17:17:39 +0100 cmc r269027 : #i92819# paper goo
2008-12-04 11:29:30 +0100 cmc r264826 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 264807 (milestone: DEV300:m37)
2008-11-26 10:33:06 +0100 cmc r264357 : CWS-TOOLING: rebase CWS unifypaper01 to trunk at 264325 (milestone: DEV300:m36)
2008-11-21 14:09:36 +0100 cmc r264138 : #i92819# paper consolidation
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index e5cb237..cc07b32 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -717,6 +717,8 @@ File gid_File_Lib_I18nutil
Styles = (PACKED);
End
+STD_LIB_FILE( gid_File_Lib_I18npaper, i18npaper)
+
#ifndef SYSTEM_ICU
File gid_File_Lib_Icudata
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 09be710..3d9aefb 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -296,6 +296,7 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Fps_Gnome,
gid_File_Lib_Dbodbcbase,
gid_File_Lib_I18npool,
+ gid_File_Lib_I18npaper,
gid_File_Lib_I18nregexp,
gid_File_Lib_I18nsearch,
gid_File_Lib_I18nisolang,
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index b2199cb..b463b5d 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -56,6 +56,7 @@ ICUDATALIB=-licudata
I18NUTILLIB=-li18nutil$(COMID)
.INCLUDE .IGNORE : i18npool$/version.mk
I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
+I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
.IF "$(WITH_GPC)"!="NO"
GPC3RDLIB=-lgpc
.ENDIF
@@ -355,6 +356,7 @@ ICUUCLIB=icuuc.lib
ICUDATALIB=icudata.lib
I18NUTILLIB=ii18nutil.lib
I18NISOLANGLIB=ii18nisolang.lib
+I18NPAPERLIB=ii18npaper.lib
.IF "$(WITH_GPC)"!="NO"
GPC3RDLIB=gpc.lib
.ENDIF
More information about the ooo-build-commit
mailing list