ooo-build r11693 - in trunk: . bin patches/src680

[hmth svn gnome org]

Author: hmth
Date: Sat Feb 23 21:24:19 2008
New Revision: 11693
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11693&view=rev

Log:
2008-02-23  Hanno Meyer-Thurow  <h mth web de>

	* bin/unpack: fix wrong $SRCDIR usage.
	* patches/src680/gentooexperimental-gnujre.diff: update for ooh680-m7.


Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/patches/src680/gentooexperimental-gnujre.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Sat Feb 23 21:24:19 2008
@@ -511,8 +511,8 @@
 
 # Extra command images
 echo "Copying extra command images"
-$GNUCP -f $SRCDIR/icons/*.png $OOBUILDDIR/default_images/res/commandimagelist/ || exit 1
-$GNUCP -f $SRCDIR/icons/tango/*.png $OOBUILDDIR/ooo_custom_images/tango/res/commandimagelist/ || exit 1
+$GNUCP -f $TOOLSDIR/src/icons/*.png $OOBUILDDIR/default_images/res/commandimagelist/ || exit 1
+$GNUCP -f $TOOLSDIR/src/icons/tango/*.png $OOBUILDDIR/ooo_custom_images/tango/res/commandimagelist/ || exit 1
 
 echo "Copying scsolver directory into the tree"
 $GNUCP -Rf $TOOLSDIR/scratch/scsolver $OOBUILDDIR/ || exit 1

Modified: trunk/patches/src680/gentooexperimental-gnujre.diff
==============================================================================
--- trunk/patches/src680/gentooexperimental-gnujre.diff	(original)
+++ trunk/patches/src680/gentooexperimental-gnujre.diff	Sat Feb 23 21:24:19 2008
@@ -13,20 +13,23 @@
 -	"gij-4.1",
 -	"bin/gij-4.1",
 +        "java",
-+        "bin/java",
++        "bin/java"
      };
      *size = sizeof (ar) / sizeof (char*);
      return ar;
-@@ -73,22 +67,6 @@
+@@ -73,25 +67,7 @@
+ char const* const* GnuInfo::getRuntimePaths(int * size)
  {
      static char const* ar[]= {
-           "/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
--          "/gcj-4.1.1/libjvm.so",
+-        "/libjvm.so",
+-        "/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so",
+-        "/gcj-4.1.1/libjvm.so",
 -	  "/gcj-4.3-90/libjvm.so",
 -	  "/gcj-4.2-81/libjvm.so",
 -	  "/gcj-4.2/libjvm.so",
 -	  "/gcj-4.2.1/libjvm.so",
 -	  "/gcj-4.2.2/libjvm.so",
+-	  "/gcj-4.2.3/libjvm.so",
 -	  "/gcj-4.1-71/libjvm.so",
 -	  "/gcj-4_1/libjvm.so",
 -	  "/gcj-4.1/libjvm.so",
@@ -35,8 +38,9 @@
 -	  "/libgcj.so.8",
 -	  "/libgcj.so.71",
 -	  "/libgcj.so.70",
--          "/libgcj.so.7",
--          "/libgcj.so.6"
+-        "/libgcj.so.7",
+-        "/libgcj.so.6"
++        "/lib/" GCJ_JFW_PLUGIN_ARCH "/client/libjvm.so"
      };
      *size = sizeof(ar) / sizeof (char*);
      return ar;