From b786a33cfdca2e8a4114ddef0340e0e0628dd09c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 21 Oct 2011 17:18:13 +0200
Subject: Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR
 and BaseInstallation.

---
 toolkit/workben/layout/README    | 4 ++--
 toolkit/workben/layout/TEST      | 2 +-
 toolkit/workben/layout/testrc.in | 8 ++------
 3 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'toolkit')

diff --git a/toolkit/workben/layout/README b/toolkit/workben/layout/README
index 3b83bbfc00cd..3ab112e50ff2 100644
--- a/toolkit/workben/layout/README
+++ b/toolkit/workben/layout/README
@@ -15,8 +15,8 @@ Testing workbench and editor for Layout engine.
 * FIXME: New three layer install/rpath feature needs these workarounds
 |
 |  test -d $OOO_INSTALL_PREFIX/openoffice.org3 && export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX/openoffice.org3 || export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX
-|  cp -f ../..$INPATH/lib/libtkx.so $OOO_PREFIX/openoffice.org/basis3.0/program
-|  export LD_LIBRARY_PATH=$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib
+|  cp -f ../..$INPATH/lib/libtkx.so $OOO_PREFIX/openoffice.org/program
+|  export LD_LIBRARY_PATH=$OOO_PREFIX_BRAND/program:$OOO_PREFIX_BRAND/ure-link/lib
 |
 |  (see source/layout/helper.cxx)
 
diff --git a/toolkit/workben/layout/TEST b/toolkit/workben/layout/TEST
index 8a04a6628da8..e1376e1f2867 100755
--- a/toolkit/workben/layout/TEST
+++ b/toolkit/workben/layout/TEST
@@ -7,5 +7,5 @@ for d in $(cd ../../../../.. && pwd)/ooo-svn /usr/lib/ooo3/; do
 done
 export SAL_ALLOW_LINKOO_SYMLINKS=1
 test -d $OOO_INSTALL_PREFIX/openoffice.org3 && export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX/openoffice.org3 || export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX
-export LD_LIBRARY_PATH="$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib"
+export LD_LIBRARY_PATH="$OOO_PREFIX_BRAND/program:$OOO_PREFIX_BRAND/ure-link/lib"
 ../../unx*.pro/bin/test "$@"
diff --git a/toolkit/workben/layout/testrc.in b/toolkit/workben/layout/testrc.in
index 00ae5eb3cd5e..b6c232aae60f 100644
--- a/toolkit/workben/layout/testrc.in
+++ b/toolkit/workben/layout/testrc.in
@@ -1,12 +1,8 @@
 OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
-OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
-OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
-OOO_URE_URL=${OOO_BASIS_URL}/ure-link
+OOO_BASIS_BIN_URL=${OOO_INSTALL_PREFIX_URL}/program
+OOO_URE_URL=${OOO_INSTALL_PREFIX_URL}/ure-link
 #
-#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
-#BaseInstallation=${OOO_BASIS_URL}
 BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
-OOO_BASE_DIR=${OOO_BASIS_URL}
 #
 UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
 UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
-- 
cgit