Skip to content

C
core
Kaydet (Commit) be8a7eb7 authored tarafından Andras Timar's avatar Andras Timar
Dosyalara gözat
Seçenekler

our product is always opensource

üst 8c478c91
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 41 deletions
instsetoo_native/util/openoffice.lst
Dosyayı görüntüle @ be8a7eb7
...@@ -39,7 +39,6 @@ Globals ...@@ -39,7 +39,6 @@ Globals
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
STARTCENTER_LAYOUT_STYLE 0 STARTCENTER_LAYOUT_STYLE 0
BUILDIDCWS {buildidcws} BUILDIDCWS {buildidcws}
OPENSOURCE 1
} }
} }
} }
...@@ -75,7 +74,6 @@ LibreOffice ...@@ -75,7 +74,6 @@ LibreOffice
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
SETSTATICPATH 1 SETSTATICPATH 1
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
XPDINSTALLER 0 XPDINSTALLER 0
...@@ -136,7 +134,6 @@ LibreOffice_wJRE ...@@ -136,7 +134,6 @@ LibreOffice_wJRE
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
SETSTATICPATH 1 SETSTATICPATH 1
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
XPDINSTALLER 1 XPDINSTALLER 1
...@@ -200,7 +197,6 @@ LibreOffice_Dev ...@@ -200,7 +197,6 @@ LibreOffice_Dev
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
SETSTATICPATH 1 SETSTATICPATH 1
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
XPDINSTALLER 0 XPDINSTALLER 0
...@@ -501,7 +497,6 @@ OxygenOffice ...@@ -501,7 +497,6 @@ OxygenOffice
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
SETSTATICPATH 1 SETSTATICPATH 1
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
XPDINSTALLER 0 XPDINSTALLER 0
...@@ -567,7 +562,6 @@ OxygenOffice_wJRE ...@@ -567,7 +562,6 @@ OxygenOffice_wJRE
GLOBALFILEGID gid_File_Lib_Vcl GLOBALFILEGID gid_File_Lib_Vcl
GLOBALPATCHFILEGID gid_File_Txt_Patchfiles GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
SPELLCHECKERFILE spellchecker_selection.txt SPELLCHECKERFILE spellchecker_selection.txt
OPENSOURCE 1
SETSTATICPATH 1 SETSTATICPATH 1
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
XPDINSTALLER 1 XPDINSTALLER 1
......
solenv/bin/make_installer.pl
Dosyayı görüntüle @ be8a7eb7
...@@ -641,9 +641,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) ...@@ -641,9 +641,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$installer::globals::addsystemintegration = 0; $installer::globals::addsystemintegration = 0;
$installer::globals::makejds = 0; $installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0; $installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::makedownload = 1; }
else { $installer::globals::makedownload = 0; }
} }
if ( $installer::globals::helppack ) if ( $installer::globals::helppack )
...@@ -652,9 +650,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) ...@@ -652,9 +650,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$installer::globals::addsystemintegration = 0; $installer::globals::addsystemintegration = 0;
$installer::globals::makejds = 0; $installer::globals::makejds = 0;
$installer::globals::addlicensefile = 0; $installer::globals::addlicensefile = 0;
$installer::globals::makedownload = 1;
if ( $allvariableshashref->{'OPENSOURCE'} ) { $installer::globals::makedownload = 1; }
else { $installer::globals::makedownload = 0; }
} }
############################################################ ############################################################
...@@ -1549,7 +1545,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) ...@@ -1549,7 +1545,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
$filesinpackage = installer::worker::prepare_linuxlinkfiles($filesinpackage); $filesinpackage = installer::worker::prepare_linuxlinkfiles($filesinpackage);
$linksinpackage = installer::worker::prepare_forced_linuxlinkfiles($linksinpackage); $linksinpackage = installer::worker::prepare_forced_linuxlinkfiles($linksinpackage);
$installer::globals::makelinuxlinkrpm = 1; $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 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 $shellscriptsfilename = ""; # shell scripts only need to be included into the link rpm
$run = 1; $run = 1;
......
solenv/bin/modules/installer/control.pm
Dosyayı görüntüle @ be8a7eb7
...@@ -257,15 +257,7 @@ sub check_makecab_version ...@@ -257,15 +257,7 @@ sub check_makecab_version
{ {
if ( $makecabversion < $installer::globals::controlledmakecabversion ) if ( $makecabversion < $installer::globals::controlledmakecabversion )
{ {
# warning for OOo, error for inhouse products installer::exiter::exit_program("makecab.exe too old. Found version: \"$makecabversion\", required version: \"$installer::globals::controlledmakecabversion\"!", "check_makecab_version");
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");
}
} }
} }
else else
......
solenv/bin/modules/installer/globals.pm
Dosyayı görüntüle @ be8a7eb7
...@@ -269,7 +269,6 @@ BEGIN ...@@ -269,7 +269,6 @@ BEGIN
%alllcuniquefilenames = (); %alllcuniquefilenames = ();
%uniquefilenamesequence = (); %uniquefilenamesequence = ();
%dependfilenames = (); %dependfilenames = ();
$isopensourceproduct = 1;
$manufacturer = ""; $manufacturer = "";
$longmanufacturer = ""; $longmanufacturer = "";
$sundirname = "Oracle"; $sundirname = "Oracle";
......
solenv/bin/modules/installer/windows/msiglobal.pm
Dosyayı görüntüle @ be8a7eb7
...@@ -1882,9 +1882,6 @@ sub set_global_code_variables ...@@ -1882,9 +1882,6 @@ sub set_global_code_variables
my $codefile = installer::files::read_file($installer::globals::codefilename); my $codefile = installer::files::read_file($installer::globals::codefilename);
my $isopensource = 0;
if ( $allvariableshashref->{'OPENSOURCE'} ) { $isopensource = $allvariableshashref->{'OPENSOURCE'}; }
my $onelanguage = ""; my $onelanguage = "";
if ( $#{$languagesref} > 0 ) # more than one language if ( $#{$languagesref} > 0 ) # more than one language
......
solenv/bin/modules/installer/ziplist.pm
Dosyayı görüntüle @ be8a7eb7
...@@ -636,21 +636,8 @@ sub set_manufacturer ...@@ -636,21 +636,8 @@ sub set_manufacturer
my $openofficeproductname = "LibreOffice"; my $openofficeproductname = "LibreOffice";
my $sunname = ""; my $sunname = "";
$installer::globals::manufacturer = $openofficeproductname;
if ( $allvariables->{'OPENSOURCE'} && $allvariables->{'OPENSOURCE'} == 1 ) $installer::globals::longmanufacturer = $openofficeproductname;
{
$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;
}
$allvariables->{'MANUFACTURER'} = $installer::globals::manufacturer; $allvariables->{'MANUFACTURER'} = $installer::globals::manufacturer;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment