CWS changehid: resync to m84

author: Mathias Bauer <mba@openoffice.org> 2010-07-13 14:38:37 +0200
committer: Mathias Bauer <mba@openoffice.org> 2010-07-13 14:38:37 +0200
commit: e28ab69d967f34d29bd3f29571812aea9e2ab12b (patch)
tree: aa92225497b25002ad383a67db079679341e9296 /odk
parent: 7ce3cfb11f2d4c0f6e8f41a4e3a37b984d71f883 (diff)
parent: 3839427b7c198238aa31b5958b3b4744c630d42a (diff)
16 files changed, 127 insertions, 88 deletions
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 1cc7836d7414..0dc23d22aa25 100644
--- a/odk/cfgWin.js
+++ b/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" +
diff --git a/odk/configure.pl b/odk/configure.pl
index 968ebc589640..789cfac7cd76 100644
--- a/odk/configure.pl
+++ b/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";
diff --git a/odk/docs/images/sdk_head-1.png b/odk/docs/images/sdk_head-1.png
index 1c13f7e7f072..56094aabab52 100644
--- a/odk/docs/images/sdk_head-1.png
+++ b/odk/docs/images/sdk_head-1.png
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 21611d2abdf7..baf9b5f1259f 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>OpenOffice.org 3.2 SDK - Installation Guide</title>
+  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Installation Guide</title>
   <link rel="stylesheet" type="text/css" href="sdk_styles.css">
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="author" content="J&uuml;rgen Schmidt">
@@ -36,16 +36,16 @@
           <table class="table3">
 		  <tr> 
 		  <td colspan="2">
-		  <p>The OpenOffice.org 3.2 SDK comes with a set of development tools, base 
+		  <p>The OpenOffice.org %PRODUCT_RELEASE% SDK comes with a set of development tools, base 
 		  libraries, header files and helper class files that can be used to 
-		  develop Java/C++ components, to embed the OpenOffice.org 3.2 application in 
+		  develop Java/C++ components, to embed the OpenOffice.org %PRODUCT_RELEASE% application in 
           your own programs, or to use the API (scripting or remote control the 
 		  office). For a complete working environment, we have some additional 
 		  requirements:</p>
 		  </td>
 		  </tr> 
 		  <tr valign="top"> 
-          <td><b>OpenOffice.org 3.2 installation</td>
+          <td><b>OpenOffice.org %PRODUCT_RELEASE% installation</td>
           <td class="content80">The SDK works on top of an existing office 
 		  installation and uses the same libraries as the office installation.</td>
           </tr>
@@ -218,7 +218,7 @@
 		  the output is generated in the SDK directory itself. If an output 
 		  directory is specified, the output is generated in a SDK dependent 
 		  subdirectory in this directory (e.g. &lt;OO_SDK_OUTPUT_DIR&gt;
-		  /OpenOffice.org 3.2/LINUXExample.out)</td>
+		  /OpenOffice.org %PRODUCT_RELEASE%/LINUXExample.out)</td>
 		  </tr>
 		  <tr>
 		  <td class="cell20"><b>SDK_AUTO_DEPLOYMENT</b></td>
diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html
index 446e83200762..02a497c59a3d 100644
--- a/odk/docs/notsupported.html
+++ b/odk/docs/notsupported.html
@@ -1,4 +1,4 @@
-<html><head>  <title>OpenOffice.org 3.2 SDK - Not supported page</title>  <link rel="stylesheet" type="text/css" href="sdk_styles.css">  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">  <meta name="author" content="J&uuml;rgen Schmidt">  <meta name="created" content="2004-12-14"></head><body class="sdkbody"><table class="table1" cellpadding=0>  <tr style="background-image:url(images/sdk_head-2.gif); backgorund-position: bottom; ">     <td colspan="2" align="left"><img src="images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td>    <td align=right><img src="images/sdk_head-3.gif" width="32" height="109"></td>  </tr>  <tr>     <td colspan="3"><img  class="nothing10" src="images/nada.gif"></td>  </tr>  <tr>     <td colspan="3">       <table class="table2">        <tr> 		  <td>		    <p align="center"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></p>          </td>        </tr>        <tr>           <td><img class="nothing8" src="images/nada.gif"></td>        </tr>        <tr> 		  <td>		    <p class="note">This page is currently not supported!</p>          </td>        </tr>      </table>    </td>  </tr>  <tr>     <td colspan="3"><img class="nothing30" src="images/nada.gif"></td>  </tr>  <tr>     <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>  </tr>  <tr>     <td colspan="3">         <div class="centertext">
+<html><head>  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Not supported page</title>  <link rel="stylesheet" type="text/css" href="sdk_styles.css">  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">  <meta name="author" content="J&uuml;rgen Schmidt">  <meta name="created" content="2004-12-14"></head><body class="sdkbody"><table class="table1" cellpadding=0>  <tr style="background-image:url(images/sdk_head-2.gif); backgorund-position: bottom; ">     <td colspan="2" align="left"><img src="images/sdk_head-1.gif" width="335" height="109" usemap="#Map" border="0"></td>    <td align=right><img src="images/sdk_head-3.gif" width="32" height="109"></td>  </tr>  <tr>     <td colspan="3"><img  class="nothing10" src="images/nada.gif"></td>  </tr>  <tr>     <td colspan="3">       <table class="table2">        <tr> 		  <td>		    <p align="center"><a href="../index.html" title="link to the SDK start page"><img class="navigate" src="images/nav_home.png"></a></p>          </td>        </tr>        <tr>           <td><img class="nothing8" src="images/nada.gif"></td>        </tr>        <tr> 		  <td>		    <p class="note">This page is currently not supported!</p>          </td>        </tr>      </table>    </td>  </tr>  <tr>     <td colspan="3"><img class="nothing30" src="images/nada.gif"></td>  </tr>  <tr>     <td colspan="3"><img class="line" src="images/sdk_line-1.gif"></td>  </tr>  <tr>     <td colspan="3">         <div class="centertext">
 	<p><img class="oraclelogo" src="images/odk-footer-logo.gif" title="Sponsored by Oracle" alt="Oracle Logo" />
             Copyright &copy; 2010, Oracle and/or its affiliates. All rights reserved. Oracle and Java are registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.<p>
       </div> </td>  </tr></table><map name="Map">  <area shape="rect" coords="10,68,93,105" href="http://www.sun.com"></map></body></html>
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 8b9d604e7143..6ff9060f26f1 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>OpenOffice.org 3.2 SDK SDK - Development Tools</title>
+  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Development Tools</title>
   <link rel="stylesheet" type="text/css" href="sdk_styles.css">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <meta name="author" content="J&uuml;rgen Schmidt">
@@ -145,7 +145,7 @@
 		  office installation. UNO packages are UNO components (single libraries or 
 		  Jar files or more complex zip files that contains one or more libraries|
 		  Jar files, type libraries and configuration items), scripts  and 
-		  OpenOffice.org 3.2 Basic libraries as zip package. 'unopkg' is not part of the 
+		  OpenOffice.org %PRODUCT_RELEASE% Basic libraries as zip package. 'unopkg' is not part of the 
 		  SDK but comes with the office directly and is a development tool as well 
 		  as an end user tool to deploy extension into an office installation.</p>
 		  <p>More details concerning deployment and this tool can be find in the 
diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html
index 1a48788f0991..4beca94f9828 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>OpenOffice.org 3.2 SDK - Developer's Guide Examples</title>
+  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Developer's Guide Examples</title>
   <link rel="stylesheet" type="text/css"
  href="../../docs/sdk_styles.css">
   <meta http-equiv="Content-Type"
@@ -134,7 +134,7 @@ Presentation Documents</a></td>
                   <td class="content3"><img
  src="../../docs/images/arrow-1.gif"></td>
                   <td><a href="#BasicandDialogs"
- title="link to the Basic And Dialogs examples">OpenOffice.org 3.2 Basic and
+ title="link to the Basic And Dialogs examples">OpenOffice.org %PRODUCT_RELEASE% Basic and
 Dialogs</a></td>
                 </tr>
                 <tr valign="top">
@@ -233,7 +233,7 @@ examples</a></td>
  href="./FirstSteps/FirstUnoContact.java"
  title="link to FirstSteps/FirstUnoContact.java">FirstUnoContact</a></td>
                   <td class="cell80">Shows how to initialize UNO and
-get a remote office service manager from a running OpenOffice.org 3.2 in a
+get a remote office service manager from a running OpenOffice.org %PRODUCT_RELEASE% in a
 different process space.</td>
                 </tr>
                 <tr>
@@ -242,7 +242,7 @@ different process space.</td>
  href="./FirstSteps/FirstLoadComponent.java"
  title="link to FirstSteps/FirstLoadComponent.java">FirstLoadComponent</a></td>
                   <td class="cell80">Demonstrates how to load a
-component into OpenOffice.org 3.2 by a Java application.</td>
+component into OpenOffice.org %PRODUCT_RELEASE% by a Java application.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -333,7 +333,7 @@ mechanism in C++.</td>
  href="./ProfUNO/InterprocessConn/ConnectionAwareClient.java"
  title="link to ProfUNO/InterprocessConn/ConnectionAwareClient/.java">ConnectionAwareClient</a></td>
                   <td class="cell80">Implements a client which is aware
