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

[pmladek svn gnome org]

Author: pmladek
Date: Tue Jul 22 14:38:27 2008
New Revision: 13350
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13350&view=rev

Log:
2008-07-22  Petr Mladek  <pmladek suse cz>

	* configure.in, download.in, bin/setup.in, bin/unpack: add
	  --disable-mediawiki; 
	* configure.in, patches/dev300/apply: apply NovellOnlySwextFixes
	  for the Vendor Novell when the mediawiki is enabled; move
	  build-ant-1.6-swext.diff to the NovellOnlySwextFixes section;
	  enable build-ant-1.6-swext.diff and build-ant-1.6.diff again



Modified:
   trunk/ChangeLog
   trunk/bin/setup.in
   trunk/bin/unpack
   trunk/configure.in
   trunk/download.in
   trunk/patches/dev300/apply

Modified: trunk/bin/setup.in
==============================================================================
--- trunk/bin/setup.in	(original)
+++ trunk/bin/setup.in	Tue Jul 22 14:38:27 2008
@@ -36,6 +36,7 @@
 ENABLE_ODK='@ENABLE_ODK@'
 USE_PREBUILD_UNOWINREG_DLL='@USE_PREBUILD_UNOWINREG_DLL@'
 ENABLE_MONO='@ENABLE_MONO@'
+ENABLE_MEDIAWIKI='@ENABLE_MEDIAWIKI@'
 ENABLE_GRAPHITE='@ENABLE_GRAPHITE@'
 GRAPHITE_SRC='@GRAPHITE_SRC@'
 PROPAGATED_ARGS="@PROPAGATED_ARGS@"

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Jul 22 14:38:27 2008
@@ -587,7 +587,7 @@
   $GNUCP -a $SRCDIR/$LIBWPG_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
 fi
 
-if ! echo $CONFIGURE_OPTIONS $PROPAGATED_ARCHS | grep -q disable-mediawiki; then
+if test "$ENABLE_MEDIAWIKI" = "YES"; then
   SWEXT_PACKAGE=$CVSTAG-swext.tar.bz2
   check_tarball $SRCDIR/$SWEXT_PACKAGE
   tar xfj $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jul 22 14:38:27 2008
@@ -123,6 +123,10 @@
                           Usage: --with-mingwin=i586-mingw32msvc-g++
 ],,)
 
+AC_ARG_ENABLE(mediawiki,
+[  --disable-mediawiki    disables the build of the MediaWiki Editor extension
+],,)
+
 AC_ARG_ENABLE(mono,
 [  --enable-mono           Enables the compilation of the Mono bindings
 ],,)
@@ -1027,6 +1031,25 @@
 AC_MSG_RESULT([$mono_enabled])
 AC_SUBST(ENABLE_MONO)
 
+AC_MSG_CHECKING([whether to enable the mediawiki extension])
+if test "$enable_mediawiki" != "no" ; then
+    ENABLE_MEDIAWIKI=YES
+    AC_MSG_RESULT([yes])
+else
+    ENABLE_MEDIAWIKI=NO
+    AC_MSG_RESULT([no])
+fi
+AC_SUBST(ENABLE_MEDIAWIKI)
+
+# FIXME: ugly hack to apply a Novell specific patch for swext sources
+if test "$VENDORNAME" = "Novell" -a "$ENABLE_MEDIAWIKI" = "YES" ; then
+    if test -z "$OOO_ADDITIONAL_SECTIONS" ; then
+	OOO_ADDITIONAL_SECTIONS="NovellOnlySwextFixes"
+    else
+	OOO_ADDITIONAL_SECTIONS="$OOO_ADDITIONAL_SECTIONS,NovellOnlySwextFixes"
+    fi
+fi
+
 AC_MSG_CHECKING([whether to build the binfilter])
 if test "$enable_binfilter" = "yes"; then
     ENABLE_BINFILTER=TRUE

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Jul 22 14:38:27 2008
@@ -281,12 +281,14 @@
     push @files, ( source_file( "libs_extern" ) );
     push @files, ( source_file( "components" ) );
     push @files, ( source_file( "postprocess" ) );
-    push @files, ( source_file( "swext" ) );
 # for now ...
     push @files, ( source_file( "libs_extern_sys" ) );
 } else {
     push @files, ( source_file( "core" ) );
-    push @files, ( source_file( "swext" ) );
+}
+
+if ('@ENABLE_MEDIAWIKI@' eq 'YES') {
+   push @files, ( source_file( "swext" ) );
 }
 
 push @files, ( '@OOO_CUSTOM_IMAGES@') if '@OOO_CUSTOM_IMAGES@';

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 22 14:38:27 2008
@@ -33,7 +33,7 @@
 	      PostgreSQL, SELinux, VOSremoval, Glib2, \
 	      UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, KDE4
 # Optional sections
-Optional : DejaVuFonts
+Optional : DejaVuFonts, NovellOnlySwextFixes
 # Binfilter patches: a special distro; applied only when building with binfilter
 Binfilter : BFBuildBits, BFFixes, BFShrink
 # System patches: a special distro; applied only when building with the system tarball unpacked
@@ -422,15 +422,15 @@
 [ swextFixes > dev300-m25 < beb300-m0 ]
 build-java-target-swext.diff
 
-[ swextFixes ]
+[ NovellOnlySwextFixes ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6.diff
-#FIXME: make NovellOnly build-ant-1.6-swext.diff, i#90830, pmladek
+build-ant-1.6-swext.diff, i#90830, pmladek
 
 [ NovellOnly ]
 # allow build with ant-1.6
 # IMPORTANT: the second part of the patch is build-ant-1.6-swext.diff
-#FIXME: make "build-ant-1.6-swext.diff" NovellOnly  build-ant-1.6.diff, i#90830, pmladek
+build-ant-1.6.diff, i#90830, pmladek
 
 [ Fixes < dev300-m24 < beb300-m3 ]
 # let sd accept uri-list drop, n#183719