[ooo-build-commit] Branch 'ooo/OOO310' - 4 commits - instsetoo_native/util scp2/source solenv/bin
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Jun 23 17:02:11 PDT 2009
instsetoo_native/util/openoffice.lst | 10 +++++-----
scp2/source/ooo/file_library_ooo.scp | 2 +-
scp2/source/ooo/ure.scp | 2 +-
solenv/bin/modules/installer/download.pm | 5 +++++
solenv/bin/modules/installer/windows/idtglobal.pm | 8 ++++----
5 files changed, 16 insertions(+), 11 deletions(-)
New commits:
commit a65bf30131172fff65d33feceecb970a24e74633
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 23 07:08:31 2009 +0000
CWS-TOOLING: integrate CWS sdk311
2009-06-09 10:22:56 +0200 jsc r272754 : #i101883# adapt number
2009-06-03 13:25:57 +0200 jsc r272559 : #i101883# ensure correct archive name for sdk, adapt resolve_variables_in_downloadname to exchange packageversion
2009-06-03 13:20:14 +0200 jsc r272558 : #i101883# ensure correct archive or package name
2009-06-02 14:56:40 +0200 jsc r272506 : #i101883# ensure correct archive or package name
2009-05-27 11:26:35 +0200 jsc r272337 : CWS-TOOLING: rebase CWS sdk311 to branches/OOO310 at 272261 (milestone: OOO310:m12)
2009-05-26 15:15:13 +0200 jsc r272305 : #i101883# ifdef links to URE libs for MacOSX and adapt compiler settings
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 797329c..d1a9700 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -282,7 +282,7 @@ OpenOffice_SDK
{
Settings
{
- downloadname OOo-SDK_{productversion}_{os}_install_{languages}
+ downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME OpenOffice.org
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 3439f59..c98c1a2 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -565,6 +565,7 @@ sub set_download_filename
my $type = get_installation_type();
my $language = get_downloadname_language($languagestringref);
my $addon = get_downloadname_addon();
+
if ( $installer::globals::product =~ /_Dev\s*$/ )
{
my $localminor = "";
@@ -648,6 +649,10 @@ sub resolve_variables_in_downloadname
if ( $allvariables->{'PRODUCTVERSION'} ) { $productversion = $allvariables->{'PRODUCTVERSION'}; }
$downloadname =~ s/\{productversion\}/$productversion/;
+ my $ppackageversion = "";
+ if ( $allvariables->{'PACKAGEVERSION'} ) { $packageversion = $allvariables->{'PACKAGEVERSION'}; }
+ $downloadname =~ s/\{packageversion\}/$packageversion/;
+
my $extension = "";
if ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) { $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
$extension = lc($extension);
commit 67808afb16230ce9b9152f224232bd8f11e4f35c
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 23 06:43:54 2009 +0000
CWS-TOOLING: integrate CWS tkr22
2009-06-10 16:22:32 +0200 tkr r272826 : #100878# ucpdav1 lib has now the patch flag
2009-06-08 14:38:33 +0200 tkr r272731 : CWS-TOOLING: rebase CWS tkr22 to branches/OOO310 at 272261 (milestone: OOO310:m12)
2009-06-08 13:10:16 +0200 tkr r272728 : #100878# add Wspiapi.h to ne_sockets to prevent win2000 crashes
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 70a8651..80bac29 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1450,7 +1450,7 @@ File gid_File_Lib_Ucpchelp1
End
#ifndef DISABLE_NEON
-SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
+SPECIAL_UNO_LIB_FILE_PATCH(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
SPECIAL_UNO_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1)
commit 347dbfc8e56c16f1e2e77f30d97efdf73e7de871
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 23 06:17:53 2009 +0000
CWS-TOOLING: integrate CWS sb112
2009-06-02 13:30:55 +0200 sb r272498 : #i101394# missing PATCH flag
2009-06-02 08:49:47 +0200 sb r272478 : #i101394# backported fix for issue 97975 from OOo 3.2 to OOo 3.1.1, by applying cws/sb109/bridges/source/remote/urp/urp_environment.cxx -c270972 and subsequent fix cws/dba32c/bridges/source/remote/urp/urp_environment.cxx -c272434
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 9faf50c..2e54ed1 100755
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -390,7 +390,7 @@ File gid_File_Dl_UrpUno
TXT_FILE_BODY;
Dir = SCP2_URE_DL_DIR;
Name = SCP2_URE_DL_NORMAL("urp_uno");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+ Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, PATCH);
// CompID = "D9F647ED-8E6F-4F80-8D2B-A45372B6AB60";
End
commit d55c5db1a55b71403f541e1f8cb6488fb839ff9c
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 23 05:47:09 2009 +0000
CWS-TOOLING: integrate CWS jl128
2009-06-09 17:02:57 +0200 is r272784 : #i102493# update to jre6u14
2009-06-09 16:44:21 +0200 is r272782 : #i102493# update to jre6u14
2009-06-09 16:18:47 +0200 is r272780 : #i102493# update to jre6u14
2009-06-09 16:17:33 +0200 is r272779 : #i102493# update to jre6u14
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 53e684c..797329c 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -122,7 +122,7 @@ OpenOffice_wJRE
BASEPRODUCTVERSION 3.1
UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
@@ -193,7 +193,7 @@ OpenOffice_Dev
SERVICETAG_URN urn:uuid:07a3230b-7902-11dd-938b-080020a9ed93
UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
@@ -409,7 +409,7 @@ BrOffice_wJRE
PROGRESSFRAMECOLOR
UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
ADDSYSTEMINTEGRATION 1
EVAL
@@ -484,7 +484,7 @@ BrOffice_Dev
SERVICETAG_URN urn:uuid:07a3230b-7902-11dd-938b-080020a9ed93
UPDATEURL http://update32.services.openoffice.org/ProductUpdateService/check.Update
ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF
- ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion.dat,userland.txt
+ ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt
EVAL
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index 6c7d99c..6541ab4 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -2089,7 +2089,7 @@ sub get_customaction_position
{
my $line = ${$sequencetable}[$i];
- if ( $line =~ /^\s*(\w+)\t.*\t\s*(\d+)\s$/ ) # matching only, if position is a number!
+ if ( $line =~ /^\s*([\w\.]+)\t.*\t\s*(\d+)\s$/ ) # matching only, if position is a number!
{
my $compareaction = $1;
my $localposition = $2;
@@ -2123,7 +2123,7 @@ sub set_positions_in_table
for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
{
- if ( ${$sequencetable}[$i] =~ /^\s*(\w+)\t.*\t\s*POSITIONTEMPLATE_end\s*$/ )
+ if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*POSITIONTEMPLATE_end\s*$/ )
{
my $customaction = $1;
$lastposition = $lastposition + 25;
@@ -2150,7 +2150,7 @@ sub set_positions_in_table
for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
{
- if ( ${$sequencetable}[$i] =~ /^\s*(\w+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
+ if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
{
my $onename = $1;
my $templatename = $2;
@@ -2208,7 +2208,7 @@ sub set_positions_in_table
for ( my $i = 0; $i <= $#{$sequencetable}; $i++ )
{
- if ( ${$sequencetable}[$i] =~ /^\s*(\w+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
+ if ( ${$sequencetable}[$i] =~ /^\s*([\w\.]+)\t.*\t\s*(POSITIONTEMPLATE_.*?)\s*$/ )
{
my $customactionname = $1;
my $fulltemplate = $2;
More information about the ooo-build-commit
mailing list