ooo-build r12276 - in trunk: . bin patches/dev300

[strba svn gnome org]

Author: strba
Date: Tue Apr 22 09:04:40 2008
New Revision: 12276
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12276&view=rev

Log:
don't download writerfilter and oox tarballs anymore and use the modules as integrated in DEV300

Modified:
   trunk/ChangeLog
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/configure.in
   trunk/download.in
   trunk/patches/dev300/apply
   trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Tue Apr 22 09:04:40 2008
@@ -119,8 +119,6 @@
 OOINSTDIR=$OODESTDIR$OOINSTBASE
 OOOINSTALLDIRNAME= OOOINSTALLDIRNAME@
 UPSTREAM_NAME= UPSTREAM_NAME@
-OOX_MODULE_TARBALL= OOX_MODULE_TARBALL@
-WRITERFILTER_MODULE_TARBALL= WRITERFILTER_MODULE_TARBALL@
 MONO_GAC_ROOT= MONO_GAC_ROOT@
 
 TCSH=/bin/tcsh

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Apr 22 09:04:40 2008
@@ -485,23 +485,6 @@
   $GNUCP -a $SRCDIR/$LIBWPG_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
 fi
 
-# oox source
-check_tarball $SRCDIR/$OOX_MODULE_TARBALL
-echo "Unpacking $OOX_MODULE_TARBALL"
-cd $OOBUILDDIR
-($OOO_DECOMPRESS_CMD $SRCDIR/$OOX_MODULE_TARBALL | $GNUTAR xpf - ) || exit 1
-
-# writerfilter source
-if test -f $SRCDIR/$WRITERFILTER_MODULE_TARBALL; then
-    echo "Unpacking $WRITERFILTER_MODULE_TARBALL"
-    cd $OOBUILDDIR
-    rm -rf writerfilter
-    ($OOO_DECOMPRESS_CMD $SRCDIR/$WRITERFILTER_MODULE_TARBALL | $GNUTAR xpf - ) || exit 1
-else
-    echo "The writerfilter module is missing - please run the download script."
-    exit 1
-fi
-
 # OxygenOffice extras
 for pack in $OOOP_FONTS_PACK $OOOP_GALLERY_PACK $OOOP_SAMPLES_PACK $OOOP_TEMPLATES_PACK ; do
     check_tarball $SRCDIR/$pack

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Apr 22 09:04:40 2008
@@ -1166,12 +1166,6 @@
 fi
 AC_SUBST(MIRROR)
 
-OOX_MODULE_TARBALL="oox.2008-02-29.tar.bz2"
-AC_SUBST(OOX_MODULE_TARBALL)
-
-WRITERFILTER_MODULE_TARBALL="writerfilter.2008-02-29.tar.bz2"
-AC_SUBST(WRITERFILTER_MODULE_TARBALL)
-
 AC_CONFIG_FILES([download], [chmod +x download])
 AC_CONFIG_FILES([scratch/place], [chmod +x scratch/place])
 AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update], [chmod +x intltool*])

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Apr 22 09:04:40 2008
@@ -41,8 +41,6 @@
     'extras-.*'				 => '@MIRROR@/SRC680',
     'ooo_custom_images.*'                => '@MIRROR@/SRC680',
     'ooo_crystal_images.*'               => '@MIRROR@/SRC680',
-    'oox.*'                              => '@MIRROR@/SRC680',
-    'writerfilter.*'                     => '@MIRROR@/SRC680',
     'cli_types.*'                        => '@MIRROR@/@MWS@',
     'mdbtools.*'                         => '@MIRROR@/SRC680',
     'libpixman-.*'			 => '@MIRROR@/SRC680',
@@ -289,10 +287,6 @@
     push @files, ( '@OOOP_TEMPLATES_PACK@' );
 }
 
-push @files, ( '@OOX_MODULE_TARBALL@' );
-
-push @files, ( '@WRITERFILTER_MODULE_TARBALL@' );
-
 my $distro = '@DISTRO@';
 if ($distro eq 'Ark' ||
     $distro eq 'DroplineGNOME' ||

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 22 09:04:40 2008
@@ -1546,8 +1546,6 @@
 
 writerfilter-source-dmapper-domainmapper-debug.diff
 
-oox-token-deps.diff
-
 buildfix-oox-depends-on-unotools.diff
 
 [ CalcFixes ]

Modified: trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff
==============================================================================
--- trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff	(original)
+++ trunk/patches/dev300/buildfix-no-UPD-in-library-names.diff	Tue Apr 22 09:04:40 2008
@@ -39,19 +39,6 @@
  SHL1IMPLIB = i$(SHL1TARGET)
  SHL1LIBS = $(LIB1TARGET)
  SHL1VERSIONMAP=$(TARGET).map
-diff --git oox/util/makefile.mk oox/util/makefile.mk
-index 3c69e95..159afa2 100644
---- oox/util/makefile.mk
-+++ oox/util/makefile.mk
-@@ -62,7 +62,7 @@ LIB1FILES=	\
- 
- # --- Shared-Library -----------------------------------------------
- 
--SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX)
-+SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
- SHL1IMPLIB= i$(SHL1TARGET)
- SHL1USE_EXPORTS=ordinal
- 
 diff --git scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
 index 87cba44..7c18c29 100644
 --- scp2/source/ooo/file_library_ooo.scp
@@ -81,38 +68,3 @@
  SHL1IMPLIB=     i$(TARGET)
  
  SHL1VERSIONMAP=$(TARGET).map
-diff --git writerfilter/util/makefile.mk writerfilter/util/makefile.mk
-index 52476e7..9e47fff 100644
---- writerfilter/util/makefile.mk
-+++ writerfilter/util/makefile.mk
-@@ -56,7 +56,7 @@ LIB1FILES=  \
- SHL1LIBS=$(SLB)$/$(TARGET).lib
- 
- 
--SHL1TARGET=$(TARGET)$(UPD)$(DLLPOSTFIX)
-+SHL1TARGET=$(TARGET)$(DLLPOSTFIX)
- SHL1STDLIBS=\
-     $(I18NISOLANGLIB) \
-     $(SOTLIB) \
-diff --git writerperfect/util/makefile.mk writerperfect/util/makefile.mk
-index 451e4b1..ed089be 100644
---- writerperfect/util/makefile.mk
-+++ writerperfect/util/makefile.mk
-@@ -83,7 +83,7 @@ SHL2STDLIBS+= \
- 	$(LIBWPS) \
- 	$(LIBWPD)
- 
--SHL2TARGET = msworks$(UPD)$(DLLPOSTFIX)
-+SHL2TARGET = msworks$(DLLPOSTFIX)
- SHL2IMPLIB = i$(SHL2TARGET)
- SHL2LIBS = $(LIB2TARGET)
- SHL2VERSIONMAP=msworks.map
-@@ -111,7 +111,7 @@ SHL3STDLIBS+= \
- 	$(LIBWPD) \
- 	$(LIBWPG)
- 
--SHL3TARGET = wpgimport$(UPD)$(DLLPOSTFIX)
-+SHL3TARGET = wpgimport$(DLLPOSTFIX)
- SHL3IMPLIB = i$(SHL3TARGET)
- SHL3LIBS = $(LIB3TARGET)
- SHL3VERSIONMAP=wpgimport.map