svn commit: r1623849 - in /openoffice/trunk/main/solenv/bin/modules/installer: globals.pm parameter.pm

[ydario]

Author: ydario
Date: Tue Sep  9 15:34:20 2014
New Revision: 1623849

URL: http://svn.apache.org/r1623849
Log:
#i118923# OS/2 port, use forward slashes for paths in installer scripts.

Modified:
    openoffice/trunk/main/solenv/bin/modules/installer/globals.pm
    openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm

Modified: openoffice/trunk/main/solenv/bin/modules/installer/globals.pm
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/globals.pm?rev=1623849&r1=1623848&r2=1623849&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/globals.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/globals.pm Tue Sep  9 
15:34:20 2014
@@ -499,7 +499,7 @@ BEGIN
                $checksumfile = "so_checksum";
                $unopkgfile = "unopkg.bin";
                $separator = "/";
-               $pathseparator = "\:";
+               $pathseparator = "\;";
                $libextension = "\.dll";
                $isunix = 0;
                $iswin = 0;

Modified: openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm?rev=1623849&r1=1623848&r2=1623849&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm (original)
+++ openoffice/trunk/main/solenv/bin/modules/installer/parameter.pm Tue Sep  9 
15:34:20 2014
@@ -246,8 +246,15 @@ sub make_path_absolute
                        if (!($$pathref =~ /^\s*\w\:/)) # this is a relative 
windows path (no dos drive)
                        {
                                $$pathref = cwd() . 
$installer::globals::separator . $$pathref;
+                               if ( $installer::globals::isos2 )
+                               {
+                                       $$pathref =~ s/\\/\//g;
+                               }
+                               else
+                               {
+                                       $$pathref =~ s/\//\\/g;
+                               }
 
-                               $$pathref =~ s/\//\\/g;
                        }
                }
        }
@@ -376,6 +383,7 @@ sub setglobalvariables
        {       
                $installer::globals::unpackpath = cwd();
                if ( $installer::globals::iswin ) { 
$installer::globals::unpackpath =~ s/\//\\/g; }
+               if ( $installer::globals::isos2 ) { 
$installer::globals::unpackpath =~ s/\\/\//g; }
        }
 
        if ( $installer::globals::localunpackdir ne "" ) { 
$installer::globals::unpackpath = $installer::globals::localunpackdir; }