cmcfixes74: merge with DEV300 m80

odk/cfgWin.js

@@ -846,7 +846,7 @@ function writeBatFile(fdir, file)
 		"REM if exist \"%OO_SDK_HOME%\\windows\\lib\\stlport_vc71_stldebug.lib\". (\n" +
 		"REM   set STLDEBUG=_stldebug\n" +
 		"REM )\n\n" +
-        "REM Check installation path for the StarOffice Development Kit.\n" +
+        "REM Check installation path for the Office Development Kit.\n" +
         "if not defined OO_SDK_HOME (\n" +
         "   echo Error: the variable OO_SDK_HOME is missing!\n" +
         "   goto :error\n" +

odk/configure.pl

@@ -37,6 +37,7 @@ if ( $main::operatingSystem =~ m/darwin/ )
 } else {
     $main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`;
 }
+chomp($main::OO_SDK_URE_HOME);
 
 $main::OO_SDK_MAKE_HOME = "";
 $main::makeName = "make";
@@ -625,6 +626,9 @@ sub searchMacOffice
     if (-d "/Applications/OpenOffice.org.app" ) {
         return "/Applications/OpenOffice.org.app"
     }
+    if (-d "/Applications/Oracle Open Office.app" ) {
+        return "/Applications/Oracle Open Office.app";
+    }
     if (-d "/Applications/StarOffice.app" ) {
         return "/Applications/StarOffice.app";
     }
@@ -650,6 +654,16 @@ sub searchoffice
         return $officepath;
     }
     # fallback
+    my $tmpversion = $main::OO_MAJORVERSION;
+#   if ( $main::OO_MINORVERSION > 0) {
+#       $tmpversion = "$tmpversion.$main::OO_MINORVERSION";
+#   }
+
+    $officepath = "$tmpOffice/oracle_open_office$tmpversion";
+    if (-d $officepath && -e "$officepath/program/soffice") {
+        return $officepath;
+    }
+
     my $tmpversion = $main::OO_MAJORVERSION + 6;
     if ( $main::OO_MINORVERSION > 0) {
         $tmpversion = "$tmpversion.$main::OO_MINORVERSION";

odk/setsdkenv_unix.csh.in

@@ -9,16 +9,16 @@ setenv OO_SDK_NAME @OO_SDK_NAME@
 
 # Installation directory of the Software Development Kit.
 # Example: setenv OO_SDK_HOME /opt/openoffice.org/basis3.0/sdk
-setenv OO_SDK_HOME @OO_SDK_HOME@
+setenv OO_SDK_HOME '@OO_SDK_HOME@'
 
 # Office installation directory.
 # Example: set OFFICE_HOME=/opt/openoffice.org3
-set OFFICE_HOME=@OFFICE_HOME@
-OFFICE_BASE_HOME=@OFFICE_BASE_HOME@
+set OFFICE_HOME='@OFFICE_HOME@'
+OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
 
 # URE installation directory.
 # Example: setenv OO_SDK_URE_HOME /opt/openoffice.org/ure
-setenv OO_SDK_URE_HOME @OO_SDK_URE_HOME@
+setenv OO_SDK_URE_HOME '@OO_SDK_URE_HOME@'
 
 # Directory of the make command.
 # Example: setenv OO_SDK_MAKE_HOME /usr/bin

odk/setsdkenv_unix.sh.in

@@ -10,16 +10,16 @@ export OO_SDK_NAME
 
 # Installation directory of the Software Development Kit.
 # Example: OO_SDK_HOME=/opt/openoffice.org/basis3.0/sdk
-OO_SDK_HOME=@OO_SDK_HOME@
+OO_SDK_HOME='@OO_SDK_HOME@'
 
 # Office installation directory.
 # Example: OFFICE_HOME=/opt/openoffice.org3
-OFFICE_HOME=@OFFICE_HOME@
-OFFICE_BASE_HOME=@OFFICE_BASE_HOME@
+OFFICE_HOME='@OFFICE_HOME@'
+OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
 
 # URE installation directory.
 # Example: OO_SDK_URE_HOME=/opt/openoffice.org/ure
-OO_SDK_URE_HOME=@OO_SDK_URE_HOME@
+OO_SDK_URE_HOME='@OO_SDK_URE_HOME@'
 export OO_SDK_URE_HOME
 
 # Directory of the make command.

odk/settings/settings.mk

@@ -443,12 +443,12 @@ SALHELPERLIB=-luno_salhelper$(COMID)
 REGLIB=-lreg
 STORELIB=-lstore
 
-SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_sal.dylib
-CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_cppu.dylib
-CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib
-SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_salhelper$(COMID).dylib
-REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:$(OO_SDK_URE_LIB_DIR)/libreg.dylib
-STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:$(OO_SDK_URE_LIB_DIR)/libstore.dylib
+SALDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_sal.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_sal.dylib'
+CPPUDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppu.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_cppu.dylib'
+CPPUHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_cppuhelper'$(COMID).dylib.3:$(OO_SDK_URE_LIB_DIR)/libuno_cppuhelper$(COMID).dylib'
+SALHELPERDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3:'$(OO_SDK_URE_LIB_DIR)/libuno_salhelper$(COMID).dylib'
+REGDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libreg.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libreg.dylib'
+STOREDYLIB=-Wl,-dylib_file,@__________________________________________________URELIB/libstore.dylib.3:'$(OO_SDK_URE_LIB_DIR)/libstore.dylib'
 
 INSTALL_NAME_URELIBS=install_name_tool -change @__________________________________________________URELIB/libuno_sal.dylib.3 @executable_path/urelibs/libuno_sal.dylib.3 -change  @__________________________________________________URELIB/libuno_cppu.dylib.3 @executable_path/urelibs/libuno_cppu.dylib.3 -change @__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3 @executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change @__________________________________________________URELIB/libreg.dylib.3 @executable_path/urelibs/libreg.dylib.3 -change @__________________________________________________URELIB/libstore.dylib.3 @executable_path/urelibs/libstore.dylib.3