[Libreoffice-commits] .: solenv/bin

[Cédric Bosdonnat]

 solenv/bin/linkoo |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 4b070887759169878ab7584e15d54cd111182446
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Dec 7 21:52:15 2010 +0100

    linkoo: link the URE libs and jars as well

diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index c6929e6..e642b48 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -54,6 +54,8 @@ export SAL_ALLOW_LINKOO_SYMLINKS=1
 $program_dir = 'basis-link/program';
 $brand_program_dir = 'program';
 $ure_misc_dir = 'basis-link/ure-link/share/misc';
+$ure_java_dir = 'basis-link/ure-link/share/java';
+$ure_lib_dir = 'basis-link/ure-link/lib';
 
 $program_dir = 'openoffice.org/basis-link/MacOS' if ($ENV{OS} eq 'MACOSX'); # FIXME probably wrong
 
@@ -61,6 +63,8 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
 %replaceable = (
     $program_dir => '\.so',
+    $ure_lib_dir => '\.so',
+    $ure_java_dir => '\.jar$',
     $program_dir . '/resource' => '\.res$',
     $program_dir . '/classes' => '\.jar$',
     'basis-link/share/config' => '\.zip$',
@@ -69,6 +73,7 @@ my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
 # strangely enough, OSX has those small differences...
 $replaceable{$program_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
+$replaceable{$ure_lib_dir_dir} = '\.dylib$' if ($ENV{OS} eq 'MACOSX');
 
 @search_dirs = ( 'lib', 'bin', 'class' );