[ooo-build-commit] .: 2 commits - bin/setup.in bin/unpack configure.in patches/dev300

René Engelhard rene at kemper.freedesktop.org
Wed May 12 16:12:48 PDT 2010 

 bin/setup.in                                    |    1 
 bin/unpack                                      |   13 ++---
 configure.in                                    |    7 ++
 patches/dev300/apply                            |    1 
 patches/dev300/calc-perf-flat-segment-tree.diff |    2 
 patches/dev300/mdds-build-dependency-sc.diff    |    2 
 patches/dev300/system-mdds.diff                 |   62 ++++++++++++++++++++++++
 7 files changed, 79 insertions(+), 9 deletions(-)

New commits:
commit 6f37844d64a9a56e30baa3ab9fd5abea8d1b6099
Author: Rene Engelhard <rene at debian.org>
Date:   Thu May 13 00:23:59 2010 +0200

    clean up mdds copying a bit
    
    * bin/setup.in: add SYSTEM_MDDS variable
    * bin/unpack: remove duplicate check, don't try to copy when using
      externally
    * configure.in: (basic) conditional to ste ooo-builds SYSTEM_MDDS

diff --git a/bin/setup.in b/bin/setup.in
index 33a8b26..f8d65fe 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -65,6 +65,7 @@ SYSTEM_CAIRO=@SYSTEM_CAIRO@
 PREBUILT_WRITINGAIDS_TIMESTAMP=@PREBUILT_WRITINGAIDS_TIMESTAMP@
 PREBUILT_EXTENSIONAIDS_TIMESTAMP=@PREBUILT_EXTENSIONAIDS_TIMESTAMP@
 MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP=@MAGYARLINUXLIBERTINE_FONTS_TIMESTAMP@
+SYSTEM_MDDS=@SYSTEM_MDDS@
 UNSTABLE_WP=@UNSTABLE_WP@
 SYSTEM_LIBWPD=@SYSTEM_LIBWPD@
 SYSTEM_LIBWPG=@SYSTEM_LIBWPG@
diff --git a/bin/unpack b/bin/unpack
index 0afd3eb..39f4e3f 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -117,9 +117,6 @@ fi
 mkdir -p $BUILDDIR
 cd $BUILDDIR
 
-# This package is required to build.
-check_file $SRCDIR/mdds_0.3.0.tar.bz2
-
 if test "z$BUILD_WIN32" != "z"; then
     case "$DISTRO" in
 	NovellWin32*|GoOoWin32*)
@@ -972,9 +969,11 @@ if echo $PROPAGATED_ARGS | grep -q enable-mysql-connector; then
     fi
 fi
 
-echo "Copying mdds_0.3.0.tar.bz2 into the tree"
-check_tarball $SRCDIR/mdds_0.3.0.tar.bz2
-mkdir -p $OOBUILDDIR/mdds/download
-$GNUCP -a $SRCDIR/mdds_0.3.0.tar.bz2 -d $OOBUILDDIR/mdds/download || exit 1
+if test "x$SYSTEM_MDDS" != "x"; then
+    echo "Copying mdds_0.3.0.tar.bz2 into the tree"
+    check_tarball $SRCDIR/mdds_0.3.0.tar.bz2
+    mkdir -p $OOBUILDDIR/mdds/download
+    $GNUCP -a $SRCDIR/mdds_0.3.0.tar.bz2 -d $OOBUILDDIR/mdds/download || exit 1
+fi
 
 fi # PIECES hack
diff --git a/configure.in b/configure.in
index 11aae31..4c05c51 100644
--- a/configure.in
+++ b/configure.in
@@ -1286,6 +1286,13 @@ else
 fi
 AC_SUBST(UNSTABLE_WP)
 
+if test -n "$with_system_mdds" && test "$with_system_mdds" = "yes"; then
+    SYSTEM_MDDS=YES
+else
+    SYSTEM_MDDS=NO
+fi
+AC_SUBST(SYSTEM_MDDS)
+
 if test -n "$with_system_libwpd" && test "$with_system_libwpd" = "yes"; then
     SYSTEM_LIBWPD=YES
 else
commit 40a2ddb72d0c7d5bde81fba001516f2c8d390c7b
Author: Rene Engelhard <rene at debian.org>
Date:   Wed May 12 23:18:48 2010 +0200

    implement system-mdds
    
    * patches/dev300/calc-perf-flat-segment-tree.diff: use <> instead of ""
    * patches/dev300/mdds-build-dependency-sc.diff: mdds -> MDDS:mdds,
    * patches/dev300/system-mdds.diff: add configure.in/set_soenv.in parts
    * patches/dev300/apply: apply system-mdds.diff

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a0c2c1a..916afff 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3838,6 +3838,7 @@ mdds-makefile-mk.diff,   kohei
 mdds-prj-build-lst.diff, kohei
 mdds-prj-d-lst.diff,     kohei
 mdds-build-dependency-sc.diff, kohei