-of losing connection to OpenOffice.org 3.2.</td>
+of losing connection to OpenOffice.org %PRODUCT_RELEASE%.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -341,7 +341,7 @@ of losing connection to OpenOffice.org 3.2.</td>
  href="./ProfUNO/InterprocessConn/UrlResolver.java"
  title="link to ProfUNO/InterProcessConn/UrlResolver.java">UrlResolver</a></td>
                   <td class="cell80">Builds a connection to
-OpenOffice.org 3.2 using the URL given on the command line. This example
+OpenOffice.org %PRODUCT_RELEASE% using the URL given on the command line. This example
 shows the usage of <a
  href="../../docs/common/ref/com/sun/star/bridge/XUnoUrlResolver.html"
  title="link to the reference documentation of com.sun.star.bridge.XUnoResolver"><code>XUnoUrlResolver</code></a>.</td>
@@ -364,7 +364,7 @@ shows the usage of <a
  href="./ProfUNO/CppBinding/office_connect.cxx"
  title="link to ProfUNO/CppBinding/office_connect.java">office_connect.cxx</a></td>
                   <td class="cell80">Builds a connection to
-OpenOffice.org 3.2 using C++.</td>
+OpenOffice.org %PRODUCT_RELEASE% using C++.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -725,7 +725,7 @@ for the image shrink component and instantiates it.</td>
  href="./Components/DialogComponent/DialogComponent.java"
  title="link to Components/DialogComponent/DialogComponent.java">DialogComponent.java</a></td>
                   <td class="cell80">Implements a component accessing a dialog created
-                  with the OpenOffice.org 3.2 Basic IDE. The component provides methods that
+                  with the OpenOffice.org %PRODUCT_RELEASE% Basic IDE. The component provides methods that
                   can be bound to dialog respectively control events	.</td>
                 </tr>
                 <tr>
@@ -942,7 +942,7 @@ document component.</td>
                   <td class="cell80">This is the main part of a demo
 application based on the framework APIs. It mainly shows the mechanisms
 to load, store and convert documents, as well as dispatch and dispatch
-interception. It integrates windows from OpenOffice.org 3.2 via system
+interception. It integrates windows from OpenOffice.org %PRODUCT_RELEASE% via system
 window handle. This is the same mechanism as used by the OOoBean, but
 the OOoBean itself is not used here, just the JNI window handle access.</td>
                 </tr>
@@ -958,7 +958,7 @@ and it's actions.</td>
  href="./OfficeDev/DesktopEnvironment/FunctionHelper.java"
  title="link to OfficeDev/DesktopEnvironment/FunctionHelper.java">FunctionHelper</a></td>
                   <td class="cell80">This helper comprises all
-OpenOffice.org 3.2 API calls. Thus it is possible to learn about these
+OpenOffice.org %PRODUCT_RELEASE% API calls. Thus it is possible to learn about these
 aspects separately from the rest of the application example.</td>
                 </tr>
                 <tr>
@@ -973,7 +973,7 @@ asynchronous events from UNO oneway calls.</td>
  href="./OfficeDev/DesktopEnvironment/IShutdownListener.java"
  title="link to OfficeDev/DesktopEnvironment/IShutdownListener.java">IShutdownListener</a></td>
                   <td class="cell80">This is a listener interface to
-clean up on shutdown of OpenOffice.org 3.2.</td>
+clean up on shutdown of OpenOffice.org %PRODUCT_RELEASE%.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><a
@@ -1004,7 +1004,7 @@ get the window handle of the Java window.</td>
  href="./OfficeDev/DesktopEnvironment/OfficeConnect.java"
  title=" link to OfficeDev/DesktopEnvironment/OfficeConnect.java">OfficeConnect</a></td>
                   <td class="cell80">Builds the remote bridge to
-OpenOffice.org 3.2 and exports its UNO service manager for the Java side of
+OpenOffice.org %PRODUCT_RELEASE% and exports its UNO service manager for the Java side of
 the application.</td>
                 </tr>
                 <tr>
@@ -1035,7 +1035,7 @@ the application is registered as an event listener.</td>
  href="./OfficeDev/DesktopEnvironment/ViewContainer.java"
  title="link to OfficeDev/DesktopEnvironment/ViewContainer.java">ViewContainer</a></td>
                   <td class="cell80">Performs a clean up on the Java
-side on OpenOffice.org 3.2 shutdown.</td>
+side on OpenOffice.org %PRODUCT_RELEASE% shutdown.</td>
                 </tr>
               </tbody>
             </table>
@@ -1054,7 +1054,7 @@ side on OpenOffice.org 3.2 shutdown.</td>
  href="./OfficeDev/OfficeConnect.java"
  title="link to OfficeDev/OfficeConnect.java">OfficeConnect</a></td>
                   <td class="cell80">Builds the remote bridge to
