our product is always opensource

5 files changed, 6 insertions, 35 deletions

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index ae4b7519e9b1..5ebd70fea515 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 a2504e1aefe1..07dcbee303bf 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 45290ddb8780..28eba099bf32 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 d6793f4c5c5f..73a84c48440f 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 a820cd967e1b..bef3182dca18 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;
 }