diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:58 +0200 |
| commit | b786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch) | |
| tree | a0adbba80933544e1912adeb29a8e79797b7fc1c /solenv/bin | |
| parent | 3535ceeac6f1b4277279082998663feb84d05487 (diff) | |
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'solenv/bin')
| -rwxr-xr-x | solenv/bin/install-gdb-printers | 6 | ||||
| -rwxr-xr-x | solenv/bin/linkoo | 8 | ||||
| -rw-r--r-- | solenv/bin/macosx-change-install-names.pl | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index eaab2e849cc2..aa63f62e5e3b 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -124,7 +124,7 @@ create=false link=false # This option is only here to enable using the script during build of # solenv/gdb . We must (or, better, want to :) avoid using the -# installation subpaths (like basis-link), because all libs in solver +# installation subpaths (like ure-link), because all libs in solver # are in the same dir. flat=false @@ -169,8 +169,8 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}" fi -make_autoload cppu basis-link/ure-link/lib libuno_cppu."$DYLIB".3 -make_autoload sal basis-link/ure-link/lib libuno_sal."$DYLIB".3 +make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3 +make_autoload sal ure-link/lib libuno_sal."$DYLIB".3 make_autoload svl program libsvllo."$DYLIB" make_autoload sw program libswlo."$DYLIB" make_autoload tl program libtllo."$DYLIB" diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo index c39237f6dcfb..fc7b38c4aa8a 100755 --- a/solenv/bin/linkoo +++ b/solenv/bin/linkoo @@ -42,12 +42,12 @@ use strict; # ends up in program/ooenv ( my $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/; my $env_script = ' -java_path=`$thisdir/../basis-link/ure-link/bin/javaldx 2>/dev/null` +java_path=`$thisdir/../ure-link/bin/javaldx 2>/dev/null` export LD_LIBRARY_PATH="$thisdir:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH" ulimit -c unlimited -export PATH="$thisdir/:$thisdir/../basis-link/program:$thisdir/../basis-link/ure-link/bin:$PATH" +export PATH="$thisdir:$thisdir/../ure-link/bin:$PATH" export GNOME_DISABLE_CRASH_DIALOG=1 -export STAR_RESOURCEPATH=$thisdir/../basis-link/program/resource +export STAR_RESOURCEPATH=$thisdir/resource # debugging assistance export SAL_DISABLE_FLOATGRAB=1 export G_SLICE=always-malloc @@ -110,7 +110,7 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die "linkoo requires absolute paths ($OOO_ # setup global variables my $brand_program_dir = 'program'; -my $ure_lib_dir = 'basis-link/ure-link/lib'; +my $ure_lib_dir = 'ure-link/lib'; my $win_ure_lib_dir = 'URE/bin'; my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' ); diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index 1374be010894..8ff051e8ea55 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -34,13 +34,13 @@ sub action($$$) ('app/UREBIN/URELIB' => '@executable_path/../lib', 'app/OOO/URELIB' => '@executable_path/../ure-link/lib', 'app/SDK/URELIB' => '@executable_path/../../ure-link/lib', - 'app/BRAND/URELIB' => '@executable_path/../basis-link/ure-link/lib', + 'app/BRAND/URELIB' => '@executable_path/../ure-link/lib', 'app/BRAND/OOO' => '@executable_path', 'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__', 'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__', 'shl/URELIB/URELIB' => '@loader_path', - 'shl/OOO/URELIB' => '@loader_path/../basis-link/ure-link/lib', + 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib', 'shl/OOO/OOO' => '@loader_path', 'shl/LOADER/LOADER' => '@loader_path', 'shl/OXT/URELIB' => '@executable_path/urelibs', |