Commits

Anonymous committed 4500120

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@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@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

  • Participants
  • Parent commits 569f54e

Comments (0)

Files changed (25)

File cppu/inc/uno/lbnames.h

 #endif /* (_MSC_VER < 1000) */
 /* sunpro cc */
 #elif defined (__SUNPRO_CC)
-#if (__SUNPRO_CC < 0x500)
-#error "sunpro cc must be at least 5.x"
-provoking error here, because PP ignores #error
-#elif (__SUNPRO_CC < 0x600)
+#if ((__SUNPRO_CC >= 0x5000 && __SUNPRO_CC < 0x6000) || (__SUNPRO_CC >= 0x500 && __SUNPRO_CC < 0x600))
 #define	TMP_CPPU_ENV sunpro5
-#else
+#elif
 #error "sunpro cc version must be 5.x"
 provoking error here, because PP ignores #error
 #endif /* defined (__SUNPRO_CC) */

File odk/cfgWin.js

 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";
 
     }
 }
 
-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 index=-1;
 
-	var sov = parseInt(oo_major) + 6;
-
-    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;

File odk/configure.pl

 $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;
 $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`;
 
 $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";
 }
 	{
 # 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";
 
 	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
 	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") {

File odk/docs/images/sdk_head-1.gif

Old
Old image
New
New image

File odk/docs/install.html

           <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>
   </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>

File odk/docs/notsupported.html

-<html>
  <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">
  <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>
        </tr>
        <tr> 
          <td><img class="nothing8" src="images/nada.gif"></td>
        </tr>
        <tr> 
          </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>
  <area shape="rect" coords="10,68,93,105" href="http://www.sun.com">
+<html>
  <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">
  <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>
        </tr>
        <tr> 
          <td><img class="nothing8" src="images/nada.gif"></td>
        </tr>
        <tr> 
          </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>
  <area shape="rect" coords="10,68,93,105" href="http://www.sun.com">

File odk/docs/tools.html

   </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>

File odk/examples/DevelopersGuide/examples.html

     <tr>
       <td colspan="3">
       <div align="center">
-      <p>Copyright 2008 Sun Microsystems, Inc.</p>
+      <p>Copyright 2009 Sun Microsystems, Inc.</p>
       </div>
       </td>
     </tr>

File odk/examples/examples.html

   </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>

File odk/index.html

   </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>

File odk/pack/copying/makefile.mk

 	$(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

File odk/setsdkenv_unix

 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`
     echo " *"
     echo " ************************************************************************"
     echo 
+
     perl $OO_SDK_HOME/configure.pl $HOSTNAME $OO_SDK_HOME $OO_SDK_NAME
 
     . $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh

File odk/setsdkenv_unix.csh.in

 
     # 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
 
 
     # 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
 
 
     # 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
     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}"
 	    "${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}" \

File odk/setsdkenv_unix.sh.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
     ;;
 
     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
     ;;
 
     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" ]
     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
 	    "${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

File odk/util/makefile.pmk

 #*************************************************************************
 
 # 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)

File offapi/com/sun/star/awt/tree/XTreeDataModelListener.idl

 		Example: the name of a file has changed, but it is in the same location in the file system.
 
 		To indicate the root has changed, <member>TreeDataModelEvent::Nodes</member> will contain
-		the root node and and <member>TreeDataModelEvent::ParentNode</member will be empty.
+		the root node and <member>TreeDataModelEvent::ParentNode</member> will be empty.
 	*/
 	void treeNodesChanged( [in] TreeDataModelEvent Event );
 

File offapi/com/sun/star/xml/sax/XFastTokenHandler.idl

 	/**	returns a integer token for the given string identifier.
 
 		@returns
-            a unique integer token for the given String or <const>FastToken::DONTKNOW</const>
+			a unique integer token for the given String or <const>FastToken::DONTKNOW</const>
 			if the identifier is not known to this instance.
 	*/
 	long getToken( [in] string Identifier );

File offapi/util/checknewapi.pl

 # Copyright (c) 2005 Sun Microsystems, Inc.
 #
 
