ooo-build r14586 - in branches/ooo-build-3-0: . bin distro-configs

[szalaik svn gnome org]

Author: szalaik
Date: Mon Nov 24 13:47:40 2008
New Revision: 14586
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14586&view=rev

Log:
2008-11-24  Kalman Szalai - KAMI <kamihir freemail hu> 

    * bin/unpack: Update - extension aids, oxygenoffice unpack
    * distro-configs/OxygenOfficeLinux.conf.in: Use more recent java



Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/unpack
   branches/ooo-build-3-0/distro-configs/OxygenOfficeLinux.conf.in

Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack	(original)
+++ branches/ooo-build-3-0/bin/unpack	Mon Nov 24 13:47:40 2008
@@ -488,6 +488,7 @@
 
 case "$DISTRO" in
     NovellWin32*|GoOoWin32*)
+    echo "Creating prebuilt writing aids extension (dict-bundle.oxt)..."
 
     # Create prebuilt dict-bundle.oxt
 
@@ -595,7 +596,8 @@
 
 case "$DISTRO" in
 	OxygenOffice*|FSFhu*)
-	    unzip -q $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip $OOBUILDDIR/dictionaries/
+	    echo "Extracting extension aids..."
+	    unzip -q -o $SRCDIR/extensionaids-$PREBUILT_EXTENSIONAIDS_TIMESTAMP.zip -d $OOBUILDDIR/dictionaries
 	    ;;
 esac
 
@@ -749,7 +751,7 @@
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
     check_file $SRCDIR/$pack
     echo "Unpacking $pack"
-    unzip $SRCDIR/$pack -d $OOBUILDDIR/extras/source
+    unzip -q $SRCDIR/$pack -d $OOBUILDDIR/extras/source
 done
 
 # Sun Professional Templates Pack

Modified: branches/ooo-build-3-0/distro-configs/OxygenOfficeLinux.conf.in
==============================================================================
--- branches/ooo-build-3-0/distro-configs/OxygenOfficeLinux.conf.in	(original)
+++ branches/ooo-build-3-0/distro-configs/OxygenOfficeLinux.conf.in	Mon Nov 24 13:47:40 2008
@@ -36,7 +36,7 @@
 --without-system-stdlibs
 --with-system-nas
 --with-system-freetype
---with-jdk-home=/usr/local/jdk1.5.0_15/
+--with-jdk-home=/usr/local/jdk1.6.0_10/
 --with-extensions 
 --with-extension-integration
 --enable-minimizer