ooo-build r14142 - in branches/ooo-build-3-0: . bin

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Sep 29 14:19:12 2008
New Revision: 14142
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14142&view=rev

Log:
2008-09-29  Rene Engelhard  <rene debian org>

        * bin/unpack, bin/setup.in, bin/src-pack: -sdk(_oo) is gone for
          non-split builds/upstream tarballs


Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/bin/setup.in
   branches/ooo-build-3-0/bin/src-pack
   branches/ooo-build-3-0/bin/unpack

Modified: branches/ooo-build-3-0/bin/setup.in
==============================================================================
--- branches/ooo-build-3-0/bin/setup.in	(original)
+++ branches/ooo-build-3-0/bin/setup.in	Mon Sep 29 14:19:12 2008
@@ -226,14 +226,12 @@
     OOO_SYSTEM_TARBALL="${UPSTREAM_NAME}_system.tar.bz2"
     OOO_BINFILTER_TARBALL="${UPSTREAM_NAME}_binfilter.tar.bz2"
     OOO_LANG_TARBALL="${UPSTREAM_NAME}_l10n.tar.bz2"
-    OOO_SDK_OO_TARBALL="${UPSTREAM_NAME}_sdk.tar.bz2"
     OOO_EXTENSIONS_TARBALL="${UPSTREAM_NAME}_extensions.tar.bz2"
 else
     OOO_TARBALL="$CVSTAG-core.tar.bz2"
     OOO_SYSTEM_TARBALL="$CVSTAG-system.tar.bz2"
     OOO_BINFILTER_TARBALL="$CVSTAG-binfilter.tar.bz2"
     OOO_LANG_TARBALL="$CVSTAG-lang.tar.bz2"
-    OOO_SDK_OO_TARBALL="$CVSTAG-sdk_oo.tar.bz2"
     OOO_EXTENSIONS_TARBALL="${CVSTAG}-extensions.tar.bz2"
 fi
 OOO_SPLIT_PREFIX=""

Modified: branches/ooo-build-3-0/bin/src-pack
==============================================================================
--- branches/ooo-build-3-0/bin/src-pack	(original)
+++ branches/ooo-build-3-0/bin/src-pack	Mon Sep 29 14:19:12 2008
@@ -80,10 +80,6 @@
 tar $tar_opts -f $dest/$src-binfilter.tar.bz2 $src/binfilter || exit 1;
 rm -Rf $src/binfilter || exit 1;
 
-echo "Packing sdk_oo ...";
-tar $tar_opts -f $dest/$src-sdk_oo.tar.bz2 $src/sdk_oo || exit 1;
-rm -Rf $src/sdk_oo || exit 1;
-
 echo "Packing system pieces ...";
 echo "tar $tar_opts -f $dest/$src-system.tar.bz2 $system_dirs";
 tar $tar_opts -f $dest/$src-system.tar.bz2 $system_dirs || exit 1;

Modified: branches/ooo-build-3-0/bin/unpack
==============================================================================
--- branches/ooo-build-3-0/bin/unpack	(original)
+++ branches/ooo-build-3-0/bin/unpack	Mon Sep 29 14:19:12 2008
@@ -208,12 +208,7 @@
     ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_LANG_TARBALL | $GNUTAR xpf - )
 fi
 if test "z$SPLIT" != "zyes"; then
-  # -sdk_oo source
-  if test -f $SRCDIR/$OOO_SDK_OO_TARBALL; then
-     echo "Unpacking $OOO_SDK_OO_TARBALL"
-      ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_SDK_OO_TARBALL | $GNUTAR xpf - )
-  fi
-  if test $SRCDIR/$OOO_EXTENSIONS_TARBALL; then
+  if test -f $SRCDIR/$OOO_EXTENSIONS_TARBALL; then
      echo "Unpacking $OOO_EXTENSIONS_TARBALL..."
       ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_EXTENSIONS_TARBALL | $GNUTAR xpf - )
   fi