[Libreoffice-commits] .: 3 commits - setup_native/source solenv/bin

[Jan Holesovsky]

 setup_native/source/win32/wintools/msiinfo/msiinfo.c |    2 +-
 solenv/bin/modules/installer/windows/admin.pm        |   17 +++++++++++++++++
 solenv/bin/modules/installer/windows/msiglobal.pm    |    2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

New commits:
commit 3605cb216faab6659f4bf90e76d9387df3ac08f6
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Jul 25 17:30:14 2012 +0200

    More helpful error message.
    
    Change-Id: I009fc8a8b84355a35adc60b7008ebe8b96965c8e

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 30fe348..97edc40 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -988,7 +988,7 @@ sub write_summary_into_msi_database
 
     if ($returnvalue)
     {
-        $infoline = "ERROR: Could not execute $msiinfo!\n";
+        $infoline = "ERROR: Could not execute $systemcall\n";
         push( @installer::globals::logfileinfo, $infoline);
     }
     else
commit 61b1c24615445d7677dbfe4a702d3dd97eaa4939
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Jul 25 15:00:02 2012 +0200

    More full paths for cross msi* tools.
    
    Change-Id: I813d22bc5081a0cc5f1af9fbc6661a970eb16b86

diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 194a65f..e088caf 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -48,6 +48,11 @@ sub unpack_cabinet_file
     push( @installer::globals::logfileinfo, $infoline);
 
     my $expandfile = "expand.exe";  # Has to be in the path
+    if ( $installer::globals::isunix )
+    {
+        $infoline = "ERROR: We need to change this to use cabextract instead of expand.exe\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
 
     # expand.exe has to be located in the system directory.
     # Cygwin has another tool expand.exe, that converts tabs to spaces. This cannot be used of course.
@@ -104,6 +109,10 @@ sub include_tables_into_pcpfile
     my ($fullmsidatabasepath, $workdir, $tables) = @_;
 
     my $msidb = "msidb.exe";    # Has to be in the path
+    if ( $installer::globals::isunix )
+    {
+        $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe";
+    }
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";
@@ -159,6 +168,10 @@ sub extract_tables_from_pcpfile
     my ($fullmsidatabasepath, $workdir, $tablelist) = @_;
 
     my $msidb = "msidb.exe";    # Has to be in the path
+    if ( $installer::globals::isunix )
+    {
+        $msidb = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msidb.exe";
+    }
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";
@@ -699,6 +712,10 @@ sub write_sis_info
     if ( ! -f $msidatabase ) { installer::exiter::exit_program("ERROR: Cannot find file $msidatabase", "write_sis_info"); }
 
     my $msiinfo = "msiinfo.exe";    # Has to be in the path
+    if ( $installer::globals::isunix )
+    {
+        $msiinfo = "$ENV{'OUTDIR_FOR_BUILD'}/bin/msiinfo.exe";
+    }
     my $infoline = "";
     my $systemcall = "";
     my $returnvalue = "";
commit 4c1c5aaa2d0b3c7870d2bd466ce8f2fa9204064a
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Jul 25 14:50:14 2012 +0200

    Avoid a crash.
    
    Change-Id: I2ce8be599c9285bd0da039e1ff9c0649a118a8a1

diff --git a/setup_native/source/win32/wintools/msiinfo/msiinfo.c b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
index f2d388b..2ba88df 100644
--- a/setup_native/source/win32/wintools/msiinfo/msiinfo.c
+++ b/setup_native/source/win32/wintools/msiinfo/msiinfo.c
@@ -204,7 +204,7 @@ int wmain(int argc, WCHAR *argv[])
         argv++; argc--;
     }
 
-    if (strcmpW(dbfile, h1) == 0 || strcmpW(dbfile, h2) == 0)
+    if (!dbfile || strcmpW(dbfile, h1) == 0 || strcmpW(dbfile, h2) == 0)
     {
         usage();
         return 0;