Author: hdu
Date: Thu Mar 22 13:42:51 2012
New Revision: 1303778
URL: http://svn.apache.org/viewvc?rev=1303778&view=rev
Log:
rename install sets from OOo* to Apache_OpenOffice_incubating*
Modified:
incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm
Modified: incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst?rev=1303778&r1=1303777&r2=1303778&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/openoffice.lst Thu Mar 22
13:42:51 2012
@@ -105,8 +105,8 @@ OpenOffice
active 1
compression 5
script setup_osl
- downloadname OOo_{productversion}_{os}_install_{languages}
- langpackdownloadname
OOo_{productversion}_languagepack_{os}_install_{languages}
+ downloadname
Apache_OpenOffice_incubating_{productversion}_{os}_install_{languages}
+ langpackdownloadname
Apache_OpenOffice_incubating_{productversion}_languagepack_{os}_install_{languages}
include
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/ooowoure,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@ -170,7 +170,7 @@ OpenOffice_wJRE
active 1
compression 5
script setup_osljre
- downloadname
OOo_{productversion}_{os}_installwjre_{languages}
+ downloadname
Apache_OpenOffice_incubating_{productversion}_{os}_installwjre_{languages}
include
{solarenvpath}/{os}/loader2,.,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@ -241,8 +241,8 @@ OpenOffice_Dev
active 1
compression 5
script setup_osl
- downloadname
OOo-dev_{productversion}_{os}_install_{languages}
- langpackdownloadname
OOo_{productversion}_languagepack_{os}_install_{languages}
+ downloadname
Apache_OpenOffice_incubating-dev_{productversion}_{os}_install_{languages}
+ langpackdownloadname
Apache_OpenOffice_incubating_{productversion}_languagepack_{os}_install_{languages}
include
{solarenvpath}/{os}/loader2,.,{localpath}/bin/dev,{localpath}/bin,{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor}/openoffice,{solarpath}/pck.{minor},{solarpath}/xml.{minor}/office/instance,{solarpath}/xml.{minor},../../external/common,{solarenvpath}/{os}/OOo_external
}
}
@@ -292,7 +292,7 @@ OpenOffice_SDK
{
Settings
{
- downloadname OOo-SDK_{packageversion}_{os}_install_{languages}
+ downloadname
Apache_OpenOffice_incubating-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME OpenOffice.org
@@ -338,7 +338,7 @@ OpenOffice_Dev_SDK
{
Settings
{
- downloadname OOo-Dev-SDK_{packageversion}_{os}_install_{languages}
+ downloadname
Apache_OpenOffice_incubating-Dev-SDK_{packageversion}_{os}_install_{languages}
variables
{
PRODUCTNAME OOo-dev
Modified: incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm?rev=1303778&r1=1303777&r2=1303778&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/installer/download.pm Thu Mar
22 13:42:51 2012
@@ -463,17 +463,17 @@ sub get_downloadname_productname
{
my ($allvariables) = @_;
- my $start = "OOo";
+ my $start = "Apache_OpenOffice_incubating";
- if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start =
"OOo"; }
-
- if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start =
"OOo-Dev"; }
+ if ( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) { $start .=
""; }
- if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-SDK"; }
+ if ( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) { $start .= "-Dev"; }
- if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "OOo-Dev-SDK"; }
-
- if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "OOo-URE"; }
+ if (( $allvariables->{'PRODUCTNAME'} eq "OpenOffice.org" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-SDK"; }
+
+ if (( $allvariables->{'PRODUCTNAME'} eq "OOo-dev" ) && (
$allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start .= "-Dev-SDK"; }
+
+ if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start .= "-URE"; }
return $start;
}
@@ -1879,7 +1879,7 @@ sub create_link_tree
{
my ($sourcedownloadfile, $destfilename, $versionstring) = @_;
- if ( ! $installer::globals::ooouploaddir ) {
installer::exiter::exit_program("ERROR: Directory for OOo upload not defined!",
"create_link_tree"); }
+ if ( ! $installer::globals::ooouploaddir ) {
installer::exiter::exit_program("ERROR: Directory for AOO upload not defined!",
"create_link_tree"); }
my $versiondir = $installer::globals::ooouploaddir .
$installer::globals::separator . $versionstring;
my $infoline = "Directory for the link: $versiondir\n";
push(@installer::globals::logfileinfo, $infoline);
@@ -2096,7 +2096,7 @@ sub create_download_sets
}
####################################################
-# Creating OOo upload tree
+# Creating AOO upload tree
####################################################
sub create_download_link_tree
