Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.

5 files changed, 15 insertions, 16 deletions

diff --git a/desktop/scripts/basis-link b/desktop/scripts/basis-link
deleted file mode 100755
index 3af84201e04f..000000000000
--- a/desktop/scripts/basis-link
+++ /dev/null
@@ -1 +0,0 @@
-Basis
\ No newline at end of file
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index 28ee88964b09..86ea49f02516 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -131,8 +131,8 @@ fi
 case "`uname -s`" in
 NetBSD|OpenBSD|FreeBSD|DragonFly)
 # this is a temporary hack until we can live with the default search paths
-    sd_prog1="$sd_prog/../basis-link/program"
-    sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+    sd_prog1="$sd_prog"
+    sd_prog2="$sd_prog/../ure-link/lib"
     LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
     JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
     export LD_LIBRARY_PATH
@@ -141,7 +141,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
     fi
     ;;
 AIX)
-    LIBPATH=$sd_prog:$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LIBPATH:+:$LIBPATH}
+    LIBPATH=$sd_prog:$sd_prog/../ure-link/lib${LIBPATH:+:$LIBPATH}
     export LIBPATH
     ;;
 esac
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index a7566155aa0d..97ee44503621 100755
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -40,14 +40,14 @@ sd_prog=`pwd`
 
 case $1 in
 c++)
-    printf '%s' "$sd_prog/../basis-link/ure-link/lib"
+    printf '%s' "$sd_prog/../ure-link/lib"
     ;;
 java)
     printf '0%s\0%s\0%s\0%s\0%s' \
-        "$sd_prog/../basis-link/ure-link/share/java/ridl.jar" \
-        "$sd_prog/../basis-link/ure-link/share/java/jurt.jar" \
-        "$sd_prog/../basis-link/ure-link/share/java/juh.jar" \
-        "$sd_prog/../basis-link/program/classes/unoil.jar" "$sd_prog"
+        "$sd_prog/../ure-link/share/java/ridl.jar" \
+        "$sd_prog/../ure-link/share/java/jurt.jar" \
+        "$sd_prog/../ure-link/share/java/juh.jar" \
+        "$sd_prog/../program/classes/unoil.jar" "$sd_prog"
     ;;
 *)
     exit 1
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 54918f0a17ae..9856d191b68f 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -45,8 +45,8 @@ cd "$sd_cwd"
 # this is a temporary hack until we can live with the default search paths
 case "`uname -s`" in
 NetBSD|OpenBSD|FreeBSD|DragonFly)
-    sd_prog1="$sd_prog/../basis-link/program"
-    sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+    sd_prog1="$sd_prog"
+    sd_prog2="$sd_prog/../ure-link/lib"
     LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
     JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
     export LD_LIBRARY_PATH
@@ -55,8 +55,8 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
     fi
     ;;
 AIX)
-    sd_prog1="$sd_prog/../basis-link/program"
-    sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+    sd_prog1="$sd_prog"
+    sd_prog2="$sd_prog/../ure-link/lib"
     LIBPATH=$sd_prog1:$sd_prog2${LIBPATH:+:${LIBPATH}}
     export LIBPATH
     ;;
@@ -83,8 +83,8 @@ then
 fi
 
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
-    my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
+if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then
+    my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
         "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
     if [ -n "$my_path" ] ; then
         sd_platform=`uname -s`
diff --git a/desktop/scripts/ure-link b/desktop/scripts/ure-link
index dd0ecb6115e8..122de345e91f 100755
--- a/desktop/scripts/ure-link
+++ b/desktop/scripts/ure-link
@@ -1 +1 @@
-..\URE
\ No newline at end of file
+URE
\ No newline at end of file