-OpenOffice.org 3.2 and exports its UNO service manager to the Java side.</td>
+OpenOffice.org %PRODUCT_RELEASE% and exports its UNO service manager to the Java side.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -1110,7 +1110,7 @@ TerminateListener and shows the use of them in a running program.</td>
  href="../../docs/common/ref/com/sun/star/frame/XTerminateListener.html"
  title="link to the reference documentation of com.sun.star.frame.XTerminationListener">
                   <code>XTerminateListener</code></a>. It is called
-when OpenOffice.org 3.2 terminates.</td>
+when OpenOffice.org %PRODUCT_RELEASE% terminates.</td>
                 </tr>
               </tbody>
             </table>
@@ -1176,7 +1176,7 @@ of formats.</td>
  href="./OfficeDev/Linguistic/LinguisticExamples.java"
  title="link to OfficeDev/Linguistic/LinguisticExamples.java">LinguisticExamples</a></td>
                   <td class="cell80">A short example that uses most of
-the functionality from the OpenOffice.org 3.2 linguistic API.</td>
+the functionality from the OpenOffice.org %PRODUCT_RELEASE% linguistic API.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><a
@@ -1657,7 +1657,7 @@ URLs.</td>
                   <td class="cell20"><a href="./Drawing/Helper.java"
  title="link to Drawing/Helper.java">Helper</a></td>
                   <td class="cell80">Contains a helper class for the
-other examples to connect to OpenOffice.org 3.2 and open or create a drawing
+other examples to connect to OpenOffice.org %PRODUCT_RELEASE% and open or create a drawing
 document.</td>
                 </tr>
                 <tr>
@@ -1808,7 +1808,7 @@ is not implemented. To be more precise.</td>
                   <td class="cell20"><a href="./Charts/Helper.java"
  title="link to Charts/Helper.java">Helper</a></td>
                   <td class="cell80">Shows how to connect to
-OpenOffice.org 3.2 and create text, drawing or spreadsheet document. This
+OpenOffice.org %PRODUCT_RELEASE% and create text, drawing or spreadsheet document. This
 class is used as a helper class for the other examples.</td>
                 </tr>
                 <tr>
@@ -1863,7 +1863,7 @@ changes.</td>
               <tbody>
                 <tr>
                   <td colspan="2" class="head1"><a
- name="BasicandDialogs">OpenOffice.org 3.2 Basic and Dialogs examples</a></td>
+ name="BasicandDialogs">OpenOffice.org %PRODUCT_RELEASE% Basic and Dialogs examples</a></td>
                   <td align="right"> <a href="#examples"
  title="link to the Developer's Guide examples overview"><img
  class="navigate" src="../../docs/images/nav_up.png"></a> <a
@@ -1985,7 +1985,7 @@ the example. </td>
  href="./Database/CodeSamples.java"
  title="link to Database/CodeSamples.java">CodeSamples</a></td>
                   <td class="cell80">Creates the connection to
-OpenOffice.org 3.2 and executes the code SalesMan samples for database API.</td>
+OpenOffice.org %PRODUCT_RELEASE% and executes the code SalesMan samples for database API.</td>
                 </tr>
                 <tr>
                   <td class="cell20"><img
@@ -2668,7 +2668,7 @@ Management examples</a></td>
  href="./Config/ConfigExamples.java"
  title="link to Config/ConfigExamples.java">ConfigExamples</a></td>
                   <td class="cell80">This example connects to a
-OpenOffice.org 3.2, gets the configuration manager and accesses the
+OpenOffice.org %PRODUCT_RELEASE%, gets the configuration manager and accesses the
 configuration in various ways.</td>
                 </tr>
               </tbody>
diff --git a/odk/examples/examples.html b/odk/examples/examples.html
index 12758ea3100d..ed6669582cb6 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>OpenOffice.org 3.2 SDK - Examples</title>
+  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Examples</title>
   <link rel="stylesheet" type="text/css" href="../docs/sdk_styles.css">
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="author" content="J&uuml;rgen Schmidt">
@@ -38,10 +38,10 @@
 		  <tr> 
           <td colspan="3"> 
             <p>The SDK provides a rich set of examples in different programming 
-			languages (Java, C++, OpenOffice.org 3.2 Basic, OLE) to illustrate the use 
+			languages (Java, C++, OpenOffice.org %PRODUCT_RELEASE% Basic, OLE) to illustrate the use 
 			of the API and demonstrate how to benefit from the included word 
 			processor, spreadsheet, presentation software, graphics program and 
-			database of OpenOffice.org 3.2.<br>
+			database of OpenOffice.org %PRODUCT_RELEASE%.<br>
             Some fo the examples need a running office instance listening on a 
 			port. If this is necessary you will get further information in the 
 			makefiles.</p>
@@ -83,9 +83,9 @@
             </tr>
             <tr valign="top">
               <td class="content3"><img src="../docs/images/arrow-1.gif"></td>