-if($#ARGV != 2)
+if($#ARGV != 3)
 {
-    die "usage: checknewapi <new_type_library> <reference_type_library> <buildinfodescr>\n";
+    die "usage: checknewapi <new_type_library> <reference_type_library> <buildinfodescr> <fullpath_regview>\n";
 }
 
 -e "$ARGV[0]" || die "ERROR: type library \"$ARGV[0]\" does not exist\n";
 -e "$ARGV[1]" || die "ERROR: reference type library \"$ARGV[1]\" does not exist\n";
+-e "$ARGV[3]" || die "ERROR: invalid path to the regview tool \"$ARGV[3]\", please specify the full qualified path\n";
 
 # debug flag
 $DEBUG = 0;
 
 $main::buildinfo = "$ARGV[2]";
+$main::regview = "$ARGV[3]";
 %{$main::reftypes} = ();
 %{$main::currenttypes} = ();
 %{$main::removedtypes} = ();
 
-open ( FILEIN, "regview \"$ARGV[0]\" |" ) || die "could not use content of current typelibrary \"$ARGV[0]\", regview doesn't work\n";
+open ( FILEIN, "$main::regview \"$ARGV[0]\" |" ) || die "could not use content of current typelibrary \"$ARGV[0]\", regview doesn't work\n";
 
 if ($DEBUG == 1)
 {
 close( FILEIN );
 close( CURRENT );
 
-open ( FILEIN, "regview \"$ARGV[1]\" |" ) || die "could not use content of reference type library \"$ARGV[1]\", regview doesn't work\n";
+open ( FILEIN, "$main::regview \"$ARGV[1]\" |" ) || die "could not use content of reference type library \"$ARGV[1]\", regview doesn't work\n";
 
 if ($DEBUG == 1)
 {

File offapi/util/makefile.mk

 
 UNOTYPE_STATISTICS=$(MISC)$/unotype_statistics.txt
 
+REGVIEWTOOL=$(SOLARBINDIR)$/regview$(EXECPOST)
 
 # --- Targets ------------------------------------------------------
 
 #JSC: new target to prepare some UNO type statistics, the ouput will be later used
 #     for versioning of UNO cli type libraries
 $(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
-    $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
+    $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" "$(REGVIEWTOOL)" > $@
 
 .INCLUDE :  target.mk

File rdbmaker/inc/codemaker/dependency.hxx

 
 	sal_Bool 		insert(const ::rtl::OString& type, const ::rtl::OString& depend, sal_uInt16);
 	TypeUsingSet	getDependencies(const ::rtl::OString& type);
-	sal_Bool 		lookupDependency(const ::rtl::OString& type, const ::rtl::OString& depend, sal_uInt16);
 	sal_Bool		hasDependencies(const ::rtl::OString& type);
 
 	void		setGenerated(const ::rtl::OString& type, sal_uInt16 genFlag=CODEGEN_DEFAULT);

File rdbmaker/inc/codemaker/global.hxx

 ::rtl::OString makeTempName();
 
 const ::rtl::OString inGlobalSet(const ::rtl::OUString & r);
-inline const ::rtl::OString inGlobalSet(sal_Char* p)
-{
-	return inGlobalSet( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(p) ) );
-}
 
 ::rtl::OUString convertToFileUrl(const ::rtl::OString& fileName);
 

File rdbmaker/source/codemaker/dependency.cxx

 	return TypeUsingSet();
 }	
 
-sal_Bool TypeDependency::lookupDependency(const OString& type, const OString& depend, sal_uInt16 use)
-{
-	sal_Bool ret =  sal_False;
-	
-	if (type.getLength() > 0 && depend.getLength() > 0)
-	{
-		if (m_pImpl->m_dependencies.count(type) > 0)
-		{
-			TypeUsingSet::const_iterator iter = m_pImpl->m_dependencies[type].begin();
-
-			while (iter != m_pImpl->m_dependencies[type].end())
-			{
-				if (depend == (*iter).m_type &&
-					(use & (*iter).m_use))
-				{
-					ret = sal_True;
-					break;					
-				}
-				iter++;
-			}
-		} else
-		{
-			ret = sal_False;
-		}
-	}
-	
-	return ret;
-}	
-
 sal_Bool TypeDependency::hasDependencies(const OString& type)
 {
 	if (type.getLength() > 0)

File scp2/source/sdkoo/sdkoo.scp

     Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
 End
 #endif
+
+#if (!defined(WNT) && !defined( MACOSX) )
+Unixlink gid_Unixlink_Purpenvhelper_Link_Sdk
+    BIN_FILE_BODY;
+    Styles = ();
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
+    Dir = gid_Dir_Lib_Sdk;
+    Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+End
+#endif

File stlport/STLport-4.0-sunstudio12u1.patch

+--- misc/STLport-4.0/stlport/config/stl_sunpro.h	Mon Jul  6 13:43:35 2009
++++ misc/build/STLport-4.0/stlport/config/stl_sunpro.h	Mon Jul  6 13:56:56 2009
+@@ -31,7 +31,8 @@
+ #  endif
+ # endif
+ 
+-# if (__SUNPRO_CC < 0x600)
++// support SunStudio compiler 12u1 version 5.10 (which results in 0x5100)
++# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
+ // those are tested and proved not to work...
+ #  define __STL_STATIC_ARRAY_BUG 1
+ #  define __STL_STATIC_CONST_INIT_BUG 1
+@@ -57,7 +58,7 @@
+ #  define __STL_NO_FRIEND_TEMPLATES 1
+ #endif
+ 
+-# if (__SUNPRO_CC < 0x600)
++# if (__SUNPRO_CC < 0x600 || ((__SUNPRO_CC | 0x0FFF) > 0x0FFF && __SUNPRO_CC < 0x6000))
+ #  define __STL_HAS_NO_NEW_C_HEADERS 1 
+ #  define __STL_NO_EXPLICIT_FUNCTION_TMPL_ARGS
+ #  define __STL_NON_TYPE_TMPL_PARAM_BUG 1

File stlport/makefile.mk

     .ENDIF
 .ELSE
     TARFILE_NAME=STLport-4.0
-    PATCH_FILES=STLport-4.0.patch
+    PATCH_FILES=STLport-4.0.patch STLport-4.0-sunstudio12u1.patch
         # To disable warnings from within STLport headers on unxsoli4 and
         # unxsols4, STLport-4.0.patch had to be extended mechanically by
         #