ooo-build r12001 - in trunk: . bin

[szalaik svn gnome org]

Author: szalaik
Date: Tue Mar 25 16:46:59 2008
New Revision: 12001
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12001&view=rev

Log:
2008-03-25  Kalman Szalai - KAMI <kamihir freemail hu>

	* bin/unpack: Make Writing Aids available not only from Windows based
	distros.




Modified:
   trunk/ChangeLog
   trunk/bin/unpack

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Mar 25 16:46:59 2008
@@ -74,13 +74,14 @@
 	echo "and can't easily be automated."
 	exit 1
     fi
+fi
+
     case "$DISTRO" in
-	NovellWin32*|GoOoWin32*)
+	NovellWin32*|GoOoWin32*|OxygenOffice*)
 	    check_file $SRCDIR/writingaids-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
 	    check_file $SRCDIR/writingaids-doc-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
 	    ;;
     esac
-fi
 
 if test "z$SYSTEM_GCC" = "z"; then
     # unpack binutils
@@ -110,7 +111,7 @@
 # -binfilter source
 if test -f $SRCDIR/$OOO_BINFILTER_TARBALL; then
    echo "Unpacking $OOO_BINFILTER_TARBALL..."
-   ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_BINFILTER_TARBALL | $GNUTAR xpf - )
+    ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_BINFILTER_TARBALL | $GNUTAR xpf - )
 fi
 # -lang source
 if test -f $SRCDIR/$OOO_LANG_TARBALL; then
@@ -315,18 +316,6 @@
 	esac
     fi
 
-    case "$DISTRO" in
-	NovellWin32*|GoOoWin32*)
-	    # Create prebuilt writingaids.zip
-	    tmpdir=`mktemp -d`
-	    (cd $tmpdir
-	    unzip $SRCDIR/writingaids-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
-	    unzip $SRCDIR/writingaids-doc-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
-	    mkdir $OOBUILDDIR/dictionaries/prebuilt
-	    zip -r $OOBUILDDIR/dictionaries/prebuilt/writingaids.zip .)
-	    rm -rf $tmpdir
-	    ;;
-    esac
 
     if test "x$DEJAVU_FONTS_VER" != "x"; then
         DEJAVU_FONTSDEST=$OOBUILDDIR/dejavufonts/download
@@ -368,6 +357,18 @@
 
 fi
 
+case "$DISTRO" in
+    NovellWin32*|GoOoWin32*|OxygenOffice*)
+    # Create prebuilt writingaids.zip
+    tmpdir=`mktemp -d`
+    (cd $tmpdir
+    unzip $SRCDIR/writingaids-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
+    unzip $SRCDIR/writingaids-doc-$PREBUILT_WRITINGAIDS_TIMESTAMP.zip
+    mkdir $OOBUILDDIR/dictionaries/prebuilt
+    zip -r $OOBUILDDIR/dictionaries/prebuilt/writingaids.zip .)
+    rm -rf $tmpdir
+    ;;
+esac
 
 if test "z$SYSTEM_GCC" = "z"; then
     echo "Checking for gcc sources and prerequisities"