-              <td><a href="#Basic_examples" title="link to the OpenOffice.org 3.2 Basic examples section">OpenOffice.org 3.2 Basic examples</a></td>
+              <td><a href="#Basic_examples" title="link to the OpenOffice.org %PRODUCT_RELEASE% Basic examples section">OpenOffice.org %PRODUCT_RELEASE% Basic examples</a></td>
               <td class="content75">Small set of examples which shows the use of 
-			  the API from OpenOffice.org 3.2 Basic.</td>
+			  the API from OpenOffice.org %PRODUCT_RELEASE% Basic.</td>
             </tr>
             <tr valign="top">
               <td class="content3"><img src="../docs/images/arrow-1.gif"></td>
@@ -214,7 +214,7 @@
 		  </tr>		  
 		  <tr>
 		  <td class="cell20"><a href="java/Spreadsheet/" title="link to the source directory of the Java Spreadsheet examples">ChartTypeChange</a></td>
-		  <td class="cell80">This class loads an OpenOffice.org 3.2 Calc document and 
+		  <td class="cell80">This class loads an OpenOffice.org %PRODUCT_RELEASE% Calc document and 
 		  changes the type of the embedded chart.</td>
 		  </tr>		  
 		  <tr>
@@ -298,7 +298,7 @@
 		  <td class="cell20"><a href="http://wiki.services.openoffice.org/wiki/Object_Inspector" title="link to the Object Inspector project page in the wiki">Object Inspector</a></td>
 		  <td class="cell80">The Object Inspector is primarily an auxiliary tool 
 		  for the developer, which can present information about an object of the 
-		  OpenOffice.org 3.2 API at run-time. Depending on the object to be inspected, 
+		  OpenOffice.org %PRODUCT_RELEASE% API at run-time. Depending on the object to be inspected, 
 		  appropriate methods, interfaces, services, and attributes can be displayed
 		  to the developer. The methods, interfaces, services and attributes are 
 		  represented in a predictable tree. If the attributes contained in an 
@@ -460,7 +460,7 @@
           <td> 
           <table class="table3">
 		  <tr> 
-			<td colspan="2" class="head1"><a name="Basic_examples">OpenOffice.org 3.2 Basic examples</td>
+			<td colspan="2" class="head1"><a name="Basic_examples">OpenOffice.org %PRODUCT_RELEASE% Basic examples</td>
 			<td align="right">
 		      <a href="#examples" title="link to the examples overview"><img class="navigate" src="../docs/images/nav_up.png"></a>
 		      <a href="../index.html" title="link to the SDK start page"><img class="navigate" src="../docs/images/nav_home.png"></a>
@@ -468,8 +468,8 @@
 		  </tr> 
 		  <tr> 
 		  <td  colspan="3">
-		  <p>The example programs are embedded in OpenOffice.org 3.2 documents in the 
-		  samples directory. To view or edit the OpenOffice.org 3.2 Basic source, 
+		  <p>The example programs are embedded in OpenOffice.org %PRODUCT_RELEASE% documents in the 
+		  samples directory. To view or edit the OpenOffice.org %PRODUCT_RELEASE% Basic source, 
 		  select the appropriate document and then select Tools-&gt;Macro.</p>
 		  <p>Most of the examples are stand-alone, but two of them (Creating an 
 		  Index and Import/Export of ASCII Files) have an associated data file 
@@ -491,7 +491,7 @@
 		  <td class="cell80">Description</td>
 		  </tr>
 		  <tr>
-		  <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/modifying_text_automatically examples">Changing Appearance</a></td>
+		  <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic text/modifying_text_automatically examples">Changing Appearance</a></td>
 		  <td class="cell80"> To change the style used for certain words, you can 
 		  start with the following example. This code searches for the regular 
 		  expression <code>the[a-z]</code>, which stands for the text portion the 
@@ -502,7 +502,7 @@
 		  must execute it from an open text document.</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/modifying_text_automatically examples">Replacing Text</a></td>
+		  <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic text/modifying_text_automatically examples">Replacing Text</a></td>
 		  <td class="cell80">If you regularly receive documents from other people 
 		  for editing, you might want to make sure that certain words are always 
 		  written the same. The next example illustrates this by forcing certain 
@@ -512,7 +512,7 @@
 		  words from an external file.</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/modifying_text_automatically examples">Using Regular Expressions</a></td>
+		  <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic text/modifying_text_automatically examples">Using Regular Expressions</a></td>
 		  <td class="cell80">Another application of automatic text modification is 
 		  related to stylistic questions. Suppose your company&#146;s policy is to 
 		  avoid the use of certain words. You want to replace these words, but you 
