[ooo-build-commit] Branch 'ooo/master' - odk/cfgWin.js odk/configure.pl odk/docs odk/examples odk/index.html odk/pack odk/setsdkenv_unix odk/setsdkenv_unix.csh.in odk/setsdkenv_unix.sh.in odk/util

Jan Holesovsky kendy at kemper.freedesktop.org
Thu Aug 6 19:42:33 PDT 2009


 odk/cfgWin.js                              |   46 +++++------------------------
 odk/configure.pl                           |   43 ++++++++++++++++++++-------
 odk/docs/images/sdk_head-1.gif             |binary
 odk/docs/install.html                      |    4 +-
 odk/docs/notsupported.html                 |    2 -
 odk/docs/tools.html                        |    2 -
 odk/examples/DevelopersGuide/examples.html |    2 -
 odk/examples/examples.html                 |    2 -
 odk/index.html                             |    2 -
 odk/pack/copying/makefile.mk               |    3 +
 odk/setsdkenv_unix                         |    3 +
 odk/setsdkenv_unix.csh.in                  |   17 ++++++----
 odk/setsdkenv_unix.sh.in                   |   11 ++++--
 odk/util/makefile.pmk                      |    2 -
 14 files changed, 70 insertions(+), 69 deletions(-)

New commits:
commit 4bd50c943d8e4f513265c2117cf47bb071d7058d
Author: Release Engineers <releng at openoffice.org>
Date:   Thu Aug 6 07:01:05 2009 +0000

    CWS-TOOLING: integrate CWS jsc320
    2009-07-31 11:40:04 +0200 jsc  r274518 : #103926# apply patch
    2009-07-16 17:17:01 +0200 jsc  r274063 : #i103311# check new Solaris compiler version ox5100
    2009-07-07 17:20:41 +0200 jsc  r273811 : cleanup
    2009-07-07 15:21:26 +0200 jsc  r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac
    2009-07-07 15:07:05 +0200 jsc  r273798 : #i98322# correct link
    2009-07-07 09:43:57 +0200 jsc  r273773 : #i98322# correct link path
    2009-07-06 15:49:07 +0200 jsc  r273749 : #i98322# correct typo
    2009-07-06 14:17:27 +0200 jsc  r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100)
    2009-07-03 13:54:58 +0200 jsc  r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake
    2009-07-02 13:12:02 +0200 jsc  r273643 : #i103260# improve fix by using EXECPOST variable
    2009-07-02 13:11:30 +0200 jsc  r273642 : #i103260# improve fix by using EXECPOST variable
    2009-07-02 13:05:35 +0200 jsc  r273640 : #i103260# correct typo for windows
    2009-07-02 13:01:34 +0200 jsc  r273639 : #i103260# provide regview with path as argument
    2009-07-01 07:18:01 +0200 jsc  r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk at 273468 (milestone: DEV300:m51)
    2009-06-30 08:01:13 +0200 jsc  r273485 : #98322# include import purpenvhelper lib under windows
    2009-06-10 15:07:29 +0200 jsc  r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk at 272291 (milestone: DEV300:m49)
    2009-05-27 09:36:23 +0200 jsc  r272329 : #i98322# create link for purpenvhelper library in SDK
    2009-05-27 09:35:41 +0200 jsc  r272328 : #i98322# create link for purpenvhelpr library in SDK
    2009-05-14 16:19:41 +0200 jsc  r271900 : increase version number in SDK header image
    2009-05-14 16:11:05 +0200 jsc  r271899 : #i101408# new version 3.2
    2009-05-14 15:33:47 +0200 jsc  r271894 : #i99163# apply patch to correct wrong tags for autodoc
    2009-05-14 14:49:58 +0200 jsc  r271889 : #i99707# apply patch to remove unused code

diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 5e4be4e..662bd3a 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -33,9 +33,6 @@ stdout.WriteLine("\n" +
 var oo_sdk_name=WshSysEnv("OO_SDK_NAME");
 var stldebug="";
 var oo_sdk_home=getSdkHome();
-var oo_major=""; 
-var oo_minor=""; 
-var oo_version=getOOBaseVersion();
 var oo_user_sdk_dir=WshSysEnv("APPDATA") + "\\" + oo_sdk_name;
 var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat";
 
@@ -220,51 +217,24 @@ function getOfficeHome()
     }
 }
 
