solenv/bin/modules/installer/globals.pm | 2 +- solenv/bin/modules/installer/parameter.pm | 10 +++++++++- solenv/bin/modules/pre2par/parameter.pm | 9 +++++++++ solenv/inc/libs.mk | 5 ++++- 4 files changed, 23 insertions(+), 3 deletions(-)
New commits: commit 13fcc38291a3d30d4610492e527e2f30c906e30a Author: Yuri Dario <yda...@apache.org> Date: Tue Sep 9 15:35:43 2014 +0000 #i118923# OS/2 port, use forward slashes for paths in installer scripts. diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm index 92fe984..adae8e8 100644 --- a/solenv/bin/modules/pre2par/parameter.pm +++ b/solenv/bin/modules/pre2par/parameter.pm @@ -152,6 +152,15 @@ sub make_path_absolute } } + if ( $pre2par::globals::isos2 ) + { + if (!($$pathref =~ /^\s*\w\:/)) # this is a relative os2 path + { + $$pathref = cwd() . $pre2par::globals::separator . $$pathref; + $$pathref =~ s/\\/\//g; + } + } + $$pathref =~ s/\Q$pre2par::globals::separator\E\s*$//; # removing ending slashes } commit 0eda64e2bb03cda98844ffcf16bfc0215d9b706f Author: Yuri Dario <yda...@apache.org> Date: Tue Sep 9 15:34:20 2014 +0000 #i118923# OS/2 port, use forward slashes for paths in installer scripts. diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index e55bfcd..a3b2851 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -499,7 +499,7 @@ BEGIN $checksumfile = "so_checksum"; $unopkgfile = "unopkg.bin"; $separator = "/"; - $pathseparator = "\:"; + $pathseparator = "\;"; $libextension = "\.dll"; $isunix = 0; $iswin = 0; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 122abf5..526866c 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -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; } commit c2063d3da2916dc0f6f81b81232ce9d6407d697d Author: Yuri Dario <yda...@apache.org> Date: Tue Sep 9 15:27:00 2014 +0000 #i125501# build fixes for enabling Category B also in OS/2 port. diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index d8d70a9..361d9ce 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -326,6 +326,8 @@ UDMLIB=-ludm ULINGULIB=-lulingu .IF "$(SYSTEM_HUNSPELL)" == "YES" HUNSPELLLIB=$(HUNSPELL_LIBS) +.ELIF "$(GUI)" == "OS2" +HUNSPELLLIB=-lhunspell .ELSE HUNSPELLLIB=-lhunspell-1.3 .ENDIF @@ -333,11 +335,12 @@ HUNSPELLLIB=-lhunspell-1.3 MYTHESLIB=$(MYTHES_LIBS) .ELIF "$(GUI)" == "OS2" MYTHESLIB=-lmythes +COINMPLIBS=-lCoinMP .ELSE MYTHESLIB=-lmythes-1.2 +COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver .ENDIF PYUNOLIB=-lpyuno -COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver INTERNAL_APR_LIBS=-lapr-1 INTERNAL_APR_UTIL_LIBS=-laprutil-1 INTERNAL_SERF_LIBS=-lserf-1 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits