[Libreoffice-commits] .: Branch 'integration/dev300_m106' - solenv/bin

[Jan Holesovsky]

 solenv/bin/modules/installer/parameter.pm |    1 -
 solenv/bin/ooinstall                      |   17 ++++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit d8c78f46b626120ed434a55d13d1d04c5e839e8f
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Apr 28 08:04:08 2011 +0200

    Make 'make dev-install' do something even on Windows.
    
    It creates an install set only, but better than just throwing an error ;-)

diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 103cacb..bd06248 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -397,7 +397,6 @@ sub setglobalvariables
     if ($installer::globals::unpackpath eq "")	# unpackpath not set
     {	
         $installer::globals::unpackpath = cwd();
-        if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~ s/\//\\/g; }
     }
 
     if ( $installer::globals::localunpackdir ne "" ) { $installer::globals::unpackpath = $installer::globals::localunpackdir; }
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 83717fa..87bc9dc 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -13,6 +13,11 @@ use Cwd;
 
 $path = '';
 $do_link = 0;
+$is_windows = 0;
+
+if ($ENV{GUI} eq 'WNT') {
+    $is_windows = 1;
+}
 
 # Workaround for system Mozilla
 if ( $ENV{'SYSTEM_MOZILLA'} eq 'YES' ) {
@@ -78,11 +83,17 @@ if ( defined $ENV{DISABLE_STRIP} &&
     $strip = "-dontstrip";
 }
 
+$msi='';
+if ($is_windows) {
+    $msi = "-msitemplate $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/openoffice/msi_templates " .
+           "-msilanguage $ENV{SRC_ROOT}/instsetoo_native/$ENV{INPATH}/misc/win_ulffiles";
+}
+
 print "Running LibreOffice installer\n";
 system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 	"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
 	"-f openoffice.lst -l $langs -p LibreOffice " .
-	"-buildid $BUILD $destdir $strip " .
+	"-buildid $BUILD $destdir $strip $msi " .
 	"-simple $path") && die "Failed to install: $!";
 
 if ($ENV{BUILD_TYPE} =~ m/ODK/) {
@@ -90,11 +101,11 @@ if ($ENV{BUILD_TYPE} =~ m/ODK/) {
     system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
 	"perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
 	"-f openoffice.lst -l en-US -p LibreOffice_SDK " .
-	"-buildid $BUILD $destdir $strip " .
+	"-buildid $BUILD $destdir $strip $msi" .
 	"-simple $path") && die "Failed to install: $!";
 }
 print "Installer finished\n";
 
-if ($do_link) {
+if ($do_link && !$is_windows) {
     `$ENV{SOLARENV}/bin/linkoo $path $ENV{SRC_ROOT}`;
 }