diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-19 16:37:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-19 16:39:26 +0200 |
| commit | 1206a75575f28da6368ec3851658528143d7805f (patch) | |
| tree | 41cbb74592cce24202ed986337fb37d25901c0c3 /solenv | |
| parent | a015cda8f2c5a5c3c897e0933b631b9c0f6afd6b (diff) | |
Undo basis/brand split: adapted linkoo.
Linking .rdb files has been disabled as it appears completely broken
(erroneously picking up a testtools/*/lib/services.rdb instead of one
from solver).
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/linkoo | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index 14b595bef5d7..1c22cb083a60 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -109,8 +109,6 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die "linkoo requires absolute paths ($OOO_ # setup global variables -my $basis_dir = 'basis-link/program'; -my $win_basis_dir = 'Basis/program'; my $brand_program_dir = 'program'; my $ure_lib_dir = 'basis-link/ure-link/lib'; my $win_ure_lib_dir = 'URE/bin'; @@ -121,18 +119,11 @@ my $bin; $bin = "|\\.bin" if ($TARGET eq 'wntgcci.pro'); my %replaceable = ( $brand_program_dir => "(\\.so|\\.dll|\\.exe|\\.com$bin)\$", - $basis_dir => "\\.rdb", - $win_basis_dir => "\\.rdb", $ure_lib_dir => "(\\.so\$|\\.so\\.3\$)", $win_ure_lib_dir => "(\\.dll|\\.exe|\\.bin|\\.com)\$", - $basis_dir . '/resource' => '\.res$', - $basis_dir . '/classes' => '\.jar$', - $win_basis_dir . '/resource' => '\.res$', - $win_basis_dir . '/classes' => '\.jar$', - 'basis-link/share/config' => '\.zip$', - 'Basis/share/config' => '\.zip$', - 'ure/share/misc' => '\.rdb$', - 'URE/misc' => '\.rdb$' + $brand_program_dir . '/resource' => '\.res$', + $brand_program_dir . '/classes' => '\.jar$', + 'share/config' => '\.zip$', # 'share/uno_packages' => '\.zip$' ); |