[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/make_installer.pl                      |    9 --
 solenv/bin/modules/installer/windows/msiglobal.pm |   88 ----------------------
 2 files changed, 97 deletions(-)

New commits:
commit e75175625e1152651d993fec358599625e704e22
Author: Andras Timar <atimar at suse.com>
Date:   Thu Nov 17 12:07:09 2011 +0100

    remove setup.exe and setup.ini from Windows installdir

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 6f3ec4a..b3db464 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2249,23 +2249,14 @@ 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); }
-
-            installer::logger::print_message( "... generating setup.ini ...\n" );
-
-            if ( ! $allvariableshashref->{'NOLOADERREQUIRED'} ) { installer::windows::msiglobal::create_setup_ini($languagesarrayref, $defaultlanguage, $installdir, $allvariableshashref); }
         }
 
         # Analyzing the ScpActions and copying the files into the installation set
-        # At least the loader.exe
 
         installer::logger::print_message( "... copying files into installation set ...\n" );
 
         installer::worker::put_scpactions_into_installset($installdir);
 
-        # ... copying the setup.exe
-
-        installer::windows::msiglobal::copy_windows_installer_files_into_installset($installdir, $includepatharrayref, $allvariableshashref);
-
         # ... copying MergeModules into installation set
 
         if ( ! $installer::globals::fix_number_of_cab_files ) { installer::windows::msiglobal::copy_merge_modules_into_installset($installdir); }
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 082afb2..d6793f4 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1334,61 +1334,6 @@ sub include_windows_lineends
     }
 }
 
-##########################################################################
-# Generation the file setup.ini, that is used by the loader setup.exe.
-##########################################################################
-
-sub create_setup_ini
-{
-    my ($languagesarray, $defaultlanguage, $installdir, $allvariableshashref) = @_;
-
-    installer::logger::include_header_into_logfile("Creating setup.ini");
-
-    my $setupinifilename = $installdir . $installer::globals::separator . "setup.ini";
-
-    my @setupinifile = ();
-    my $setupinifile = \@setupinifile;
-
-    my $line = "\[setup\]\n";
-    push(@setupinifile, $line);
-
-    put_databasename_into_setupini($setupinifile, $allvariableshashref);
-    put_msiversion_into_setupini($setupinifile);
-    put_productname_into_setupini($setupinifile, $allvariableshashref);
-    put_productcode_into_setupini($setupinifile);
-    put_productversion_into_setupini($setupinifile);
-    put_upgradekey_into_setupini($setupinifile);
-
-    $line = "\[languages\]\n";
-    push(@setupinifile, $line);
-
-    put_languagecount_into_setupini($setupinifile, $languagesarray);
-    put_defaultlanguage_into_setupini($setupinifile, $defaultlanguage);
-
-    if ( $#{$languagesarray} > 0 )  # writing the transforms information
-    {
-        my $counter = 1;
-
-        for ( my $i = 0; $i <= $#{$languagesarray}; $i++ )
-        {
-            if ( ${$languagesarray}[$i] eq $defaultlanguage ) { next; }
-
-            put_transforms_into_setupini($setupinifile, ${$languagesarray}[$i], $counter);
-            $counter++;
-        }
-    }
-
-    if ( $installer::globals::iswin && $installer::globals::plat =~ /cygwin/i)      # Windows line ends only for Cygwin
-    {
-        include_windows_lineends($setupinifile);
-    }
-
-    installer::files::save_file($setupinifilename, $setupinifile);
-
-    $infoline = "Generated file $setupinifilename !\n";
-    push( @installer::globals::logfileinfo, $infoline);
-}
-
 #################################################################
 # Copying the files defined as ScpActions into the
 # installation set.
@@ -1421,39 +1366,6 @@ sub copy_scpactions_into_installset
 }
 
 #################################################################
-# Copying the files for the Windows installer into the
-# installation set (setup.exe).
-#################################################################
-
-sub copy_windows_installer_files_into_installset
-{
-    my ($installdir, $includepatharrayref, $allvariables) = @_;
-
-    installer::logger::include_header_into_logfile("Copying Windows installer files into installation set");
-
-    @copyfile = ();
-    push(@copyfile, "loader2.exe");
-
-    if ( $allvariables->{'NOLOADERREQUIRED'} ) { @copyfile = (); }
-
-    for ( my $i = 0; $i <= $#copyfile; $i++ )
-    {
-        my $filename = $copyfile[$i];
-        my $sourcefileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-
-        if ( ! -f $$sourcefileref ) { installer::exiter::exit_program("ERROR: msi file not found: $$sourcefileref !", "copy_windows_installer_files_into_installset"); }
-
-        my $destfile;
-        if ( $copyfile[$i] eq "loader2.exe" ) { $destfile = "setup.exe"; }  # renaming the loader
-        else { $destfile = $copyfile[$i]; }
-
-        $destfile = $installdir . $installer::globals::separator . $destfile;
-
-        installer::systemactions::copy_one_file($$sourcefileref, $destfile);
-    }
-}
-
-#################################################################
 # Copying MergeModules for the Windows installer into the
 # installation set. The list of MergeModules is located
 # in %installer::globals::copy_msm_files