[Libreoffice-commits] core.git: 2 commits - odk/config odk/settings

[Stephan Bergmann]

 odk/config/configure.pl         |    8 +-------
 odk/config/setsdkenv_unix.sh.in |   15 ++++++++++++---
 odk/settings/settings.mk        |    2 +-
 odk/settings/std.mk             |    2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

New commits:
commit 8702519ddda114f11380c8bbeaf14c6c8f179693
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 16 23:39:29 2014 +0200

    Fix OO_SDK_URE_HOME for new Mac OS X layout
    
    Change-Id: I438b9ca643819cfd3e636e8157c6ef491beb1903

diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 83842e8..9f96a27 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -118,13 +118,7 @@ if ( $main::operatingSystem =~ m/darwin/ )
         }
 
         # check more details
-        if ( -d "$main::OFFICE_HOME/Contents/ure-link" ) {
-            $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents/ure-link";
-        } else {
-            $main::OFFICE_HOME = "";
-            $main::OO_SDK_URE_HOME = "";
-            print " Error: no URE found in office installation, please specify the path to a valid installation.\n";
-        }
+        $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents";
     }
 } else
 {
diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in
index 4ab9d62..d749553 100644
--- a/odk/config/setsdkenv_unix.sh.in
+++ b/odk/config/setsdkenv_unix.sh.in
@@ -120,9 +120,18 @@ fi
 
 if [ "${OO_SDK_URE_HOME}" ]
 then
-    OO_SDK_URE_BIN_DIR=${OO_SDK_URE_HOME}/bin
-    OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
-    OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
+    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=${OO_SDK_URE_HOME}/bin
+        OO_SDK_URE_LIB_DIR=${OO_SDK_URE_HOME}/lib
+        OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
+        ;;
+    esac
 else
     OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
     OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 740233e..0377c57 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -456,7 +456,7 @@ 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)/share/misc
+URE_MISC=$(OO_SDK_URE_HOME)/Resources/ure/share/misc
 endif
 
 endif
commit 0c3f80cbbe5f21209439a3173620e537bdcdb8dc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 16 23:27:21 2014 +0200

    Use OO_SDK_URE_BIN_DIR
    
    Change-Id: Ifd40e523f146ee26f49fe443e2455d053c7b6bfc

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 93fa862..7d76d90 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -70,7 +70,7 @@ SDK_SED="$(OO_SDK_SED_HOME)/sed"
 IDLC="$(OO_SDK_HOME)/bin/idlc"
 CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker"
 JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
-REGMERGE="$(OO_SDK_URE_HOME)/bin/regmerge"
+REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
 
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
     -C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \