Makefile.top | 2 + config_host.mk.in | 1 configure.in | 25 ++++++++++++++++ libmspub/README | 1 libmspub/makefile.mk | 74 +++++++++++++++++++++++++++++++++++++++++++++++++ libmspub/prj/build.lst | 3 + libmspub/prj/d.lst | 6 +++ ooo.lst.in | 1 8 files changed, 113 insertions(+)
New commits: commit 6fc0d54d872d88b6716fa9393f4e4156c5a0c703 Author: Fridrich Å trba <[email protected]> Date: Thu May 24 11:59:16 2012 +0200 Adding libmspub module Change-Id: Iec9c9c5419a40e7ad64af057f1bbb426ca3163b0 diff --git a/Makefile.top b/Makefile.top index 1396514..476c1aa 100644 --- a/Makefile.top +++ b/Makefile.top @@ -194,6 +194,7 @@ libcmis\ libcroco\ libexttextcat\ libgsf\ +libmspub\ libpng\ librsvg\ libvisio\ @@ -466,6 +467,7 @@ findunusedcode: | grep -v ^jvmaccess:: \ | grep -v ^libcdr:: \ | grep -v ^libcmis:: \ + | grep -v ^libmspub:: \ | grep -v ^libvisio:: \ | grep -v ^libwpg:: \ | grep -v ^libwps_tools_win:: \ diff --git a/config_host.mk.in b/config_host.mk.in index 76d4a1d..dcc8bc6 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -499,6 +499,7 @@ export SYSTEM_LIBCROCO=@SYSTEM_LIBCROCO@ export SYSTEM_LIBEXTTEXTCAT=@SYSTEM_LIBEXTTEXTCAT@ export SYSTEM_LIBEXTTEXTCAT_DATA=@SYSTEM_LIBEXTTEXTCAT_DATA@ export SYSTEM_LIBGSF=@SYSTEM_LIBGSF@ +export SYSTEM_LIBMSPUB=@SYSTEM_LIBMSPUB@ export SYSTEM_LIBPNG=@SYSTEM_LIBPNG@ export SYSTEM_LIBRSVG=@SYSTEM_LIBRSVG@ export SYSTEM_LIBVISIO=@SYSTEM_LIBVISIO@ diff --git a/configure.in b/configure.in index 2382c83..8983807 100644 --- a/configure.in +++ b/configure.in @@ -1219,6 +1219,11 @@ AC_ARG_WITH(system-libcdr, [Use libcdr already on system.]),, [with_system_libcdr="$with_system_libs"]) +AC_ARG_WITH(system-libmspub, + AS_HELP_STRING([--with-system-libmspub], + [Use libmspub already on system.]),, + [with_system_libmspub="no"]) + AC_ARG_WITH(system-libvisio, AS_HELP_STRING([--with-system-libvisio], [Use libvisio already on system.]),, @@ -6255,6 +6260,26 @@ AC_SUBST(CDR_CFLAGS) AC_SUBST(CDR_LIBS) dnl =================================================================== +dnl Check for system libmspub +dnl =================================================================== +AC_MSG_CHECKING([which libmspub to use]) +if test "$with_system_libmspub" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_LIBMSPUB=YES + PKG_CHECK_MODULES( MSPUB, libmspub-0.0 ) +elif test $_os = iOS; then + # libmspub depends on libwpd and libwpg and those are LGPL + AC_MSG_RESULT([none]) +else + AC_MSG_RESULT([internal]) + SYSTEM_LIBMSPUB=NO + BUILD_TYPE="$BUILD_TYPE LIBMSPUB" +fi +AC_SUBST(SYSTEM_LIBMSPUB) +AC_SUBST(MSPUB_CFLAGS) +AC_SUBST(MSPUB_LIBS) + +dnl =================================================================== dnl Check for system libvisio dnl =================================================================== AC_MSG_CHECKING([which libvisio to use]) diff --git a/libmspub/README b/libmspub/README new file mode 100644 index 0000000..6d2765a --- /dev/null +++ b/libmspub/README @@ -0,0 +1 @@ +Library parsing the Microsoft Publisher documents. diff --git a/libmspub/makefile.mk b/libmspub/makefile.mk new file mode 100644 index 0000000..e2e0877 --- /dev/null +++ b/libmspub/makefile.mk @@ -0,0 +1,74 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=. + +PRJNAME=cdr +TARGET=cdr + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk + +# --- Files -------------------------------------------------------- + +.IF "$(SYSTEM_LIBMSPUB)" == "YES" +@all: + @echo "Using system libmspub..." +.ENDIF + +# libcdr depends on the libwpd, libwpg and zlib +.IF "$(SYSTEM_LIBWPD)" == "YES" +INCPRE+=$(WPD_CFLAGS) +.ELSE +INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd +INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd-stream +.ENDIF +.IF "$(SYSTEM_LIBWPG)" == "YES" +INCPRE+=$(WPG_CFLAGS) +.ELSE +INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg +.ENDIF +.IF "$(SYSTEM_ZLIB)" == "YES" +INCPRE+=$(ZLIB_CFLAGS) +.ELSE +INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/zlib +.ENDIF + +TARFILE_NAME=libmspub-0.0.0 +TARFILE_MD5=8b72793cbe6f152f51e476da053f03bc + +#PATCH_FILES=\ + +BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) +BUILD_DIR=src$/lib + +# --- Targets ------------------------------------------------------ + +.INCLUDE : set_ext.mk +.INCLUDE : target.mk +.INCLUDE : tg_ext.mk diff --git a/libmspub/prj/build.lst b/libmspub/prj/build.lst new file mode 100644 index 0000000..151fbeb --- /dev/null +++ b/libmspub/prj/build.lst @@ -0,0 +1,3 @@ +pub libmspub : LIBWPD:libwpd LIBWPG:libwpg ZLIB:zlib soltools NULL +pub libmspub usr1 - all pub_mkout NULL +pub libmspub nmake - all pub_libmspub NULL diff --git a/libmspub/prj/d.lst b/libmspub/prj/d.lst new file mode 100644 index 0000000..3a8654e --- /dev/null +++ b/libmspub/prj/d.lst @@ -0,0 +1,6 @@ +mkdir: %_DEST%\inc\libmspub +..\%__SRC%\misc\build\libmspub*\src\lib\libmspub.h %_DEST%\inc\libmspub +..\%__SRC%\misc\build\libmspub*\src\lib\MSPUBDocument.h %_DEST%\inc\libmspub\ +..\%__SRC%\misc\build\libmspub*\src\lib\MSPUBStringVector.h %_DEST%\inc\libmspub\ +..\%__SRC%\lib\*.a %_DEST%\lib\*.a +..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib diff --git a/ooo.lst.in b/ooo.lst.in index e31a791..006350a 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -92,6 +92,7 @@ e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz c216ded0275129ccfef44fbc236ac16a-libcdr-0.0.7.tar.bz2 327348d67c979c88c2dec59a23a17d85-lcms2-2.3.tar.gz +8b72793cbe6f152f51e476da053f03bc-libmspub-0.0.0.tar.bz2 @GOOGLE_DOCS_EXTENSION_PACK@ @FREETYPE_TARBALL@ @FONTCONFIG_TARBALL@
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
