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

7 files changed, 19 insertions, 84 deletions

diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 961f15ae051a..81fed0585805 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -36,7 +36,6 @@ var oo_user_sdk_dir=WshSysEnv("APPDATA") + "\\" + oo_sdk_name;
 var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat";
 
 var office_home=getOfficeHome();
-var office_base_home=getOfficeBaseHome();
 var oo_sdk_ure_home=getUreHome();
 
 var oo_sdk_make_home=getMakeHome();
@@ -215,12 +214,6 @@ function getOfficeHome()
 function searchOffice()
 {
 	var tmp = oo_sdk_home;
-	var officepath ="";
-	var index=-1;
-
-	if ((index = tmp.lastIndexOf("\\Basis")) != -1) {
-	   tmp = tmp.substr(0, index);
-	}
 
 	if (aFileSystemObject.FileExists(tmp + "\\program\\soffice.exe")) {
 	   return tmp;
@@ -230,23 +223,10 @@ function searchOffice()
 }
 
 
-function getOfficeBaseHome()
-{
-	var officebase = oo_sdk_home;
-	var index=officebase.lastIndexOf("\\");
-	
-	officebase = officebase.substr(0, index);
-
-	return officebase;
-}
-
 function getUreHome()
 {
 	var tmpure = oo_sdk_home;
 	var ure = "";
-	var index=0;
-    if ((index = tmpure.lastIndexOf("Basis")) != -1)   
-	   tmpure = tmpure.substr(0, index);
 
     if (aFileSystemObject.FileExists(tmpure + "\\URE\\bin\\uno.exe")) {
 	   ure = tmpure + "\URE";
@@ -792,16 +772,13 @@ function writeBatFile(fdir, file)
         "set OO_SDK_NAME=" + oo_sdk_name  +
         "\n\n" +
         "REM Installation directory of the Software Development Kit.\n" +
-        "REM Example: set OO_SDK_HOME=C:\\Program Files\\LibreOffice 3\\Basis\\sdk\n" +
+        "REM Example: set OO_SDK_HOME=C:\\Program Files\\LibreOffice 3\\sdk\n" +
         "set OO_SDK_HOME=" + oo_sdk_home  +
         "\n\n" +
         "REM Office installation directory.\n" +
         "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\n" +
         "set OFFICE_HOME=" + office_home +
         "\n\n" +
-        "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\\Basis\n" +
-        "set OFFICE_BASE_HOME=" + office_base_home +
-        "\n\n" +
         "REM URE installation directory.\n" +
         "REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\LibreOffice 3\\URE\n" +
         "set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
@@ -874,11 +851,6 @@ function writeBatFile(fdir, file)
         "   set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\n" +
         " )\n" +
         "\n" +
-        "REM Set office program path.\n" +
-        "if defined OFFICE_BASE_HOME (\n" +
-        "   set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_HOME%\\program\n" +
-        " )\n" +
-        "\n" +
 		"REM Set UNO path, necessary to ensure that the cpp examples using the\n" +
 		"REM new UNO bootstrap mechanism use the configured office installation\n" +
 		"REM (only set when using an Office).\n" +
@@ -892,8 +864,8 @@ function writeBatFile(fdir, file)
         "set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\\java\n" +
         "REM ) else (\n" +
         "set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%\n" +
-        "set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%\n" +
-        "set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\\classes\n" +
+        "set OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%\n" +
+        "set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\\classes\n" +
         "REM )\n" +
         "\n" +
         "REM Set classpath\n" +
@@ -945,7 +917,6 @@ function writeBatFile(fdir, file)
         "echo  *\n" +       
         "echo  * SDK = %OO_SDK_HOME%\n" +
         "echo  * Office = %OFFICE_HOME%\n" +
-        "echo  * Office Base = %OFFICE_BASE_HOME%\n" +
         "echo  * URE = %OO_SDK_URE_HOME%\n" +
         "echo  * Make = %OO_SDK_MAKE_HOME%\n" +
         "echo  * Zip = %OO_SDK_ZIP_HOME%\n" +
diff --git a/odk/configure.pl b/odk/configure.pl
index c03fe0081c17..533c881cb764 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -30,8 +30,6 @@ $main::OFFICE_OR_URE_SUGGESTION = "Office";
 
 $main::OFFICE_HOME = "";
 
-$main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
-
 $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
 chomp($main::OO_SDK_URE_HOME);
 
@@ -108,21 +106,12 @@ if ( $main::OFFICE_OR_URE eq "Office" )
             }
 
             # check more details
-            if ( -d "$main::OFFICE_HOME/Contents/basis-link" ) {
-                $main::OFFICE_BASE_HOME = "$main::OFFICE_HOME/Contents/basis-link";
-                if ( -d "$main::OFFICE_BASE_HOME/ure-link" ) {
-                    $main::OO_SDK_URE_HOME = "$main::OFFICE_BASE_HOME/ure-link";
-                } else {
-                    $main::OFFICE_HOME = "";
-                    $main::OFFICE_BASE_HOME = "";
-                    $main::OO_SDK_URE_HOME = "";
-                    print " Error: no URE found in office installation, please specify the path to a valid installation.\n";
-                }
+            if ( -d "$main::OFFICE_HOME/Contents/ure-link" ) {
+                $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents/ure-link";
             } else {
                 $main::OFFICE_HOME = "";
-                $main::OFFICE_BASE_HOME = "";
                 $main::OO_SDK_URE_HOME = "";
-                print " Error: no base layer found in office installation, please specify the path to a valid installation.\n";
+                print " Error: no URE found in office installation, please specify the path to a valid installation.\n";
             }
         }
     } else
@@ -785,7 +774,6 @@ sub prepareScriptFile()
         $_ =~ s#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go;
         $_ =~ s#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go;
         $_ =~ s#\@OFFICE_HOME\@#$main::OFFICE_HOME#go;
-        $_ =~ s#\@OFFICE_BASE_HOME\@#$main::OFFICE_BASE_HOME#go;
         $_ =~ s#\@OO_SDK_URE_HOME\@#$main::OO_SDK_URE_HOME#go;
         $_ =~ s#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go;
         $_ =~ s#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go;
diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
index e0416f8ea8d8..47daa7559af0 100644
--- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
+++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
@@ -79,7 +79,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     if (nCount < 1)
     {
         printf("using: DocumentLoader -env:URE_MORE_TYPES=<office_types_rdb_url> <file_url> [<uno_connection_url>]\n\n"
-               "example: DocumentLoader -env:URE_MORE_TYPES=\"file:///.../basis-link/program/offapi.rdb\" \"file:///e:/temp/test.odt\" \"uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager\"\n");
+               "example: DocumentLoader -env:URE_MORE_TYPES=\"file:///.../program/offapi.rdb\" \"file:///e:/temp/test.odt\" \"uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager\"\n");
         exit(1);
     }
      if (nCount == 2)
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index f48be7b6ce99..f5a2cdcc154e 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/odk/setsdkenv_unix.csh.in
@@ -65,11 +65,6 @@ if ( "${OFFICE_HOME}" != "" ) then
     setenv OFFICE_PROGRAM_PATH "${OFFICE_HOME}/${programdir}"
 endif
 
