[Libreoffice-commits] .: 2 commits - scp2/source solenv/bin

[Tor Lillqvist]

 scp2/source/ooo/directory_ooo.scp |    4 ++--
 solenv/bin/make_installer.pl      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4b83c028031aa2c8a4d41198ca9af8f78ed8d8b9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Oct 27 13:23:55 2011 +0300

    Make subdirectory names unique in the first five characters
    
    Rename "shellnew" to "shlnew", and "2shellnew" then to "2shlnew" for
    consistency.
    
    See code in olenv/bin/modules/installer/windows/directory.pm:
    create_unique_directorynames().
    
    (Actually I think we don't even create any actual directory for
    "shellnew" (and "2shellnew" even less), it is just a
    placeholder... But oh well.)

diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 8c52897..a25b2d7 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -109,12 +109,12 @@ End
 
 Directory gid_Dir_Shellnew
     ParentID = gid_Brand_Dir_Program;
-    DosName = "shellnew";
+    DosName = "shlnew";
 End
 
 Directory gid_Dir_ShellnewToo
     ParentID = gid_Brand_Dir_Program;
-    DosName = "2shellnew";
+    DosName = "2shlnew";
 End
 
 #endif
commit 2c87384e24a956693d4060b7e42317a3b7a0e4b5
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Oct 27 12:54:04 2011 +0300

    Avoid Perl warning: Use of uninitialized value

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index e8c2a74..fd1df27 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -289,7 +289,7 @@ if (!($installer::globals::is_copy_only_project)) { installer::ziplist::set_manu
 # Checking version of makecab.exe
 ##############################################
 
-if ( $installer::globals::iswindowsbuild && $ENV{'CROSS_COMPILING'} ne 'YES') { installer::control::check_makecab_version(); }
+if ( $installer::globals::iswindowsbuild && (!defined($ENV{'CROSS_COMPILING'}) || $ENV{'CROSS_COMPILING'} ne 'YES')) { installer::control::check_makecab_version(); }
 
 ##########################################################
 # Getting the include path from the settings in zip list