summaryrefslogtreecommitdiff
path: root/graphite
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-10-25 09:55:13 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-10-25 23:24:32 +0200
commit1ceb47d96da9e7977c96241f49ad291ff0466970 (patch)
tree36a8d5e370d9fa5ccee0d186ce0e9f7c34877147 /graphite
parentbab471569a72618efba223751b54ac40965842d8 (diff)
graphite: convert to gbuild
Change-Id: I47c279d1cf53ef2c092467070d97b13f949d06f6
Diffstat (limited to 'graphite')
-rw-r--r--graphite/Makefile7
-rw-r--r--graphite/Module_graphite.mk21
-rw-r--r--graphite/StaticLibrary_graphite.mk68
-rw-r--r--graphite/UnpackedTarball_graphite.mk18
-rw-r--r--graphite/graphite_make.patch42
-rw-r--r--graphite/makefile.mk73
-rw-r--r--graphite/prj/d.lst12
-rw-r--r--graphite/prj/dmake0
8 files changed, 114 insertions, 127 deletions
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
-# <http://www.openoffice.org/license.html>
-# 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
--- a/graphite/prj/dmake
+++ /dev/null