ooo-build r14952 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Mon Dec 29 18:42:49 2008
New Revision: 14952
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14952&view=rev

Log:
2008-12-29  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/config_office-openjdk-paths.diff: fixed for dev300-m38.
	Seems like a part of the build-ibm-java-enable.diff change was crept in.


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/config_office-openjdk-paths.diff

Modified: trunk/patches/dev300/config_office-openjdk-paths.diff
==============================================================================
--- trunk/patches/dev300/config_office-openjdk-paths.diff	(original)
+++ trunk/patches/dev300/config_office-openjdk-paths.diff	Mon Dec 29 18:42:49 2008
@@ -1,8 +1,8 @@
-Index: set_soenv.in
-===================================================================
---- config_office/set_soenv.in	(.../tags/DEV300_m38/config_office/set_soenv.in)	(Revision 265803)
-+++ config_office/set_soenv.in	(.../cws/configuretoplevel/set_soenv.in)	(Revision 265803)
-@@ -399,6 +394,7 @@
+diff --git config_office/set_soenv.in config_office/set_soenv.in
+index 78c9bcb..52665c1 100644
+--- config_office/set_soenv.in
++++ config_office/set_soenv.in
+@@ -399,6 +399,7 @@ elsif ( $platform =~ m/linux/ )
        else {      
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
@@ -10,7 +10,7 @@
        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
        }
-@@ -420,6 +416,7 @@
+@@ -420,6 +421,7 @@ elsif ( $platform =~ m/linux/ )
        $OUTPATH        = "unxlngx6";
        # Blackdown.org JDK porting project uses `amd64' and `server' in JDK 1.4.2 RC1
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
@@ -18,7 +18,7 @@
        $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
-@@ -444,7 +441,7 @@
+@@ -444,7 +446,7 @@ elsif ( $platform =~ m/linux/ )
        $CPUNAME        = "SPARC";
        $OUTPATH        = "unxlngs";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
@@ -27,18 +27,9 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
     }
-@@ -473,18 +470,18 @@
-             $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
-             $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads"; }
-          elsif ($JDK =~ m/^[Ii][Bb][Mm]/)
--         {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."bin";
--            $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
--            $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin";
--            $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."xawt";
-+         {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-+            $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
-+            $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-+            $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
+@@ -478,13 +480,13 @@ elsif ( $platform =~ m/linux/ )
+             $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
+             $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
           }
 -         else { 
 -	    # OpenJDK (aka JDK=sun)
@@ -57,7 +48,7 @@
        }
  
        $CPU            = "P";
-@@ -507,7 +504,7 @@
+@@ -507,7 +509,7 @@ elsif ( $platform =~ m/linux/ )
           $OUTPATH        = "unxlngs390";
        }
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
@@ -66,7 +57,7 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
        $CPU            = "3";
-@@ -531,7 +528,7 @@
+@@ -531,7 +533,7 @@ elsif ( $platform =~ m/linux/ )
        $CPUNAME        = "ALPHA_";
        $OUTPATH        = "unxlnga";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
@@ -75,7 +66,7 @@
        $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha".$ds."native_threads";
     }
     elsif ($platform =~ m/^arm.*?l-/)
-@@ -541,8 +538,9 @@
+@@ -541,8 +543,9 @@ elsif ( $platform =~ m/linux/ )
        $CPUNAME        = "ARM";
        $OUTPATH        = "unxlngr";
        $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";