From 1ceb47d96da9e7977c96241f49ad291ff0466970 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 25 Oct 2012 09:55:13 +0200 Subject: graphite: convert to gbuild Change-Id: I47c279d1cf53ef2c092467070d97b13f949d06f6 --- Makefile.top | 2 +- Module_tail_build.mk | 3 +- RepositoryExternal.mk | 8 +++- RepositoryFixes.mk | 3 -- RepositoryModule_ooo.mk | 3 +- config_host.mk.in | 1 + configure.ac | 4 +- graphite/Makefile | 7 ++++ graphite/Module_graphite.mk | 21 +++++++++++ graphite/StaticLibrary_graphite.mk | 68 +++++++++++++++++++++++++++++++++ graphite/UnpackedTarball_graphite.mk | 18 +++++++++ graphite/graphite_make.patch | 42 --------------------- graphite/makefile.mk | 73 ------------------------------------ graphite/prj/d.lst | 12 ------ graphite/prj/dmake | 0 ooo.lst.in | 2 +- tail_build/prj/build.lst | 2 +- vcl/Library_vclplug_gen.mk | 1 + 18 files changed, 132 insertions(+), 138 deletions(-) create mode 100644 graphite/Makefile create mode 100644 graphite/Module_graphite.mk create mode 100644 graphite/StaticLibrary_graphite.mk create mode 100644 graphite/UnpackedTarball_graphite.mk delete mode 100644 graphite/graphite_make.patch delete mode 100644 graphite/makefile.mk delete mode 100644 graphite/prj/dmake diff --git a/Makefile.top b/Makefile.top index 68bbbd1bc8fb..f2894123168d 100644 --- a/Makefile.top +++ b/Makefile.top @@ -84,6 +84,7 @@ formula\ fpicker\ framework\ freetype\ +graphite\ helpcompiler\ hsqldb\ hwpfilter\ @@ -215,7 +216,6 @@ external\ gdk-pixbuf\ gettext\ glib\ -graphite\ helpcontent2 \ hunspell\ hyphen\ diff --git a/Module_tail_build.mk b/Module_tail_build.mk index ddd18027a71e..edec0fc02179 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -74,7 +74,8 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ formula \ fpicker \ framework \ - $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ hwpfilter \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f6f32140bb64..cf389b8a4035 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -777,11 +777,15 @@ endef else # !SYSTEM_GRAPHITE $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - graphite2_off \ + graphite \ )) define gb_LinkTarget__use_graphite +$(call gb_LinkTarget_set_include,$(1),\ + -I$(call gb_UnpackedTarball_get_dir,graphite/include) \ + $$(INCLUDE) \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ - graphite2_off \ + graphite \ ) endef diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index 5eb00eb36ee5..51e82413ac91 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -78,14 +78,12 @@ gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$( gb_Library_FILENAMES := $(patsubst curl:icurl%,curl:libcurl%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst npsoplugin:inpsoplugin%,npsoplugin:npsoplugin%,$(gb_Library_FILENAMES)) -gb_StaticLibrary_FILENAMES := $(patsubst graphite:graphite%,graphite:graphite_dll%,$(gb_StaticLibrary_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst png:png%,png:libpng%,$(gb_StaticLibrary_FILENAMES)) gb_StaticLibrary_FILENAMES := $(patsubst salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES)) ifeq ($(COM),GCC) gb_Library_FILENAMES := $(patsubst crypto:icrypto%,crypto:crypto%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst exslt:iexslt%,exslt:libexslt$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst graphite2_off:%.dll.a,graphite2_off:%.a,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst libexttextcat:liblibext%,libexttextcat:libilibext%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf.dll$(gb_Library_IARCEXT),$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssl%,$(gb_Library_FILENAMES)) @@ -140,7 +138,6 @@ gb_Library_NOILIBFILENAMES := \ gmodule-2.0 \ gobject-2.0 \ gthread-2.0 \ - graphite2_off \ icudt icuin icule icuuc \ langtag \ lcms2 \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index 616b3cf65099..ee6f8d94f4b9 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -79,7 +79,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ formula \ fpicker \ framework \ - $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,FREETYPE,freetype) \ + $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ hwpfilter \ diff --git a/config_host.mk.in b/config_host.mk.in index ad5f8f98ee5a..1f9793f83faf 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -221,6 +221,7 @@ export GPERF=@GPERF@ export GPERF=@GPERF@ export GRAPHITE_CFLAGS=@GRAPHITE_CFLAGS@ export GRAPHITE_LIBS=@GRAPHITE_LIBS@ +export GRAPHITE_TARBALL=@GRAPHITE_TARBALL@ @x_Cygwin@ export GREP=@WIN_GREP@ export GSTREAMER_CFLAGS=@GSTREAMER_CFLAGS@ export GSTREAMER_LIBS=@GSTREAMER_LIBS@ diff --git a/configure.ac b/configure.ac index 6fc40f38b470..5f5671b47656 100644 --- a/configure.ac +++ b/configure.ac @@ -8526,14 +8526,16 @@ if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "$enable_graphite" = "" -o AC_MSG_RESULT([internal]) SYSTEM_GRAPHITE=NO BUILD_TYPE="$BUILD_TYPE GRAPHITE" + GRAPHITE_TARBALL=f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz fi else AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_GRAPHITE) AC_SUBST(SYSTEM_GRAPHITE) -AC_SUBST(GRAPHITE_LIBS) AC_SUBST(GRAPHITE_CFLAGS) +AC_SUBST(GRAPHITE_LIBS) +AC_SUBST(GRAPHITE_TARBALL) AC_SUBST([MINGW_GRAPHITE2_DLL]) dnl =================================================================== diff --git a/graphite/Makefile b/graphite/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/graphite/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/graphite/Module_graphite.mk b/graphite/Module_graphite.mk new file mode 100644 index 000000000000..2791eff83c78 --- /dev/null +++ b/graphite/Module_graphite.mk @@ -0,0 +1,21 @@ +# -*- 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,graphite)) + +ifeq ($(SYSTEM_GRAPHITE),NO) + +$(eval $(call gb_Module_add_targets,graphite,\ + StaticLibrary_graphite \ + UnpackedTarball_graphite \ +)) + +endif + +# vim: set noet sw=4 ts=4: diff --git a/graphite/StaticLibrary_graphite.mk b/graphite/StaticLibrary_graphite.mk new file mode 100644 index 000000000000..e02272cdac6a --- /dev/null +++ b/graphite/StaticLibrary_graphite.mk @@ -0,0 +1,68 @@ +# -*- 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_StaticLibrary_StaticLibrary,graphite)) + +$(eval $(call gb_StaticLibrary_use_unpacked,graphite,graphite)) + +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,graphite)) + +$(eval $(call gb_StaticLibrary_set_include,graphite,\ + -I$(call gb_UnpackedTarball_get_dir,graphite/include) \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,graphite,\ + -DDISABLE_TRACING \ + -DGR2_STATIC \ +)) + +ifeq ($(COM),GCC) +$(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\ + -fpermissive \ +)) +endif + +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp)) + +$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,graphite,\ + UnpackedTarball/graphite/src/$(if $(filter GCC,$(COM)),direct,call)_machine \ + UnpackedTarball/graphite/src/gr_char_info \ + UnpackedTarball/graphite/src/gr_face \ + UnpackedTarball/graphite/src/gr_features \ + UnpackedTarball/graphite/src/gr_font \ + UnpackedTarball/graphite/src/gr_logging \ + UnpackedTarball/graphite/src/gr_segment \ + UnpackedTarball/graphite/src/gr_slot \ + UnpackedTarball/graphite/src/json \ + UnpackedTarball/graphite/src/Bidi \ + UnpackedTarball/graphite/src/CachedFace \ + UnpackedTarball/graphite/src/CmapCache \ + UnpackedTarball/graphite/src/Code \ + UnpackedTarball/graphite/src/Face \ + UnpackedTarball/graphite/src/FeatureMap \ + UnpackedTarball/graphite/src/FileFace \ + UnpackedTarball/graphite/src/Font \ + UnpackedTarball/graphite/src/GlyphCache \ + UnpackedTarball/graphite/src/GlyphFace \ + UnpackedTarball/graphite/src/Justifier \ + UnpackedTarball/graphite/src/NameTable \ + UnpackedTarball/graphite/src/Pass \ + UnpackedTarball/graphite/src/SegCache \ + UnpackedTarball/graphite/src/SegCacheEntry \ + UnpackedTarball/graphite/src/SegCacheStore \ + UnpackedTarball/graphite/src/Segment \ + UnpackedTarball/graphite/src/Silf \ + UnpackedTarball/graphite/src/Slot \ + UnpackedTarball/graphite/src/Sparse \ + UnpackedTarball/graphite/src/TtfUtil \ + UnpackedTarball/graphite/src/UtfCodec \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/graphite/UnpackedTarball_graphite.mk b/graphite/UnpackedTarball_graphite.mk new file mode 100644 index 000000000000..d50ef19bca82 --- /dev/null +++ b/graphite/UnpackedTarball_graphite.mk @@ -0,0 +1,18 @@ +# -*- 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,graphite)) + +$(eval $(call gb_UnpackedTarball_set_tarball,graphite,$(GRAPHITE_TARBALL))) + +$(eval $(call gb_UnpackedTarball_add_patches,graphite,\ + graphite/graphite2.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/graphite/graphite_make.patch b/graphite/graphite_make.patch deleted file mode 100644 index 7b1339f4d800..000000000000 --- a/graphite/graphite_make.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- misc/build/graphite2-1.2.0/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 -+++ misc/build/graphite2-1.2.0/src/makefile.mk Fri Mar 4 10:20:30 2011 +0700 -@@ -1,1 +1,38 @@ --dummy -+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE -+ -+PRJ=..$/..$/..$/..$/.. -+ -+PRJNAME=libgraphite2_off -+TARGET=graphite2_off -+ENABLE_EXCEPTIONS=FALSE -+LIBTARGET=NO -+ -+.INCLUDE : settings.mk -+ -+CFLAGS+=-DDISABLE_TRACING -I../include -DGR2_STATIC -+.IF "$(debug)" == "" -+CFLAGS+=-O3 -DNDEBUG -+.ENDIF -+ -+.IF "$(WORDS_BIGENDIAN)" == "yes" -+CFLAGS += -DWORDS_BIGENDIAN -+.ENDIF -+ -+_NS := GR2 -+ -+GR2_MACHINE=call -+.IF "$(COM)"=="GCC" -+GR2_MACHINE=direct -+CFLAGSCXX+=-fpermissive -+.ENDIF -+ -+.INCLUDE : files.mk -+ -+SLOFILES= $(foreach,i,$(GR2_SOURCES:b) $(SLO)/$i.obj) -+ -+LIB1ARCHIV=$(LB)$/lib$(TARGET).a -+LIB1TARGET=$(SLB)$/$(TARGET).lib -+LIB1OBJFILES=$(SLOFILES) -+OUT2INC=../include/graphite2 -+ -+.INCLUDE : target.mk diff --git a/graphite/makefile.mk b/graphite/makefile.mk deleted file mode 100644 index 639f64bab43c..000000000000 --- a/graphite/makefile.mk +++ /dev/null @@ -1,73 +0,0 @@ -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# TODO: enable warnings again when external module compiles without warnings on all platforms -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE - -PRJ=. - -PRJNAME=graphite -TARGET=libgraphite - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SYSTEM_GRAPHITE)" == "YES" -all: - @echo "An already available installation of graphite2 should exist on your system." - @echo "Therefore the version provided here does not need to be built in addition." -.ENDIF - -# --- Files -------------------------------------------------------- -.IF "$(ENABLE_GRAPHITE)"=="TRUE" -TARFILE_NAME=graphite2-1.2.0 -TARFILE_MD5=f5ef3f7f10fa8c3542c6a085a233080b -PATCH_FILES= graphite2.patch \ - graphite_make.patch - -ADDITIONAL_FILES= \ - src/makefile.mk - -# convert line-endings to avoid problems when patching -CONVERTFILES= - -BUILD_DIR=src -BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS) - -OUT2INC_SUBDIR=graphite2 -OUT2INC=include/graphite2/Font.h \ - include/graphite2/Segment.h \ - include/graphite2/Types.h -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_ext.mk -.INCLUDE : target.mk -.INCLUDE : tg_ext.mk - diff --git a/graphite/prj/d.lst b/graphite/prj/d.lst index 4add1c1483c6..e69de29bb2d1 100644 --- a/graphite/prj/d.lst +++ b/graphite/prj/d.lst @@ -1,12 +0,0 @@ -mkdir: %_DEST%\inc\graphite2 -..\%__SRC%\inc\graphite2\*.h %_DEST%\inc\graphite2\*.h - -..\%__SRC%\lib\*.so.* %_DEST%\lib\*.so.* -..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib -..\%__SRC%\lib\*.a %_DEST%\lib\*.a -..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib -..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\bin\*.pdb %_DEST%\bin\*.pdb - -linklib: libgraphite2.so.*.*.* -linklib: libgraphite2.dylib.*.*.* diff --git a/graphite/prj/dmake b/graphite/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/ooo.lst.in b/ooo.lst.in index b9143488ad60..7d16c6c19779 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -44,7 +44,6 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz -f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz @@ -66,6 +65,7 @@ fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 @FONTCONFIG_TARBALL@ @FREETYPE_TARBALL@ @GOOGLE_DOCS_EXTENSION_PACK@ +@GRAPHITE_TARBALL@ @JFREEREPORT_FLOW_ENGINE_TARBALL@ @JFREEREPORT_FLUTE_TARBALL@ @JFREEREPORT_LIBBASE_TARBALL@ diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index fd92f64c2441..c516e257e729 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CPPUNIT:cppunit CURL:curl EXPAT:expat GETTEXT:gettext GLIB:glib GDK_PIXBUF:gdk-pixbuf PANGO:pango LIBCROCO:libcroco LIBGSF:libgsf HUNSPELL:hunspell HYPHEN:hyphen ICU:icu JPEG:jpeg LCMS2:lcms2 LIBEXTTEXTCAT:libexttextcat LIBLANGTAG:liblangtag LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt LPSOLVE:lpsolve MOZ:moz MYTHES:mythes NSS:nss OPENLDAP:openldap OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external sal solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index 269ee1ee6e51..0f709fd1cc61 100644 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\ $(eval $(call gb_Library_use_externals,vclplug_gen,\ cairo \ + graphite \ icule \ icuuc \ Xrender \ -- cgit v1.2.3