-# Set office base program path.
-if ( "${OFFICE_BASE_HOME}" != "" ) then
-    setenv OFFICE_BASE_PROGRAM_PATH "${OFFICE_BASE_HOME}/program"
-endif
-
 
 # Set UNO path, necessary to ensure that the cpp examples using the
 # new UNO bootstrap mechanism use the configured office installation.
@@ -83,8 +78,8 @@ if ( "${OO_SDK_URE_HOME}" != "" ) then
     setenv OO_SDK_URE_JAVA_DIR "${OO_SDK_URE_HOME}/share/java"
 else
     setenv OO_SDK_URE_BIN_DIR "${OFFICE_PROGRAM_PATH}"
-    setenv OO_SDK_URE_LIB_DIR "${OFFICE_BASE_PROGRAM_PATH}"
-    setenv OO_SDK_URE_JAVA_DIR "${OFFICE_BASE_PROGRAM_PATH}/classes"
+    setenv OO_SDK_URE_LIB_DIR "${OFFICE_PROGRAM_PATH}"
+    setenv OO_SDK_URE_JAVA_DIR "${OFFICE_PROGRAM_PATH}/classes"
 endif
 
 # Set SDK example output directory
@@ -261,7 +256,6 @@ echo " * SDK environment is prepared for ${platform}"
 echo " *"                                                  
 echo " * SDK = ${OO_SDK_HOME}"
 echo " * Office = ${OFFICE_HOME}"
