Fold URE: Remove OO_SDK_URE_HOME on non-Windows

Change-Id: Iad0480eb39e2c1312c27cf9b90146c2beba592fd

bin/distro-install-sdk

@@ -68,7 +68,6 @@ if test -d $DESTDIR$INSTALLDIR/sdk ; then
     sed -e "s,@OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
         -e "s,@OO_SDK_HOME@,$INSTALLDIR/sdk," \
         -e "s,@OFFICE_HOME@,$INSTALLDIR," \
-        -e "s,@OO_SDK_URE_HOME@,$INSTALLDIR/ure-link," \
         -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
         -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
         -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \

odk/config/configure.pl

@@ -114,7 +114,6 @@ if ( $main::operatingSystem =~ m/darwin/ )
         }
 
     }
-    $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents";
 } else
 {
     $main::OFFICE_HOME_SUGGESTION = searchoffice();
@@ -184,8 +183,6 @@ if ( $main::operatingSystem =~ m/darwin/ )
             }
         }
     }
-
-    $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME";
 }
 
 # prepare GNU make path
@@ -768,7 +765,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#\@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;
         $_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go;

odk/config/setsdkenv_unix.sh.in

@@ -32,11 +32,7 @@ OO_SDK_HOME='@OO_SDK_HOME@'
 # Office installation directory.
 # Example: OFFICE_HOME=/opt/libreoffice
 OFFICE_HOME='@OFFICE_HOME@'
-
-# URE installation directory.
-# Example: OO_SDK_URE_HOME=/opt/libreoffice/ure
-OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
-export OO_SDK_URE_HOME
+export OFFICE_HOME
 
 # Directory of the make command.
 # Example: OO_SDK_MAKE_HOME=/usr/bin
@@ -107,9 +103,9 @@ export UNO_PATH
 
 case ${sdk_platform} in
     darwin*)
-        OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/MacOS
-        OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/Frameworks
-        OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/Resources/java
+        OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
+        OO_SDK_URE_LIB_DIR=${OFFICE_HOME}/Contents/Frameworks
+        OO_SDK_URE_JAVA_DIR=${OFFICE_HOME}/${sdk_lo_java_dir}
         ;;
     *)
         OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
@@ -294,7 +290,6 @@ echo " * SDK environment is prepared for ${platform}"
 echo " *"
 echo " * SDK = $OO_SDK_HOME"
 echo " * Office = $OFFICE_HOME"
-echo " * URE = $OO_SDK_URE_HOME"
 echo " * Make = $OO_SDK_MAKE_HOME"
 echo " * Zip = $OO_SDK_ZIP_HOME"
 echo " * cat = $OO_SDK_CAT_HOME"

odk/docs/install.html

@@ -239,12 +239,6 @@
                                   users home directory for any generated output
                                   when you use the SDK build environment.</td>
                               </tr>
-                              <tr>
-                                <td class="cell20"><b>OO_SDK_URE_HOME</b></td>
-                                <td class="cell80">Path to an existing UNO
-                                  Runtime Environment installation, e.g.
-                                  &quot;/opt/libreoffice/ure&quot;.</td>
-                              </tr>
                               <tr>
                                 <td class="cell20"><b>OO_SDK_HOME</b></td>
                                 <td class="cell80">Path to the SDK root
@@ -346,24 +340,20 @@
                               <tr valign="top">
                                 <td class="cell20">OO_SDK_URE_BIN_DIR</td>
                                 <td class="cell80">The path within the chosen
-                                  URE installation where binary executables are
-                                  located (e.g., <i>$OO_SDK_URE_HOME/bin</i>
-                                  for a Unix installation).</td>
+                                  LibreOffice URE installation where binary
+                                  executables are located.</td>
                               </tr>
                               <tr valign="top">
                                 <td class="cell20">OO_SDK_URE_LIB_DIR</td>
                                 <td class="cell80">The path within the chosen
-                                  URE installation where dynamic libraries are
-                                  located (e.g., <i>$OO_SDK_URE_HOME/lib</i>
-                                  for a Unix installation).</td>
+                                  LibreOffice URE installation where dynamic
+                                  libraries are located.</td>
                               </tr>
                               <tr valign="top">
                                 <td class="cell20">OO_SDK_URE_JAVA_DIR</td>
                                 <td class="cell80">The path within the chosen
-                                  URE installation where Java JARs are
-                                  located (e.g.,
-                                  <i>$OO_SDK_URE_HOME/share/java</i> for a Unix
-                                  installation).</td>
+                                  LibreOffice URE installation where Java JARs
+                                  are located.</td>
                               </tr>
                               <tr valign="top">
                                 <td class="cell20">CLASSPATH</td>

odk/settings/settings.mk

@@ -451,9 +451,7 @@ EXE_LINK_FLAGS=$(GCC_ARCH_OPTION) -Wl,-multiply_defined,suppress
 LINK_LIBS=-L$(OUT)/lib -L$(OO_SDK_OUT)/$(PLATFORM)/lib -L"$(OO_SDK_URE_LIB_DIR)"
 LINK_JAVA_LIBS=-framework JavaVM
 
-ifneq "$(OO_SDK_URE_HOME)" ""
-URE_MISC=$(OO_SDK_URE_HOME)/Resources/ure/share/misc
-endif
+URE_MISC=$(OFFICE_HOME)/Contents/Resources/ure/share/misc
 
 endif