[Libreoffice-commits] .: 3 commits - solenv/bin
Andras Timar
timar at kemper.freedesktop.org
Sun Dec 4 14:58:33 PST 2011
solenv/bin/make_installer.pl | 13 +
solenv/bin/modules/installer/download.pm | 53 -------
solenv/bin/modules/installer/globals.pm | 1
solenv/bin/modules/installer/windows/msiglobal.pm | 164 ----------------------
solenv/bin/modules/installer/windows/registry.pm | 3
5 files changed, 12 insertions(+), 222 deletions(-)
New commits:
commit e286a56ecfc0e9312cc63658e3055aea5995c6f6
Author: Andras Timar <atimar at suse.com>
Date: Sun Dec 4 23:58:28 2011 +0100
set download name of Windows installer
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 53f676a..6e3a68e 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2311,7 +2311,14 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $is_success ) { installer::followme::save_followme_info($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref, $current_install_number, $loggingdir, $installlogdir); }
if ( $$downloadname ne "" ) { $create_download = 1; }
- if ( $installer::globals::iswindowsbuild ) { $create_download = 0; }
+ if ( $installer::globals::iswindowsbuild )
+ {
+ $create_download = 0;
+ if ( $allvariableshashref->{'OOODOWNLOADNAME'} ) { $$downloadname = installer::download::set_download_filename($languagestringref, $allvariableshashref); }
+ else { $$downloadname = installer::download::resolve_variables_in_downloadname($allvariableshashref, $$downloadname, $languagestringref); }
+ installer::systemactions::rename_one_file( $finalinstalldir . $installer::globals::separator . $installer::globals::shortmsidatabasename, $finalinstalldir . $installer::globals::separator . $$downloadname . ".msi" );
+
+ }
if (( $is_success ) && ( $create_download ) && ( $ENV{'ENABLE_DOWNLOADSETS'} ))
{
my $downloaddir = installer::download::create_download_sets($finalinstalldir, $includepatharrayref, $allvariableshashref, $$downloadname, $languagestringref, $languagesarrayref);
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b16a3b2..0d14737 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -423,60 +423,13 @@ sub get_download_version
my $version = "";
- my $devproduct = 0;
- if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
-
- if ( $devproduct ) # use "DEV300m75"
- {
- my $source = uc($installer::globals::build); # DEV300
- my $localminor = "";
- if ( $installer::globals::minor ne "" ) { $localminor = $installer::globals::minor; }
- else { $localminor = $installer::globals::lastminor; }
- $version = $source . $localminor;
- }
- else # use 3.2.0rc1
- {
- $version = $allvariables->{'PRODUCTVERSION'};
- if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
- if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
- }
+ $version = $allvariables->{'PRODUCTVERSION'};
+ if (( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ) && ( $allvariables->{'ABOUTBOXPRODUCTVERSION'} ne "" )) { $version = $allvariables->{'ABOUTBOXPRODUCTVERSION'}; }
+ if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; }
return $version;
}
-###############################################################
-# Set date string, format: yymmdd
-###############################################################
-
-sub set_date_string
-{
- my ($allvariables) = @_;
-
- my $datestring = "";
-
- my $devproduct = 0;
- if (( $allvariables->{'DEVELOPMENTPRODUCT'} ) && ( $allvariables->{'DEVELOPMENTPRODUCT'} == 1 )) { $devproduct = 1; }
-
- my $releasebuild = 1;
- if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $releasebuild = 0; }
-
- if (( ! $devproduct ) && ( ! $releasebuild ))
- {
- my @timearray = localtime(time);
-
- my $day = $timearray[3];
- my $month = $timearray[4] + 1;
- my $year = $timearray[5] + 1900;
-
- if ( $month < 10 ) { $month = "0" . $month; }
- if ( $day < 10 ) { $day = "0" . $day; }
-
- $datestring = $year . $month . $day;
- }
-
- return $datestring;
-}
-
#################################################################
# Setting the platform name for download
#################################################################
commit 8caa1dc385345f9be0d8392cc1d5a3d11d6eb016
Author: Andras Timar <atimar at suse.com>
Date: Sun Dec 4 19:57:53 2011 +0100
remove unused feature of generating setup.ini
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index a21ac4d..53f676a 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2199,7 +2199,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
}
# Creating transforms, if the installation set has more than one language
- # renaming the msi database and generating the setup.ini file
+ # renaming the msi database
my $defaultlanguage = installer::languages::get_default_language($languagesarrayref);
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 48b61cc..b55bafd 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -223,7 +223,6 @@ BEGIN
@linuxlinks = ();
@linkrpms = ();
$archiveformat = "";
- $minorupgradekey = "";
$updatelastsequence = 0;
$updatesequencecounter = 0;
$updatedatabase = 0;
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 8a2fa09..a90698a 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1170,147 +1170,6 @@ sub rename_msi_database_in_installset
$installer::globals::msidatabasename = $newdatabasename;
}
-##########################################################################
-# Writing the databasename into the setup.ini.
-##########################################################################
-
-sub put_databasename_into_setupini
-{
- my ($setupinifile, $allvariableshashref) = @_;
-
- my $databasename = get_msidatabasename($allvariableshashref);
- my $line = "database=" . $databasename . "\n";
-
- push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the required msi version into setup.ini
-##########################################################################
-
-sub put_msiversion_into_setupini
-{
- my ($setupinifile) = @_;
-
- my $msiversion = "2.0";
- my $line = "msiversion=" . $msiversion . "\n";
-
- push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the productname into setup.ini
-##########################################################################
-
-sub put_productname_into_setupini
-{
- my ($setupinifile, $allvariableshashref) = @_;
-
- my $productname = $allvariableshashref->{'PRODUCTNAME'};
- my $line = "productname=" . $productname . "\n";
-
- push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the productcode into setup.ini
-##########################################################################
-
-sub put_productcode_into_setupini
-{
- my ($setupinifile) = @_;
-
- my $productcode = $installer::globals::productcode;
- my $line = "productcode=" . $productcode . "\n";
-
- push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the ProductVersion from Property table into setup.ini
-##########################################################################
-
-sub put_productversion_into_setupini
-{
- my ($setupinifile) = @_;
-
- my $line = "productversion=" . $installer::globals::msiproductversion . "\n";
- push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the key for Minor Upgrades into setup.ini
-##########################################################################
-
-sub put_upgradekey_into_setupini
-{
- my ($setupinifile) = @_;
-
- if ( $installer::globals::minorupgradekey ne "" )
- {
- my $line = "upgradekey=" . $installer::globals::minorupgradekey . "\n";
- push(@{$setupinifile}, $line);
- }
-}
-
-##########################################################################
-# Writing the number of languages into setup.ini
-##########################################################################
-
-sub put_languagecount_into_setupini
-{
- my ($setupinifile, $languagesarray) = @_;
-
- my $languagecount = $#{$languagesarray} + 1;
- my $line = "count=" . $languagecount . "\n";
-
- push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the defaultlanguage into setup.ini
-##########################################################################
-
-sub put_defaultlanguage_into_setupini
-{
- my ($setupinifile, $defaultlanguage) = @_;
-
- my $windowslanguage = installer::windows::language::get_windows_language($defaultlanguage);
- my $line = "default=" . $windowslanguage . "\n";
- push(@{$setupinifile}, $line);
-}
-
-##########################################################################
-# Writing the information about transformations into setup.ini
-##########################################################################
-
-sub put_transforms_into_setupini
-{
- my ($setupinifile, $onelanguage, $counter) = @_;
-
- my $windowslanguage = installer::windows::language::get_windows_language($onelanguage);
- my $transformfilename = "trans_" . $onelanguage . ".mst";
-
- my $line = "lang" . $counter . "=" . $windowslanguage . "," . $transformfilename . "\n";
-
- push(@{$setupinifile}, $line);
-}
-
-###################################################
-# Including Windows line ends in ini files
-# Profiles on Windows shall have \r\n line ends
-###################################################
-
-sub include_windows_lineends
-{
- my ($onefile) = @_;
-
- for ( my $i = 0; $i <= $#{$onefile}; $i++ )
- {
- ${$onefile}[$i] =~ s/\r?\n$/\r\n/;
- }
-}
-
#################################################################
# Copying the files defined as ScpActions into the
# installation set.
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 1a777de..ba9f7a8 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -411,9 +411,6 @@ sub create_registry_table
if ( $oneregistry->{'Styles'} ) { $style = $oneregistry->{'Styles'}; }
if ( $style =~ /\bDONT_DELETE\b/ ) { $installer::globals::dontdeletecomponents{$registry{'Component_'}} = 1; }
- # Saving upgradekey to write this into setup.ini for minor upgrades
- if ( $style =~ /\bUPGRADEKEY\b/ ) { $installer::globals::minorupgradekey = $registry{'Key'}; }
-
# Collecting all registry components with ALWAYS_REQUIRED style
if ( ! ( $style =~ /\bALWAYS_REQUIRED\b/ ))
{
commit b85ccca7059eb4bf10045c2b3969ea18a83f4f76
Author: Andras Timar <atimar at suse.com>
Date: Sun Dec 4 19:34:57 2011 +0100
remove unused feauture ADDLANGUAGEINDATABASENAME
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index c9d9f02..a21ac4d 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2211,8 +2211,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
}
installer::windows::msiglobal::rename_msi_database_in_installset($defaultlanguage, $installdir, $allvariableshashref);
-
- if ( $allvariableshashref->{'ADDLANGUAGEINDATABASENAME'} ) { installer::windows::msiglobal::add_language_to_msi_database($defaultlanguage, $installdir, $allvariableshashref); }
}
# Analyzing the ScpActions and copying the files into the installation set
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 73a84c4..8a2fa09 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1170,29 +1170,6 @@ sub rename_msi_database_in_installset
$installer::globals::msidatabasename = $newdatabasename;
}
-#########################################################################
-# Adding the language to the name of the msi databasename,
-# if this is required (ADDLANGUAGEINDATABASENAME)
-#########################################################################
-
-sub add_language_to_msi_database
-{
- my ($defaultlanguage, $installdir, $allvariables) = @_;
-
- my $languagestring = $defaultlanguage;
- if ( $allvariables->{'USELANGUAGECODE'} ) { $languagestring = installer::windows::language::get_windows_language($defaultlanguage); }
- my $newdatabasename = $installer::globals::shortmsidatabasename;
- $newdatabasename =~ s/\.msi\s*$/_$languagestring\.msi/;
- $installer::globals::shortmsidatabasename = $newdatabasename;
- $newdatabasename = $installdir . $installer::globals::separator . $newdatabasename;
-
- my $olddatabasename = $installer::globals::msidatabasename;
-
- installer::systemactions::rename_one_file($olddatabasename, $newdatabasename);
-
- $installer::globals::msidatabasename = $newdatabasename;
-}
-
##########################################################################
# Writing the databasename into the setup.ini.
##########################################################################
More information about the Libreoffice-commits
mailing list