-echo " * Office Base = ${OFFICE_BASE_HOME}"
 echo " * URE = ${OO_SDK_URE_HOME}"
 echo " * Make = ${OO_SDK_MAKE_HOME}"
 echo " * Zip = ${OO_SDK_ZIP_HOME}"
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 91bf164bffbc..5ed1aff311e8 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -15,7 +15,6 @@ OO_SDK_HOME='@OO_SDK_HOME@'
 # Office installation directory.
 # Example: OFFICE_HOME=/opt/libreoffice
 OFFICE_HOME='@OFFICE_HOME@'
-OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
 
 # URE installation directory.
 # Example: OO_SDK_URE_HOME=/opt/libreoffice/ure
@@ -87,13 +86,6 @@ then
     export OFFICE_PROGRAM_PATH
 fi
 
-# Set office program path (only set when using an Office).
-if [ "${OFFICE_BASE_HOME}" ]
-then
-    OFFICE_BASE_PROGRAM_PATH=${OFFICE_BASE_HOME}/program
-    export OFFICE_BASE_PROGRAM_PATH
-fi
-
 
 # Set UNO path, necessary to ensure that the cpp examples using the
 # new UNO bootstrap mechanism use the configured office installation (only set
@@ -111,8 +103,8 @@ then
     OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
 else
     OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
-    OO_SDK_URE_LIB_DIR=${OFFICE_BASE_PROGRAM_PATH}
-    OO_SDK_URE_JAVA_DIR=${OFFICE_BASE_PROGRAM_PATH}/classes
+    OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
+    OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes
 fi
 export OO_SDK_URE_BIN_DIR
 export OO_SDK_URE_LIB_DIR
@@ -225,7 +217,7 @@ esac
 PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:.:${PATH}
 
 # Set the classpath
-CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_BASE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
+CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
 export CLASSPATH
 
 
@@ -307,7 +299,6 @@ echo " * SDK environment is prepared for ${platform}"
 echo " *"                                                  
 echo " * SDK = $OO_SDK_HOME"
 echo " * Office = $OFFICE_HOME"
-echo " * Office Base = $OFFICE_BASE_HOME"
 echo " * URE = $OO_SDK_URE_HOME"
 echo " * Make = $OO_SDK_MAKE_HOME"
 echo " * Zip = $OO_SDK_ZIP_HOME"
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index fbe09f91755f..96877d26c28a 100755
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -7,16 +7,13 @@ REM Example: set OO_SDK_NAME=libreoffice3.4_sdk
 set OO_SDK_NAME=libreoffice3.4_sdk
 
 REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\Basis\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\sdk
 set OO_SDK_HOME=
 
 REM Office installation directory.
 REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3
 set OFFICE_HOME=
 
-REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3\Basis
-set OFFICE_BASE_HOME=
-
 REM URE installation directory.
 REM Example: set OO_SDK_URE_HOME=C:\Program Files\LibreOffice 3\URE
 set OO_SDK_URE_HOME=
@@ -45,7 +42,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
 set OO_SDK_JAVA_HOME=
 
 REM Special output directory
-REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\Basis\sdk
+REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\sdk
 set OO_SDK_OUT=
 
 REM Automatic deployment
@@ -90,11 +87,6 @@ if defined OFFICE_HOME (
    set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program
  )
 
-REM Set office program path.
-if defined OFFICE_BASE_HOME (
-   set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_HOME%\program
- )
-
 REM Set UNO path, necessary to ensure that the cpp examples using the
 REM new UNO bootstrap mechanism use the configured office installation
 REM (only set when using an Office).
@@ -108,8 +100,8 @@ set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\bin
 set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\java
 REM ) else (
 set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%
-set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%
-set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\classes
+set OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%
+set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
 REM )
 
 REM Set classpath
@@ -157,7 +149,6 @@ echo  * SDK environment is prepared for Windows
 echo  *
 echo  * SDK = %OO_SDK_HOME%
 echo  * Office = %OFFICE_HOME%
-echo  * Office Base = %OFFICE_BASE_HOME%
 echo  * URE = %OO_SDK_URE_HOME%
 echo  * Make = %OO_SDK_MAKE_HOME%
 echo  * Zip = %OO_SDK_ZIP_HOME%
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 6deb065f9dc1..07266311ca40 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -19,7 +19,7 @@ IDL_DIR=$(PRJ)/idl
 BIN_DIR=$(PRJ)/bin
 CLASSES_DIR=$(PRJ)/classes
 URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR))
-OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH))/classes
+OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
 COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN))
 
 SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
@@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
 URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
 URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
 
-OFFICE_TYPES="$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH)$(PS)offapi.rdb)"
-OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
+OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)"
+OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
 
 OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"