+system-mdds.diff, rengelha
 
 [ GentooExperimental ]
 SectionOwner => hmth
diff --git a/patches/dev300/calc-perf-flat-segment-tree.diff b/patches/dev300/calc-perf-flat-segment-tree.diff
index 0e9283d..f7a142f 100644
--- a/patches/dev300/calc-perf-flat-segment-tree.diff
+++ b/patches/dev300/calc-perf-flat-segment-tree.diff
@@ -233,7 +233,7 @@
 +#include "precompiled_sc.hxx"
 +
 +#include "segmenttree.hxx"
-+#include "mdds/flat_segment_tree.hpp"
++#include <mdds/flat_segment_tree.hpp>
 +
 +#include <limits>
 +
diff --git a/patches/dev300/mdds-build-dependency-sc.diff b/patches/dev300/mdds-build-dependency-sc.diff
index d1216ab..b9ff411 100644
--- a/patches/dev300/mdds-build-dependency-sc.diff
+++ b/patches/dev300/mdds-build-dependency-sc.diff
@@ -4,7 +4,7 @@ index e7da6af..09cf47e 100644
 +++ sc/prj/build.lst
 @@ -1,4 +1,4 @@
 -sc     sc      :       l10n vbahelper oovbaapi svx stoc uui BOOST:boost formula oox NULL
-+sc     sc      :       l10n vbahelper oovbaapi svx stoc uui BOOST:boost formula oox mdds NULL
++sc     sc      :       l10n vbahelper oovbaapi svx stoc uui BOOST:boost formula oox MDDS:mdds NULL
  sc	sc							usr1	-	all	sc_mkout NULL
  sc	sc\inc							nmake	-	all	sc_inc NULL
  sc      sc\uiconfig\layout                                      nmake   -       all     sc_layout NULL
diff --git a/patches/dev300/system-mdds.diff b/patches/dev300/system-mdds.diff
new file mode 100644
index 0000000..67d1531
--- /dev/null
+++ b/patches/dev300/system-mdds.diff
@@ -0,0 +1,62 @@
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -517,6 +517,9 @@
+ AC_ARG_WITH(system-boost,
+ [  --with-system-boost     Use boost already on system
+ ],,)
++AC_ARG_WITH(system-mdds,
++[  --with-system-mdds      Use mdds already on system
++],,)
+ AC_ARG_WITH(system-vigra,
+ [  --with-system-vigra     Use vigra already on system
+ ],,)
+@@ -4215,6 +4218,25 @@
+ AC_SUBST(CURL_LIBS)
+ 
+ dnl ===================================================================
++dnl Check for system mdds
++dnl ===================================================================
++AC_MSG_CHECKING([which mdds to use])
++if test -n "$with_system_mdds" -o -n "$with_system_headers" && \
++	test "$with_system_mdds" != "no"; then
++    AC_MSG_RESULT([external])
++    SYSTEM_MDDS=YES
++    AC_LANG_PUSH([C++])
++    AC_CHECK_HEADER(mdds/flat_segment_tree.hpp, [],
++        [AC_MSG_ERROR(mdds/flat_segment_tree.hpp not found. install mdds)], [])
++    AC_LANG_POP([C++])
++else
++   AC_MSG_RESULT([internal])
++   BUILD_TYPE="$BUILD_TYPE MDDS"
++   SYSTEM_MDDS=NO
++fi
++AC_SUBST(SYSTEM_MDDS)
++
++dnl ===================================================================
+ dnl Check for system boost
+ dnl ===================================================================
+ AC_MSG_CHECKING([which boost to use])
+diff --git a/set_soenv.in b/set_soenv.in
+--- set_soenv.in
++++ set_soenv.in
+@@ -1920,6 +1920,7 @@
+ ToFile( "CURL_CFLAGS",       "@CURL_CFLAGS@",      "e" );
+ ToFile( "CURL_LIBS",         "@CURL_LIBS@",        "e" );
+ ToFile( "SYSTEM_BOOST",      "@SYSTEM_BOOST@",     "e" );
++ToFile( "SYSTEM_MDDS",       "@SYSTEM_MDDS@",      "e" );
+ ToFile( "SYSTEM_VIGRA",      "@SYSTEM_VIGRA@",     "e" );
+ ToFile( "SYSTEM_NEON",       "@SYSTEM_NEON@",      "e" );
+ ToFile( "NEON_VERSION",      "@NEON_VERSION@",     "e" );
+diff --git a/solenv/config/sooo320.ini b/solenv/config/sooo320.ini
+--- solenv/config/sooo320.ini
++++ solenv/config/sooo320.ini
+@@ -13,7 +13,7 @@
+ 			BMP_WRITES_FLAG TRUE
+ 			BTARGET 1
+ 			BUILD_SPECIAL TRUE
+-			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC
++			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC
+ 			common_build TRUE
+ 			COMMON_OUTDIR common
+ 			CONFIG_PROJECT config_office

More information about the ooo-build-commit mailing list