From 22f50fb23f4c89fd2a1a5a59f85950042ef34f21 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 29 Aug 2012 12:27:17 +0200 Subject: mdds: convert to gbuild Change-Id: I7db5dd20e41297efbabef22f559b5552f3afff0f --- Makefile.top | 2 +- Module_tail_build.mk | 1 + RepositoryExternal.mk | 17 ++++++++++++ RepositoryModule_ooo.mk | 1 + config_host.mk.in | 1 + configure.in | 3 ++- mdds/Makefile | 7 +++++ mdds/Module_mdds.mk | 20 ++++++++++++++ mdds/UnpackedTarball_mdds.mk | 23 ++++++++++++++++ mdds/makefile.mk | 63 -------------------------------------------- mdds/prj/d.lst | 8 ------ mdds/prj/dmake | 0 ooo.lst.in | 2 +- sc/Library_sc.mk | 4 +++ sc/prj/build.lst | 2 +- tail_build/prj/build.lst | 2 +- 16 files changed, 80 insertions(+), 76 deletions(-) create mode 100644 mdds/Makefile create mode 100644 mdds/Module_mdds.mk create mode 100644 mdds/UnpackedTarball_mdds.mk delete mode 100644 mdds/makefile.mk delete mode 100644 mdds/prj/dmake diff --git a/Makefile.top b/Makefile.top index 304ff5c521de..b8ec2f255d90 100644 --- a/Makefile.top +++ b/Makefile.top @@ -89,6 +89,7 @@ l10ntools\ lingucomponent\ linguistic\ lotuswordpro\ +mdds\ nlpsolver\ np_sdk\ o3tl\ @@ -220,7 +221,6 @@ libxmlsec\ libxslt\ lcms2\ lpsolve\ -mdds\ migrationanalysis\ more_fonts\ moz\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index b3c2424f3b5f..1f230475d507 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -77,6 +77,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ linguistic \ lotuswordpro \ MathMLDTD \ + mdds \ Mesa \ $(if $(filter NLPSOLVER,$(BUILD_TYPE)),\ nlpsolver \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8401164ee2a6..796eae534f91 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -109,6 +109,23 @@ endef endif +ifeq ($(SYSTEM_MDDS),YES) + +gb_LinkTarget__use_mdds_headers := + +else + +define gb_LinkTarget__use_mdds_headers +$(call gb_LinkTarget_use_unpacked,$(1),mdds) +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,mdds/include) \ + $$(INCLUDE) \ +) + +endef + +endif + # External libraries ifeq ($(SYSTEM_CPPUNIT),YES) diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index fae1713cd428..0f39f418fc9a 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -86,6 +86,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ linguistic \ lotuswordpro \ MathMLDTD \ + mdds \ Mesa \ nlpsolver \ np_sdk \ diff --git a/config_host.mk.in b/config_host.mk.in index 070caa1f71cd..f85e3cbbedae 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -311,6 +311,7 @@ export MACOSX_SDK_VERSION=@MACOSX_SDK_VERSION@ export MAC_OS_X_VERSION_MAX_ALLOWED=@MAC_OS_X_VERSION_MAX_ALLOWED@ export MAC_OS_X_VERSION_MIN_REQUIRED=@MAC_OS_X_VERSION_MIN_REQUIRED@ export MDDS_CPPFLAGS=@MDDS_CPPFLAGS@ +export MDDS_TARBALL=@MDDS_TARBALL@ export MERGELIBS=@MERGELIBS@ export MFC_INCLUDE=@MFC_INCLUDE@ export MFC_LIB=@MFC_LIB@ diff --git a/configure.in b/configure.in index 8b9d4d129bae..da4e35c287eb 100644 --- a/configure.in +++ b/configure.in @@ -7763,7 +7763,7 @@ if test "$with_system_mdds" = "yes"; then AC_LANG_POP([C++]) else AC_MSG_RESULT([internal]) - BUILD_TYPE="$BUILD_TYPE MDDS" + MDDS_TARBALL=3e89a35f253a4f1c7de68c57d851ef38-mdds_0.6.0.tar.bz2 SYSTEM_MDDS=NO dnl =================================================================== @@ -7774,6 +7774,7 @@ else AC_MSG_RESULT([boost::unordered_map]) fi AC_SUBST(SYSTEM_MDDS) +AC_SUBST(MDDS_TARBALL) AC_SUBST([MDDS_CPPFLAGS]) dnl =================================================================== diff --git a/mdds/Makefile b/mdds/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/mdds/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/mdds/Module_mdds.mk b/mdds/Module_mdds.mk new file mode 100644 index 000000000000..ac0f8a649d7e --- /dev/null +++ b/mdds/Module_mdds.mk @@ -0,0 +1,20 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,mdds)) + +ifeq ($(SYSTEM_MDDS),NO) + +$(eval $(call gb_Module_add_targets,mdds,\ + UnpackedTarball_mdds \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk new file mode 100644 index 000000000000..c837a52cde38 --- /dev/null +++ b/mdds/UnpackedTarball_mdds.mk @@ -0,0 +1,23 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,mdds)) + +$(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_patches,mdds,\ + mdds/mdds_0.6.0.patch \ + mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch \ + mdds/mdds_0.6.0-unused-parameter.patch \ + mdds/mdds_0.6.0-unreachable-code.patch \ + mdds/0001-fix-linking-error-with-boost-1.50.patch \ + mdds/0001-Workaround-for-gcc-bug.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/mdds/makefile.mk b/mdds/makefile.mk deleted file mode 100644 index 154bfa69389d..000000000000 --- a/mdds/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=. - -PRJNAME=mdds -TARGET=mdds - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -TARFILE_NAME=mdds_0.6.0 -TARFILE_MD5=3e89a35f253a4f1c7de68c57d851ef38 -PATCH_FILES=\ - mdds_0.6.0.patch \ - 0001-help-compiler-select-the-right-overload-of-vector-in.patch \ - mdds_0.6.0-unused-parameter.patch \ - mdds_0.6.0-unreachable-code.patch \ - 0001-fix-linking-error-with-boost-1.50.patch \ - 0001-Workaround-for-gcc-bug.patch - -CONFIGURE_DIR= -CONFIGURE_ACTION= - -BUILD_DIR= -BUILD_ACTION= -BUILD_FLAGS= - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - -# --- post-build --------------------------------------------------- - -NORMALIZE_FLAG_FILE=so_normalized_$(TARGET) - -$(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) - -@$(MKDIRHIER) $(INCCOM) - @$(GNUCOPY) -r $(PACKAGE_DIR)$/$(TARFILE_NAME)$/include$/mdds $(INCCOM) - @$(TOUCH) $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) - -$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) - diff --git a/mdds/prj/d.lst b/mdds/prj/d.lst index dc5828bc432e..e69de29bb2d1 100644 --- a/mdds/prj/d.lst +++ b/mdds/prj/d.lst @@ -1,8 +0,0 @@ -mkdir: %_DEST%\inc\mdds -mkdir: %_DEST%\inc\mdds\compat -mkdir: %_DEST%\inc\mdds\hash_container - -..\%__SRC%\inc\mdds\* %_DEST%\inc\mdds -..\%__SRC%\inc\mdds\compat\* %_DEST%\inc\mdds\compat -..\%__SRC%\inc\mdds\hash_container\* %_DEST%\inc\mdds\hash_container - diff --git a/mdds/prj/dmake b/mdds/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/ooo.lst.in b/ooo.lst.in index 30a7bf5d5f09..367b829b9cc4 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -84,7 +84,7 @@ a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2 c01351d7db2b205de755d58769288224-libwpd-0.9.4.tar.bz2 d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2 -3e89a35f253a4f1c7de68c57d851ef38-mdds_0.6.0.tar.bz2 +@MDDS_TARBALL@ @BOOST_TARBALL@ 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 77a9e42c4442..345c7b5a0303 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -42,6 +42,10 @@ $(eval $(call gb_Library_add_defs,sc,\ $(eval $(call gb_Library_use_sdk_api,sc)) +$(eval $(call gb_Library_use_externals,sc,\ + mdds_headers \ +)) + ifeq ($(ENABLE_TELEPATHY),TRUE) $(eval $(call gb_Library_use_libraries,sc,tubes)) diff --git a/sc/prj/build.lst b/sc/prj/build.lst index 4168f6766a26..c782f350ab83 100644 --- a/sc/prj/build.lst +++ b/sc/prj/build.lst @@ -1,2 +1,2 @@ -sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula MDDS:mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity tubes NULL +sc sc : basic filter TRANSLATIONS:translations vbahelper oovbaapi svx uui stoc BOOST:boost formula mdds oox LIBXSLT:libxslt unoxml ure test xmloff desktop ucb package configmgr officecfg scripting chart2 eventattacher forms scaddins xmlsecurity tubes NULL sc sc\prj nmake - all sc_prj NULL diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index ffca1aaa6618..ace44906e3f3 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL +tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit DESKTOP:codemaker CURL:curl EXPAT:expat FONTCONFIG:fontconfig FREETYPE:freetype GLIB:glib GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JFREEREPORT:jfreereport JPEG:jpeg LCMS2:lcms2 LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBMSPUB:libmspub LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NEON:neon NSS:nss OPENLDAP:openldap OPENSSL:openssl POSTGRESQL:postgresql PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf ZLIB:zlib bridges cli_ure comphelper cppu cppuhelper external jurt jvmaccess jvmfwk offapi officecfg DESKTOP:rdbmaker readlicense_oo RHINO:rhino ridljar sal salhelper solenv soltools stoc ucbhelper ucpp udkapi xmlreader xsltml NULL tb tail_build\prj nmake - all tb_prj NULL -- cgit