@@ -529,7 +529,7 @@
 		  (plural, adjective etc.).</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/modifying_text_automatically examples">Inserting Bookmarks</a></td>
+		  <td class="cell20"><a href="basic/text/modifying_text_automatically/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic text/modifying_text_automatically examples">Inserting Bookmarks</a></td>
 		  <td class="cell80">
 		  <p>The next example does something very similar. This time, however, we 
 		  do not change the color of the words but insert a bookmark at each of 
@@ -544,14 +544,14 @@
 		  word.</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="basic/text/creating_an_index/" title="link to the source directory of the OpenOffice.org 3.2 Basic text/create_index example">Creating an Index</a></td>
+		  <td class="cell20"><a href="basic/text/creating_an_index/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic text/create_index example">Creating an Index</a></td>
 		  <td class="cell80">Indices for text documents can be created manually in 
-		  OpenOffice.org 3.2 Writer by clicking on the words that should appear in the 
+		  OpenOffice.org %PRODUCT_RELEASE% Writer by clicking on the words that should appear in the 
 		  index. If the document is large, or if you have to generate indices for 
 		  several documents, this task should be automated.</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="basic/sheet/" title="link to the source directory of the OpenOffice.org 3.2 Basic sheet example">Adapting to Euroland</a></td>
+		  <td class="cell20"><a href="basic/sheet/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic sheet example">Adapting to Euroland</a></td>
 		  <td class="cell80">Most of the members of the European Union will abandon 
 		  their old currency in favor of the new Euro in 2001. This requires 
 		  modifications to all programs using the old currencies. Since the exchange
@@ -560,14 +560,14 @@
 		  in a table that are formatted with the currency string DM.</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="basic/drawing/" title="link to the source directory of the OpenOffice.org 3.2 Basic drawing example">Import/Export of ASCII Files</a></td>
+		  <td class="cell20"><a href="basic/drawing/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic drawing example">Import/Export of ASCII Files</a></td>
 		  <td class="cell80">You can use the drawing facilities of StarOffice API 
 		  to generate a picture from ASCII input. One application would be a 
 		  hierarchical representation of a directory listing, based on textual 
 		  data.</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="basic/stock_quotes_updater/" title="link to the source directory of the OpenOffice.org 3.2 Basic stock_quotes_updater example">Stock Quotes Updater</a></td>
+		  <td class="cell20"><a href="basic/stock_quotes_updater/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic stock_quotes_updater example">Stock Quotes Updater</a></td>
 		  <td class="cell80">If you want to display stock charts for certain 
 		  companies, you can open up your browser every day, go to a search engine, 
 		  look up the quote and copy it by hand into a table. Or you can use a 
@@ -579,7 +579,7 @@
 		  <code>UpdateValue()</code>, and <code>UpdateChart()</code>.</td>
 		  </tr>		  
 		  <tr>
-		  <td class="cell20"><a href="basic/forms_and_controls/" title="link to the source directory of the OpenOffice.org 3.2 Basic forms_and_controls example">Forms and Controls</a></td>
+		  <td class="cell20"><a href="basic/forms_and_controls/" title="link to the source directory of the OpenOffice.org %PRODUCT_RELEASE% Basic forms_and_controls example">Forms and Controls</a></td>
 		  <td class="cell80">The example document Burger Factory offers some forms 
 		  and controls, which you can use to order your desired burger type, 
 		  beverage, topping, and sauce. By hitting the button 
@@ -594,7 +594,7 @@
           <table class="table3">
 		  <tr> 
 		  <td  colspan="3">
-		  Additional information: <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/OpenOffice.org_Basic" title="link to the &quot;OpenOffice.org 3.2 Basic language binding&quot; chapter in the Developer's Guide">OpenOffice.org 3.2 Basic language binding</a>
+		  Additional information: <a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/ProUNO/Basic/OpenOffice.org_Basic" title="link to the &quot;OpenOffice.org %PRODUCT_RELEASE% Basic language binding&quot; chapter in the Developer's Guide">OpenOffice.org %PRODUCT_RELEASE% Basic language binding</a>
 		  </td> 
 		  </tr> 
 		  </table>
diff --git a/odk/index.html b/odk/index.html
index f926fdc0d7b5..6490e2354218 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-  <title>OpenOffice.org 3.2 SDK - SDK</title>
+  <title>OpenOffice.org %PRODUCT_RELEASE% SDK - Overview</title>
   <link rel="stylesheet" type="text/css" href="docs/sdk_styles.css">
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta name="author" content="J&uuml;rgen Schmidt">
@@ -21,12 +21,12 @@
         <tr> 
           <td><img class="nothing8" src="docs/images/nada.gif"></td>
           <td> 
