[Libreoffice-commits] .: 2 commits - instsetoo_native/util solenv/bin
Andras Timar
timar at kemper.freedesktop.org
Thu Dec 1 12:23:10 PST 2011
instsetoo_native/util/openoffice.lst | 6 ------
solenv/bin/make_installer.pl | 10 +++-------
solenv/bin/modules/installer/control.pm | 10 +---------
solenv/bin/modules/installer/globals.pm | 1 -
solenv/bin/modules/installer/windows/msiglobal.pm | 3 ---
solenv/bin/modules/installer/ziplist.pm | 20 +++++++-------------
6 files changed, 11 insertions(+), 39 deletions(-)
New commits:
commit f799339a4ccf1d6e35976e9e185c94c1d68c3d5b
Author: Andras Timar <atimar at suse.com>
Date: Thu Dec 1 21:16:31 2011 +0100
set manufacturer name to OOO_VENDOR or else to USERNAME
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index bef3182..cbbe663 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -632,12 +632,19 @@ sub list_all_files_from_include_path
sub set_manufacturer
{
my ($allvariables) = @_;
+ my $manufacturer;
- my $openofficeproductname = "LibreOffice";
- my $sunname = "";
+ if ( $ENV{'OOO_VENDOR'} ne "" )
+ {
+ $manufacturer = $ENV{'OOO_VENDOR'};
+ }
+ else
+ {
+ $manufacturer = $ENV{'USERNAME'};
+ }
- $installer::globals::manufacturer = $openofficeproductname;
- $installer::globals::longmanufacturer = $openofficeproductname;
+ $installer::globals::manufacturer = $manufacturer;
+ $installer::globals::longmanufacturer = $manufacturer;
$allvariables->{'MANUFACTURER'} = $installer::globals::manufacturer;
}
commit be8a7eb7c1cfcb9d89898c6cf40f560577a0c0a8
Author: Andras Timar <atimar at suse.com>
Date: Thu Dec 1 21:11:03 2011 +0100
our product is always opensource
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 68423c9..1313851 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -39,7 +39,6 @@ Globals
OOODOWNLOADNAME 1
STARTCENTER_LAYOUT_STYLE 0
BUILDIDCWS {buildidcws}
- OPENSOURCE 1
}
}
}
@@ -75,7 +74,6 @@ LibreOffice
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 0
@@ -136,7 +134,6 @@ LibreOffice_wJRE
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 1
@@ -200,7 +197,6 @@ LibreOffice_Dev
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 0
@@ -501,7 +497,6 @@ OxygenOffice
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 0
@@ -567,7 +562,6 @@ OxygenOffice_wJRE
GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt
- OPENSOURCE 1
SETSTATICPATH 1
OOODOWNLOADNAME 1
XPDINSTALLER 1
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index ae4b751..5ebd70f 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -641,9 +641,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$installer::globals::addsystemintegration = 0;
$installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0;
-
- if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::makedownload = 1; }
- else { $installer::globals::makedownload = 0; }
+ $installer::globals::makedownload = 1;
}
if ( $installer::globals::helppack )
@@ -652,9 +650,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$installer::globals::addsystemintegration = 0;
$installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0;
-
- if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::makedownload = 1; }
- else { $installer::globals::makedownload = 0; }
+ $installer::globals::makedownload = 1;
}
############################################################
@@ -1549,7 +1545,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$filesinpackage = installer::worker::prepare_linuxlinkfiles($filesinpackage);
$linksinpackage = installer::worker::prepare_forced_linuxlinkfiles($linksinpackage);
$installer::globals::makelinuxlinkrpm = 1;
- if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::add_required_package = $packagename . "u"; }
+ $installer::globals::add_required_package = $packagename . "u";
if ( $installer::globals::patch ) { $installer::globals::call_epm = 0; } # no packing of core module in patch
$shellscriptsfilename = ""; # shell scripts only need to be included into the link rpm
$run = 1;
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index a2504e1..07dcbee 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -257,15 +257,7 @@ sub check_makecab_version
{
if ( $makecabversion < $installer::globals::controlledmakecabversion )
{
- # warning for OOo, error for inhouse products
- if ( $installer::globals::isopensourceproduct )
- {
- installer::logger::print_warning("Old version of makecab.exe. Found version: \"$makecabversion\", tested version: \"$installer::globals::controlledmakecabversion\"!\n");
- }
- else
- {
- installer::exiter::exit_program("makecab.exe too old. Found version: \"$makecabversion\", required version: \"$installer::globals::controlledmakecabversion\"!", "check_makecab_version");
- }
+ installer::exiter::exit_program("makecab.exe too old. Found version: \"$makecabversion\", required version: \"$installer::globals::controlledmakecabversion\"!", "check_makecab_version");
}
}
else
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 45290dd..28eba09 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -269,7 +269,6 @@ BEGIN
%alllcuniquefilenames = ();
%uniquefilenamesequence = ();
%dependfilenames = ();
- $isopensourceproduct = 1;
$manufacturer = "";
$longmanufacturer = "";
$sundirname = "Oracle";
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index d6793f4..73a84c4 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1882,9 +1882,6 @@ sub set_global_code_variables
my $codefile = installer::files::read_file($installer::globals::codefilename);
- my $isopensource = 0;
- if ( $allvariableshashref->{'OPENSOURCE'} ) { $isopensource = $allvariableshashref->{'OPENSOURCE'}; }
-
my $onelanguage = "";
if ( $#{$languagesref} > 0 ) # more than one language
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index a820cd9..bef3182 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -636,21 +636,8 @@ sub set_manufacturer
my $openofficeproductname = "LibreOffice";
my $sunname = "";
-
- if ( $allvariables->{'OPENSOURCE'} && $allvariables->{'OPENSOURCE'} == 1 )
- {
- $installer::globals::isopensourceproduct = 1;
- $installer::globals::manufacturer = $openofficeproductname;
- $installer::globals::longmanufacturer = $openofficeproductname;
- }
- else
- {
- $installer::globals::isopensourceproduct = 0;
- if (( $allvariables->{'DEFINEDMANUFACTURER'} ) && ( $allvariables->{'DEFINEDMANUFACTURER'} ne "" )) { $sunname = $allvariables->{'DEFINEDMANUFACTURER'}; }
- else { installer::exiter::exit_program("ERROR: Property DEFINEDMANUFACTURER has to be set for this product!", "set_manufacturer"); }
- $installer::globals::manufacturer = $sunname;
- $installer::globals::longmanufacturer = $sunname;
- }
+ $installer::globals::manufacturer = $openofficeproductname;
+ $installer::globals::longmanufacturer = $openofficeproductname;
$allvariables->{'MANUFACTURER'} = $installer::globals::manufacturer;
}
More information about the Libreoffice-commits
mailing list