-function getOOBaseVersion()
-{
-	var ooversion = oo_sdk_home;
-	var major = "";
-	var minor = "";
-	var index= ooversion.lastIndexOf("\\");
-
-	ooversion = ooversion.substr(0, index);
-
-    if ((index = ooversion.lastIndexOf("Basis")) != -1)  
-	   ooversion = ooversion.substr(index+6);
-
-	index = ooversion.lastIndexOf(".");
-	oo_major = ooversion.substr(0, index);
-	oo_minor = ooversion.substr(index+1);
-
-	return ooversion;
-}
-
 function searchOffice()
 {
 	var tmp = oo_sdk_home;
 	var officepath ="";
-	var index=tmp.lastIndexOf("\\OpenOffice.org");
-	
-	tmp = tmp.substr(0, index);
-
-	var sov = parseInt(oo_major) + 6;
+	var index=-1;
 
-    if (aFileSystemObject.FileExists(tmp + "\\OpenOffice.org " + oo_version + "\\program\\soffice.exe")) {
-	   return tmp + "\\OpenOffice.org " + oo_version;
-	}
-    if (aFileSystemObject.FileExists(tmp + "\\OpenOffice.org " + oo_major + "\\program\\soffice.exe")) {
-	   return tmp + "\\OpenOffice.org " + oo_major;
-	}
-    if (aFileSystemObject.FileExists(tmp + "\\StarOffice " + sov + "\\program\\soffice.exe")) {
-	   return tmp + "\\StarOffice " + sov;
-	}
-    if (aFileSystemObject.FileExists(tmp + "\\StarSuite " + sov + "\\program\\soffice.exe")) {
-	   return tmp + "\\StarSuite " + sov;
+	if ((index = tmp.lastIndexOf("\\Basis")) != -1) {
+	   tmp = tmp.substr(0, index);
 	}
 
+	if (aFileSystemObject.FileExists(tmp + "\\program\\soffice.exe")) {
+	   return tmp;
+	}
+  
 	return "";
 }
 
+
 function getOfficeBaseHome()
 {
 	var officebase = oo_sdk_home;
diff --git a/odk/configure.pl b/odk/configure.pl
index f48022e..9a62287 100644
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -18,7 +18,8 @@ $main::OO_MINORVERSION =~ s#[^\d]+(\d).(\d).+#$2#go;
 $main::OO_SDK_CONFIG_HOME= "$ENV{HOME}/$main::OO_SDK_NAME";
 
 $main::operatingSystem = `$main::sdkpath/config.guess | cut -d"-" -f3,4`;
-chop ($main::operatingSystem);
+chomp ($main::operatingSystem);
+
 $main::OO_SDK_HOME = $main::sdkpath;
 #$main::OO_SDK_HOME = "";
 $main::OO_SDK_HOME_SUGGESTION = $main::sdkpath;
@@ -29,6 +30,7 @@ $main::OFFICE_OR_URE_SUGGESTION = "Office";
 $main::OFFICE_HOME = "";
 
 $main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
+
 if ( $main::operatingSystem =~ m/darwin/ )
 {
 #	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
@@ -38,7 +40,8 @@ if ( $main::operatingSystem =~ m/darwin/ )
 
 $main::OO_SDK_MAKE_HOME = "";
 $main::makeName = "make";
-if ( $main::operatingSystem =~ m/freebsd/ )
+if ( $main::operatingSystem =~ m/solaris/ || 
+     $main::operatingSystem =~ m/freebsd/ )
 {
     $main::makeName = "gmake";
 }
@@ -85,7 +88,7 @@ if ( $main::OFFICE_OR_URE eq "Office" )
     {
 # used for a SDK as part of the office installation
 #		$main::OFFICE_HOME = `cd $main::sdkpath/../../.. && pwd`;
-#		chop($main::OFFICE_HOME);
+#		chomp($main::OFFICE_HOME);
 #		print " Used Office = $main::OFFICE_HOME\n";
         print " Used SDK = $main::OO_SDK_HOME\n\n";
 
@@ -570,19 +573,39 @@ sub searchprog
     my @pathList = split(":" , $tmpPath);
     my $progDir = "";
 
-    if ( $_search eq "javac" && $main::operatingSystem =~ m/darwin/ )
+    if ( $_search eq "javac" )
     {
-        $progDir = resolveLink("/System/Library/Frameworks/JavaVM.Framework/Versions", "CurrentJDK");
-        if ( -e "$progDir/$main::OO_SDK_JAVA_BIN_DIR/javac" )
+        if ( $main::operatingSystem =~ m/darwin/ ) {
+            $progDir = resolveLink("/System/Library/Frameworks/JavaVM.Framework/Versions", "CurrentJDK");
+            if ( -e "$progDir/$main::OO_SDK_JAVA_BIN_DIR/javac" )
+            {
+                return "$progDir/$main::OO_SDK_JAVA_BIN_DIR";
+            }
+        }
+
+        if ( $main::operatingSystem =~ m/solaris/ ) {
+            $progDir = resolveLink("/usr/jdk", "latest");
+            if ( -e "$progDir/$main::OO_SDK_JAVA_BIN_DIR/javac" )
+            {
+                return "$progDir/$main::OO_SDK_JAVA_BIN_DIR";
+            }
+        }
+    }
+
+    if ( $_search eq "gmake" && $main::operatingSystem =~ m/solaris/ ) {
+        if ( -e "/usr/sfw/bin/gmake" )
         {
-            return "$progDir/$main::OO_SDK_JAVA_BIN_DIR";
+            return "/usr/sfw/bin";
         }
     }
 
     foreach $i (@pathList)
     {
+        chomp ($i);
+
         if ( -e "$i/$_search" )
         {
+
             if ( index($i, "/") == 0 )
             {
                 # # absolute path; leave unchanged
@@ -618,9 +641,9 @@ sub searchoffice
     my $tmpOffice = substr($main::sdkpath, 0, $offset);
     my $officepath = "$tmpOffice/openoffice.org$main::OO_MAJORVERSION";
 
-    if ( $main::OO_MINORVERSION > 0) {
-        $officepath = "$officepath$main::OO_MINORVERSION";
-    } 
+#	if ( $main::OO_MINORVERSION > 0) {
+#		$officepath = "$officepath$main::OO_MINORVERSION";
+#	} 
 
     # search corresponding office for this SDK
     if (-d $officepath && -e "$officepath/program/soffice") {
diff --git a/odk/docs/images/sdk_head-1.gif b/odk/docs/images/sdk_head-1.gif
index 96409e2..015250e 100644
Binary files a/odk/docs/images/sdk_head-1.gif and b/odk/docs/images/sdk_head-1.gif differ
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 3dfba32..dafd98d 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -106,7 +106,7 @@
           <td class="content80">
 		  <p>GNU make is used to build the examples of the SDK. GNU make is available from <a target="_blank" href="http://www.gnu.org" title="link to www.gnu.org (online)">http://www.gnu.org</a>. It can be ftped via <a target="_blank" href="ftp://ftp.gnu.org/gnu/make" title="link to gnumake on www.gnu.org (online)">ftp://ftp.gnu.org/gnu/make</a></p>
 		  <p><b>Note</b>: Windows user can find an executable of gnu make under <a target="_blank" href="http://www.mingw.org/wiki/Getting_Started" title="link to the MinGW Getting Started wiki (online)">http://www.mingw.org/wiki/Getting_Started</a> (see the mingw32-make link under &quot;Manual Installation&quot;). Do not use the Cygwin make, because it does not
-		  work well. On Solaris, you can also find gnu make under <a target="_blank" href="http://www.sunfreeware.com/" title="link to www.sunfreeware.com (online)">http://www.sunfreeware.com/</a>.</td>
+		  work well. On Solaris gnu make can be found often under <b><i>/usr/sfw/bin/gmake</i></b>, but keep in mind that you have to use <b>'gmake'</b> then. Or you can find gnu make also under <a target="_blank" href="http://www.sunfreeware.com/" title="link to www.sunfreeware.com (online)">http://www.sunfreeware.com/</a>.</td>
           </tr>
 		  <tr valign="middle"> 
             <td colspan="2"><img class="line" src="images/sdk_line-1.gif"></td>
@@ -410,7 +410,7 @@
   </tr>
   <tr> 
     <td colspan="3"> 
-      <div align="center"><p>Copyright 2008 Sun Microsystems, Inc.</p></div>
+      <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
     </td>
   </tr>
 </table>
diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html
index 90ae6f3..c3e40cc 100644
--- a/odk/docs/notsupported.html
+++ b/odk/docs/notsupported.html
@@ -1 +1 @@
-<html>
<head>
  <title>[TITLE] - 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 align="center"><p>Copyright 2008 Sun Microsystems, Inc.</p></div>
    </td>
  </tr>
</table>
<map name="Map">
  <area shape="rect" coords="10,68,93,105" href="http://www.sun.com">
</map>
</body>
</html>
\ No newline at end of file
+<html>
<head>
  <title>[TITLE] - 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 align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
    </td>
  </tr>
</table>
<map name="Map">
  <area shape="rect" coords="10,68,93,105" href="http://www.sun.com">
</map>
</body>
</html>
\ No newline at end of file
diff --git a/odk/docs/tools.html b/odk/docs/tools.html
index 33271ea..28ea6ef 100644
--- a/odk/docs/tools.html
+++ b/odk/docs/tools.html
@@ -982,7 +982,7 @@ types the specified types depend on.</p>
   </tr>
   <tr> 
     <td colspan="3"> 
-      <div align="center"><p>Copyright 2008 Sun Microsystems, Inc.</p></div>
+      <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
     </td>
   </tr>
 </table>
diff --git a/odk/examples/DevelopersGuide/examples.html b/odk/examples/DevelopersGuide/examples.html
index bf23cad..ba74e68 100644
--- a/odk/examples/DevelopersGuide/examples.html
+++ b/odk/examples/DevelopersGuide/examples.html
@@ -3022,7 +3022,7 @@ for the Office application.</td>
     <tr>
       <td colspan="3">
       <div align="center">
-      <p>Copyright 2008 Sun Microsystems, Inc.</p>
+      <p>Copyright 2009 Sun Microsystems, Inc.</p>
       </div>
       </td>
     </tr>
diff --git a/odk/examples/examples.html b/odk/examples/examples.html
index f3d0fb3..98afc9b 100644
--- a/odk/examples/examples.html
+++ b/odk/examples/examples.html
@@ -761,7 +761,7 @@
   </tr>
   <tr> 
     <td colspan="3"> 
-      <div align="center"><p>Copyright 2008 Sun Microsystems, Inc.</p></div>
+      <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
     </td>
   </tr>
 </table>
diff --git a/odk/index.html b/odk/index.html
index ede835c..723a65c 100644
--- a/odk/index.html
+++ b/odk/index.html
@@ -202,7 +202,7 @@
   </tr>
   <tr> 
     <td colspan="3"> 
-      <div align="center"><p>Copyright 2008 Sun Microsystems, Inc.</p></div>
+      <div align="center"><p>Copyright 2009 Sun Microsystems, Inc.</p></div>
     </td>
   </tr>
 </table>
diff --git a/odk/pack/copying/makefile.mk b/odk/pack/copying/makefile.mk
index 49dce9f..24bbdc2 100644
--- a/odk/pack/copying/makefile.mk
+++ b/odk/pack/copying/makefile.mk
@@ -85,7 +85,8 @@ LIBLIST = \
     $(DESTDIRLIB)$/isalhelper.lib 	\
     $(DESTDIRLIB)$/icppu.lib 	\
     $(DESTDIRLIB)$/icppuhelper.lib 	\
-    $(DESTDIRLIB)$/irmcxt.lib
+    $(DESTDIRLIB)$/irmcxt.lib \
+    $(DESTDIRLIB)$/ipurpenvhelper3MSC.lib
 
 .IF "$(COMEX)"=="8"
     LIBLIST += $(DESTDIRLIB)$/stlport_vc7.lib
diff --git a/odk/setsdkenv_unix b/odk/setsdkenv_unix
index 6dc789e..31e0200 100644
--- a/odk/setsdkenv_unix
+++ b/odk/setsdkenv_unix
@@ -5,7 +5,7 @@ HOSTNAME=`hostname`
 CURRENTDIR=`/bin/pwd`
 SDKTMPDIR=`dirname $0`
 OO_SDK_HOME=`(cd $SDKTMPDIR && pwd && cd $CURRENTDIR) | head -n 1`
-OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -n +2 | head -n 1 | cut -d"=" -f2 | cut -d"." -f1,2`
+OOVERSION=`cat $OO_SDK_HOME/settings/dk.mk | tail -2 | head -n 1 | cut -d"=" -f2 | cut -d"." -f1,2`
 if [ "$OSTYPE" = "Darwin" ] 
 then
     OO_SDK_NAME=`basename $OO_SDK_HOME`
@@ -54,6 +54,7 @@ else
     echo " *"
     echo " ************************************************************************"
     echo 
+
     perl $OO_SDK_HOME/configure.pl $HOSTNAME $OO_SDK_HOME $OO_SDK_NAME
 
     . $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index 64b59ae..82a39e3 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/odk/setsdkenv_unix.csh.in
@@ -112,9 +112,9 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
 
     # set LD_LIBRARY_PATH
     if ( $?LD_LIBARY_PATH == 0) then
-	setenv LD_LIBRARY_PATH ${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
+	setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
     else
-	setenv LD_LIBRARY_PATH ${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
+	setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
     endif
   breaksw
 
@@ -134,9 +134,9 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
 
     # set LD_LIBRARY_PATH
     if ( $?LD_LIBARY_PATH == 0) then
-	setenv LD_LIBRARY_PATH ${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
+	setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
     else
-	setenv LD_LIBRARY_PATH ${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
+	setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
     endif
   breaksw
 
@@ -178,9 +178,9 @@ switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
 
     # set LD_LIBRARY_PATH
     if ( $?LD_LIBARY_PATH == 0) then
-	setenv LD_LIBRARY_PATH ${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
+	setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
     else
-	setenv LD_LIBRARY_PATH ${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
+	setenv LD_LIBRARY_PATH ${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
     endif
 
     if ( -e "/sbin/sysctl" ) then
@@ -246,7 +246,8 @@ if [ "${platform}" == "MacOSX" ] then
     rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \
 	"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
 	"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
-	"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 
     if ( -e "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
 	rm -rf "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}"
@@ -262,6 +263,8 @@ if [ "${platform}" == "MacOSX" ] then
 	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
 	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
 	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 
 	if ( -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ) then
 	    ln -s "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" \
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index bb3c162..0f6ef22 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -143,7 +143,7 @@ case ${sdk_platform} in
     soext=so
     exampleout=SOLARISexample.out
     stldebug=_debug
-    LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
+    LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
     export LD_LIBRARY_PATH
     ;;
 
@@ -179,7 +179,7 @@ case ${sdk_platform} in
     exampleout=LINUXexample.out
     platform=Linux
     stldebug=_stldebug
-    LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
+    LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
     export LD_LIBRARY_PATH
     ;;
 
@@ -197,7 +197,7 @@ case ${sdk_platform} in
     exampleout=FREEBSDexample.out
     platform=FreeBSD
     stldebug=_stldebug
-    LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
+    LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
     export LD_LIBRARY_PATH
 
     if [ -e "/sbin/sysctl" ]
@@ -288,7 +288,8 @@ then
     rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \
 	"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \
 	"${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
-	"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \
+	"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 
     if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
     then
@@ -307,6 +308,8 @@ then
 	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
 	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
 	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
+	ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
+	    "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
 
 	if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ]
 	then
diff --git a/odk/util/makefile.pmk b/odk/util/makefile.pmk
index 5f4ff8f..57604f8 100644
--- a/odk/util/makefile.pmk
+++ b/odk/util/makefile.pmk
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 # used for sdk common files
-PRODUCT_RELEASE=3.1.1
+PRODUCT_RELEASE=3.2
 OFFICENAME=OpenOffice.org
 SDKDIRNAME=openoffice.org$(PRODUCT_RELEASE)_sdk
 OFFICEPRODUCTNAME=$(OFFICENAME) $(PRODUCT_RELEASE)


More information about the ooo-build-commit mailing list