Fix OO_SDK_URE_HOME for new Mac OS X layout

Change-Id: I438b9ca643819cfd3e636e8157c6ef491beb1903

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
 {

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}

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