-            <p>OpenOffice.org 3.2 software is a complete, feature-rich
+            <p>OpenOffice.org %PRODUCT_RELEASE% software is a complete, feature-rich
               office productivity suite that provides, in combination with this 
 			  SDK, all the essential tools for building and deploying custom 
-			  solutions that build on, or integrate with, the OpenOffice.org 3.2 suite 
+			  solutions that build on, or integrate with, the OpenOffice.org %PRODUCT_RELEASE% suite 
 			  of products.</p>
-            <p>The SDK is a development kit for OpenOffice.org 3.2, which 
+            <p>The SDK is a development kit for OpenOffice.org %PRODUCT_RELEASE%, which 
 			  eases the development of office components. It provides a set of 
 			  libraries, binaries, header, and IDL files which have final API's 
 			  and can only be extended with new functionality. This set of libraries
@@ -41,8 +41,8 @@
 			  with new functions.</p>
             <p>The SDK provides the basic building blocks for external developers 
 			  to develop components in any language for which a binding exists. 
-			  Currently, there are language bindings for OpenOffice.org 3.2 Basic, Java, 
-			  and different C++ compilers on different platforms, for OpenOffice.org 3.2,
+			  Currently, there are language bindings for OpenOffice.org %PRODUCT_RELEASE% Basic, Java, 
+			  and different C++ compilers on different platforms, for OpenOffice.org %PRODUCT_RELEASE%,
 			  thus covering the two most commonly used programming languages. There 
 			  will be no limit for office automation in heterogeneous environments.
 			  Currently supported platforms of the SDK are Linux, Solaris (sparc, 
@@ -83,7 +83,7 @@
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
                 <td colspan="2"><a href="http://wiki.services.openoffice.org/wiki/Documentation/DevGuide/OpenOffice.org_Developers_Guide" title="link to the Developer's Guide in the Wiki">Developer's Guide</a></td>
-                <td class="content70">Detailed documentation, explaining the OpenOffice.org 3.2 
+                <td class="content70">Detailed documentation, explaining the OpenOffice.org %PRODUCT_RELEASE% 
 				API and the concepts behind it, with a rich set of examples, 
 				implemented mainly in Java. This documentation is online in the 
 				OpenOffice.org Wiki.</td>
@@ -91,7 +91,7 @@
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
                 <td colspan="2"><a href="docs/common/ref/com/sun/star/module-ix.html" title="link to the IDL reference documentation">IDL Reference</a></td>
-                <td class="content70">Complete OpenOffice.org 3.2 API reference.</td>
+                <td class="content70">Complete OpenOffice.org %PRODUCT_RELEASE% API reference.</td>
               </tr>
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
@@ -132,7 +132,7 @@
 				Office Applications (OpenDocument) Technical Committee where you 
 				can find the latest information about the OASIS Open Document XML 
 				file format which is the default document format 
-				for OpenOffice.org 3.2.</td>
+				for OpenOffice.org %PRODUCT_RELEASE%.</td>
               </tr>
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
@@ -147,7 +147,7 @@
               <tr valign="top"> 
                 <td class="content4"><img src="docs/images/arrow-1.gif"></td>
                 <td colspan="2"><a href="share/readme/LICENSE_en-US.html" title="link to the SDK license file">License</a></td>
-                <td class="content70">The license for the OpenOffice.org 3.2 SDK.</td>
+                <td class="content70">The license for the OpenOffice.org %PRODUCT_RELEASE% SDK.</td>
               </tr>
               <tr valign="middle"> 
                 <td><img class="nothing10" src="docs/images/nada.gif"></td>
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index b8a7b9a6cd48..52efe87ff797 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -241,7 +241,7 @@ $(DESTDIRSETTINGS)/dk.mk : dk.mk
     tr -d "\015" < dk.mk | sed -e 's/@@RELEASE@@/$(PRODUCT_RELEASE)/' -e 's/@@BUILDID@@/$(RSCREVISION)/'> $@
 
 $(CONVERTTAGFLAG) : $(DOCUHTMLFILES)
-    $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)
+#    $(PERL) $(CONVERTTAGSCRIPT) 1 "$(TITLE)" "$(OFFICEPRODUCTNAME)" $(DOCUHTMLFILES)
     @echo "tags converted" > $@
 
 $(IDL_DOCU_CLEANUP_FLAG) : $(IDL_CHAPTER_REFS) $(PRJ)/docs/common/ref/idl.css $(DESTIDLLIST)
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index 82a39e38aba4..ef513d4ef515 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/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
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 0f6ef22519cd..96365481c104 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/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.
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 3f84612e48c3..188ff880255e 100644
--- a/odk/settings/settings.mk
+++ b/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
 
@@ -498,13 +498,37 @@ ifneq (,$(findstring freebsd,$(PLATFORM)))
 
 PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1)
 
