GNOME.org
 

ooo-build r14673 - in branches/ooo-build-3-0-1: . bin patches/dev300

Author: pmladek
Date: Mon Dec  1 19:23:37 2008
New Revision: 14673
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14673&view=rev

Log:
2008-12-01  Petr Mladek <pmladek suse cz>

	* configure.in, download.in, bin/setup.in, bin/unpack, bin/applyflags:
	* patches/dev300/apply: add --with-unstable-wp to make build of the
	  unstable libwp* optional




Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/bin/applyflags
   branches/ooo-build-3-0-1/bin/setup.in
   branches/ooo-build-3-0-1/bin/unpack
   branches/ooo-build-3-0-1/configure.in
   branches/ooo-build-3-0-1/download.in
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/bin/applyflags
==============================================================================
--- branches/ooo-build-3-0-1/bin/applyflags	(original)
+++ branches/ooo-build-3-0-1/bin/applyflags	Mon Dec  1 19:23:37 2008
@@ -29,9 +29,13 @@
 if grep localize.sdf $OOBUILDDIR/sw/source/ui/app/localize.sdf > /dev/null 2>&1 ; then
     echo -n " --distro=Localize";
 fi
+if test "$UNSTABLE_WP" = "YES" ; then
+    echo -n " --distro=UnstableWP";
+fi
 if test -n "$OOO_ADDITIONAL_SECTIONS" ; then
     echo -n " --additional-sections=$OOO_ADDITIONAL_SECTIONS";
 fi
 if test "z$PIECE" != "z"; then
     echo -n " --pieces --distro=Piece";
 fi ;
+

Modified: branches/ooo-build-3-0-1/bin/setup.in
==============================================================================
--- branches/ooo-build-3-0-1/bin/setup.in	(original)
+++ branches/ooo-build-3-0-1/bin/setup.in	Mon Dec  1 19:23:37 2008
@@ -48,9 +48,13 @@
 SYSTEM_CAIRO= SYSTEM_CAIRO@
 PREBUILT_WRITINGAIDS_TIMESTAMP= PREBUILT_WRITINGAIDS_TIMESTAMP@
 PREBUILT_EXTENSIONAIDS_TIMESTAMP= PREBUILT_EXTENSIONAIDS_TIMESTAMP@
+UNSTABLE_WP= UNSTABLE_WP@
 SYSTEM_LIBWPD= SYSTEM_LIBWPD@
 SYSTEM_LIBWPG= SYSTEM_LIBWPG@
 SYSTEM_LIBWPS= SYSTEM_LIBWPS@
+LIBWPD_TARBALL= LIBWPD_TARBALL@
+LIBWPG_TARBALL= LIBWPG_TARBALL@
+LIBWPS_TARBALL= LIBWPS_TARBALL@
 GLITZ_VER= GLITZ_VER@
 DEJAVU_FONTS_VER= DEJAVU_FONTS_VER@
 DEJAVU_FONTS_PACK_NAME= DEJAVU_FONTS_PACK_NAME@

Modified: branches/ooo-build-3-0-1/bin/unpack
==============================================================================
--- branches/ooo-build-3-0-1/bin/unpack	(original)
+++ branches/ooo-build-3-0-1/bin/unpack	Mon Dec  1 19:23:37 2008
@@ -703,42 +703,24 @@
 fi
 
 if test "$SYSTEM_LIBWPD" != "YES"; then
-  LIBWPD_PACKAGE=libwpd-0.8.14.tar.gz
-  check_tarball $SRCDIR/$LIBWPD_PACKAGE
+  check_tarball $SRCDIR/$LIBWPD_TARBALL
   echo "Copying libwpd package into the tree"
   mkdir -p $OOBUILDDIR/libwpd/download || exit 1
-  $GNUCP -a $SRCDIR/$LIBWPD_PACKAGE $OOBUILDDIR/libwpd/download/ || exit 1
-  LIBWPD_UNSTABLE_PACKAGE=libwpd-0.9.0~CVS20081118.tar.gz
-  check_tarball $SRCDIR/$LIBWPD_UNSTABLE_PACKAGE
-  echo "Copying unstable libwpd package into the tree"
-  mkdir -p $OOBUILDDIR/libwpd/download || exit 1
-  $GNUCP -a $SRCDIR/$LIBWPD_UNSTABLE_PACKAGE $OOBUILDDIR/libwpd/download/ || exit 1
+  $GNUCP -a $SRCDIR/$LIBWPD_TARBALL $OOBUILDDIR/libwpd/download/ || exit 1
 fi
 
 if test "$SYSTEM_LIBWPS" != "YES"; then
-  LIBWPS_PACKAGE=libwps-0.1.2.tar.gz
-  check_tarball $SRCDIR/$LIBWPS_PACKAGE
+  check_tarball $SRCDIR/$LIBWPS_TARBALL
   echo "Copying libwps package into the tree"
   mkdir -p $OOBUILDDIR/libwps/download || exit 1
-  $GNUCP -a $SRCDIR/$LIBWPS_PACKAGE $OOBUILDDIR/libwps/download/ || exit 1
-  LIBWPS_UNSTABLE_PACKAGE=libwps-0.2.0~CVS20081118.tar.gz
-  check_tarball $SRCDIR/$LIBWPS_UNSTABLE_PACKAGE
-  echo "Copying unstable libwps package into the tree"
-  mkdir -p $OOBUILDDIR/libwps/download || exit 1
-  $GNUCP -a $SRCDIR/$LIBWPS_UNSTABLE_PACKAGE $OOBUILDDIR/libwps/download/ || exit 1
+  $GNUCP -a $SRCDIR/$LIBWPS_TARBALL $OOBUILDDIR/libwps/download/ || exit 1
 fi
 
 if test "$SYSTEM_LIBWPG" != "YES"; then
