diff options
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/scpaction_ooo.scp | 9 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/epmfile.pm | 12 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 1 |
4 files changed, 15 insertions, 15 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index caf297c6c470..8ea316d1baa2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -6,7 +6,7 @@ Globals { OOOBASEVERSION 3.4 OOOPACKAGEVERSION 3.4.0 - UREPACKAGEVERSION 1.8.0 + UREPACKAGEVERSION 3.4.0 URELAYERVERSION 1 BASISROOTNAME OpenOffice.org UNIXBASISROOTNAME openoffice.org @@ -23,7 +23,7 @@ Globals USE_FILEVERSION 1 LIBRARYVERSION 9.4.0 POOLPRODUCT 1 - REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb + REGISTRATION_HOST https://hs-ws1.oracle.com/RegistrationWeb REGISTRATIONURL http://survey.services.openoffice.org/user/index.php PROGRESSBARCOLOR 14,133,205 PROGRESSSIZE 320,7 @@ -254,8 +254,8 @@ URE variables { PRODUCTNAME URE - PRODUCTVERSION 1.8 - PACKAGEVERSION 1.8 + PRODUCTVERSION 3.4 + PACKAGEVERSION 3.4 PACKAGEREVISION 1 PRODUCTEXTENSION LONG_PRODUCTEXTENSION diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp index d6f294f1da08..b95df7d7f3ac 100644 --- a/scp2/source/ooo/scpaction_ooo.scp +++ b/scp2/source/ooo/scpaction_ooo.scp @@ -347,15 +347,6 @@ ScpAction scp_Copy_Xpd_Help_Html_Uninstallationprologue_En_Us Subdir = "installdata/html"; End -#if defined LINUX || defined SOLARIS -ScpAction scp_Copy_Update_Script - Copy = "update"; - Name = "update"; - Styles = (SCPZIP_REPLACE); - UnixRights = 775; -End -#endif - #ifdef MACOSX ScpAction scp_Copy_Dmg_Background_Image #if defined(BUILD_SPECIAL) diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm index 8b828b85335f..119eb95e0b7c 100644 --- a/solenv/bin/modules/installer/epmfile.pm +++ b/solenv/bin/modules/installer/epmfile.pm @@ -1060,7 +1060,7 @@ sub set_revision_in_pkginfo my $pkgversion = "SOLSPARCPKGVERSION"; if ( $installer::globals::issolarisx86build ) { $pkgversion = "SOLIAPKGVERSION"; } - if (( $variables->{$pkgversion} ) && ( $variables->{$pkgversion} ne "" )) + if (( $variables->{$pkgversion} ) && ( $variables->{$pkgversion} ne "" )) { if ( $variables->{$pkgversion} ne "FINALVERSION" ) { @@ -1085,7 +1085,15 @@ sub set_revision_in_pkginfo $version = "$finalmajor.$finalminor.$finalmicro"; } - my $versionstring = "$version,$variables->{$pkgversion}"; + my $datestring = $variables->{$pkgversion}; + + # Allowing some packages to have another date of creation. + # They can be defined in product definition using a key like "SOLSPARCPKGVERSION_$packagename" + + my $additionalkey = $pkgversion . "_" . $packagename; + if (( $variables->{$additionalkey} ) && ( $variables->{$additionalkey} ne "" )) { $datestring = $variables->{$additionalkey}; } + + my $versionstring = "$version,$datestring"; for ( my $i = 0; $i <= $#{$file}; $i++ ) { diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index d76b81a55850..2e870ba48712 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -705,6 +705,7 @@ sub create_simple_package if (( $onefile->{'Styles'} ) && ( $onefile->{'Styles'} =~ /\bBINARYTABLE_ONLY\b/ )) { next; } if (( $installer::globals::patch ) && ( $onefile->{'Styles'} ) && ( ! ( $onefile->{'Styles'} =~ /\bPATCH\b/ ))) { next; } + if (( $installer::globals::patch ) && ( $installer::globals::packageformat eq "dmg" )) { push(@installer::globals::patchfilecollector, "$onefile->{'destination'}\n"); } my $source = $onefile->{'sourcepath'}; my $destination = $onefile->{'destination'}; |