-# Default is freebsd on a intel machine    
+ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
+PLATFORM=kfreebsd
+ifeq "$(PROCTYPE)" "x86_64"
+PACKAGE_LIB_DIR=kfreebsd_x86_64.plt
+UNOPKG_PLATFORM=kFreeBSD_x86_64
+else
+PACKAGE_LIB_DIR=kfreebsd_x86.plt
+UNOPKG_PLATFORM=kFreeBSD_x86
+endif
+else
 PLATFORM=freebsd
+ifeq "$(PROCTYPE)" "x86_64"
+PACKAGE_LIB_DIR=freebsd_x86_64.plt
+UNOPKG_PLATFORM=FreeBSD_x86_64
+else
 PACKAGE_LIB_DIR=freebsd_x86.plt
 UNOPKG_PLATFORM=FreeBSD_x86
+endif
+endif
+
+ifeq "$(PROCTYPE)" "x86_64"
+JAVA_PROC_TYPE=amd64
+else
 JAVA_PROC_TYPE=i386
+endif
 
+ifeq (kfreebsd,$(findstring kfreebsd,$(PLATFORM)))
+OS=LINUX
+else
 OS=FREEBSD
+endif
 PS=/
 ICL=\$$
 CC=gcc
@@ -520,13 +544,8 @@ SHAREDLIB_OUT=$(OUT_LIB)
 
 GCC_VERSION=$(shell $(CC) -dumpversion)
 
-ifeq "$(shell echo $(GCC_VERSION) | cut -c 1)" "3"
 COMID=gcc3
 CPPU_ENV=gcc3
-else
-COMID=GCC
-CPPU_ENV=gcc2
-endif
 
 OSEP=\<
 CSEP=\>
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 26e5c2319030..6deb065f9dc1 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -32,8 +32,16 @@ OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
 
 OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
 
+JAVA_OPTIONS=
+ifneq "$(OO_SDK_JAVA_HOME)" ""
+JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
+ifeq "$(JAVA_BITS)" "64-Bit"
+JAVA_OPTIONS=-d32
+endif
+endif
+
 DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
-SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java"
+SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
 SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
 SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
 SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
diff --git a/odk/source/unowinreg/win/makefile.mk b/odk/source/unowinreg/win/makefile.mk
index eab0826a433c..077d8aa60aac 100644
--- a/odk/source/unowinreg/win/makefile.mk
+++ b/odk/source/unowinreg/win/makefile.mk
@@ -42,7 +42,6 @@ USE_DEFFILE=TRUE
 JAVA_INCLUDES:= -I$(JAVA_HOME)/include
 
 # values taken from set_soenv.in
-.IF "$(JDK)" != "gcj"
 .IF "$(OS)" == "LINUX"
 JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
 .ELIF "$(OS)" == "FREEBSD"
@@ -52,7 +51,6 @@ JAVA_INCLUDES+= -I$(JAVA_HOME)/include/linux
 .ELIF "$(OS)" == "NETBSD"
 JAVA_INCLUDES+= -I$(JAVA_HOME)/include/netbsd
 .ENDIF
-.ENDIF
 
 .IF "$(SOLAR_JAVA)"==""
 nojava:
diff --git a/odk/util/odk_rules.pmk b/odk/util/odk_rules.pmk
index 6c2fa72600a1..bb62664053f1 100644
--- a/odk/util/odk_rules.pmk
+++ b/odk/util/odk_rules.pmk
@@ -28,15 +28,15 @@
 
 $(DESTDIRDOCU)/%.html : $(PRJ)/docs/%.html
     @@-rm -f $@
-    $(MY_TEXTCOPY) $< $@
+    tr -d "\015" < $< |  sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
 
 $(DESTDIREXAMPLES)/%.html : $(PRJ)/examples/%.html
     @@-rm -f $@
-    $(MY_TEXTCOPY) $< $@
+    tr -d "\015" < $< |  sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
 
 $(DESTDIR)/index.html : $(PRJ)/index.html
     @@-rm -f $@
-    $(MY_TEXTCOPY) $< $@
+    tr -d "\015" < $< |  sed -e 's/%PRODUCT_RELEASE%/$(PRODUCT_RELEASE)/g' > $@
 
 $(DESTDIRDOCU)/%.css : $(PRJ)/docs/%.css
     @@-rm -f $@
author	Mathias Bauer <mba@openoffice.org>	2010-07-13 14:38:37 +0200
committer	Mathias Bauer <mba@openoffice.org>	2010-07-13 14:38:37 +0200
commit	e28ab69d967f34d29bd3f29571812aea9e2ab12b (patch)
tree	aa92225497b25002ad383a67db079679341e9296 /odk
parent	7ce3cfb11f2d4c0f6e8f41a4e3a37b984d71f883 (diff)
parent	3839427b7c198238aa31b5958b3b4744c630d42a (diff)