-  LIBWPG_PACKAGE=libwpg-0.1.3.tar.gz
-  check_tarball $SRCDIR/$LIBWPG_PACKAGE
+  check_tarball $SRCDIR/$LIBWPG_TARBALL
   echo "Copying libwpg package into the tree"
   mkdir -p $OOBUILDDIR/libwpg/download || exit 1
-  $GNUCP -a $SRCDIR/$LIBWPG_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
-  LIBWPG_UNSTABLE_PACKAGE=libwpg-0.2.0~CVS20081118.tar.gz
-  check_tarball $SRCDIR/$LIBWPG_UNSTABLE_PACKAGE
-  echo "Copying unstable libwpg package into the tree"
-  mkdir -p $OOBUILDDIR/libwpg/download || exit 1
-  $GNUCP -a $SRCDIR/$LIBWPG_UNSTABLE_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
+  $GNUCP -a $SRCDIR/$LIBWPG_TARBALL $OOBUILDDIR/libwpg/download/ || exit 1
 fi
 
 if test "$ENABLE_SCSOLVER" = "YES"; then

Modified: branches/ooo-build-3-0-1/configure.in
==============================================================================
--- branches/ooo-build-3-0-1/configure.in	(original)
+++ branches/ooo-build-3-0-1/configure.in	Mon Dec  1 19:23:37 2008
@@ -169,6 +169,11 @@
   --with-system-libwpg     Use system libwpg* library
 ],,)
 
+AC_ARG_WITH(unstable-wp,
+[
+  --with-unstable-wp       Use new unstable libwp* libraries
+],,)
+
 AC_ARG_ENABLE(cairo,
 [
   --enable-cairo          Enables cairo canvas backend.],
@@ -1193,26 +1198,53 @@
 AC_SUBST(MDBTOOLS_SRC)
 AC_SUBST(SYSTEM_MDBTOOLS)
 
+
+UNSTABLE_WP=NO
+if test -n "$with_unstable_wp" && test "$with_unstable_wp" = "yes"; then
+    UNSTABLE_WP=YES
+else
+    UNSTABLE_WP=NO
+fi
+AC_SUBST(UNSTABLE_WP)
+
 if test -n "$with_system_libwpd" && test "$with_system_libwpd" = "yes"; then
     SYSTEM_LIBWPD=YES
 else
     SYSTEM_LIBWPD=NO
+    if test -n "$UNSTABLE_WP" = "YES"; then
+	LIBWPD_TARBALL=libwpd-0.9.0~CVS20081118.tar.gz
+    else
+	LIBWPD_TARBALL=libwpd-0.8.14.tar.gz
+    fi
 fi
 AC_SUBST(SYSTEM_LIBWPD)
+AC_SUBST(LIBWPD_TARBALL)
 
 if test -n "$with_system_libwps" && test "$with_system_libwps" = "yes"; then
     SYSTEM_LIBWPS=YES
 else
     SYSTEM_LIBWPS=NO
+    if test -n "$UNSTABLE_WP" = "YES"; then
+	LIBWPS_TARBALL=libwps-0.2.0~CVS20081118.tar.gz
+    else
+	LIBWPS_TARBALL=libwps-0.1.2.tar.gz
+    fi
 fi
 AC_SUBST(SYSTEM_LIBWPS)
+AC_SUBST(LIBWPS_TARBALL)
 
 if test "$with_system_libwpg" = "yes"; then
     SYSTEM_LIBWPG=YES
 else
     SYSTEM_LIBWPG=NO
+    if test -n "$UNSTABLE_WP" = "YES"; then
+	LIBWPG_TARBALL=libwpg-0.2.0~CVS20081118.tar.gz
+    else
+	LIBWPG_TARBALL=libwpg-0.1.3.tar.gz
+    fi
 fi
 AC_SUBST(SYSTEM_LIBWPG)
+AC_SUBST(LIBWPG_TARBALL)
 
 
 AC_MSG_CHECKING([for Sun Professional Template Pack intergration (only supported languages displayed)])

Modified: branches/ooo-build-3-0-1/download.in
==============================================================================
--- branches/ooo-build-3-0-1/download.in	(original)
+++ branches/ooo-build-3-0-1/download.in	Mon Dec  1 19:23:37 2008
@@ -342,18 +342,15 @@
 }
 
 if ('@SYSTEM_LIBWPD@' eq 'NO') {
-   push @files, ( 'libwpd-0.8.14.tar.gz' );
-   push @files, ( 'libwpd-0.9.0~CVS20081118.tar.gz' );
+   push @files, ( '@LIBWPD_TARBALL@' );
 }
 
 if ('@SYSTEM_LIBWPS@' eq 'NO') {
-   push @files, ( 'libwps-0.1.2.tar.gz' );
-   push @files, ( 'libwps-0.2.0~CVS20081118.tar.gz' );
+   push @files, ( '@LIBWPS_TARBALL@' );
 }
 
 if ('@SYSTEM_LIBWPG@' eq 'NO') {
-   push @files, ( 'libwpg-0.1.3.tar.gz' );
-   push @files, ( 'libwpg-0.2.0~CVS20081118.tar.gz' );
+   push @files, ( '@LIBWPG_TARBALL@' );
 }
 
 if ('@OOOP_FONTS_PACK@' ne '') {

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Mon Dec  1 19:23:37 2008
@@ -47,6 +47,7 @@
 # patches touching swext which is not in the OpenOffice2 alias yet.
 # FIXME: Get this cleaned up
 Extensions : ExtensionFixes
+UnstableWP : UnstableLibwpd
 
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]