txNew, txFree and doSingleFileSet are public now, so the extern_tx patches go away. The mergeFonts crash fix is merged upstream. The noverbose patch is replaced by a SAL logger installed through slogger::getLogger. A new fatal-callback patch lets fatal errors raise exceptions, which appSpecificFree used to do. afdko 5.0 replaces makeotfexe with addfeatures, drops the typecomp Type 1 to CFF converter, and rewrites most of c/shared in C++. hotconv now only reads CFF, so makeotf() first converts its Type 1 input to bare CFF with tx, the same step the upstream makeotf driver script performs. Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I1e5b6ac8413eb66d81034f4f1d0b7f2e46e12233 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/4251 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.com> (cherry picked from commit 6c40019917bd6e88f6b54d0a2d53d64729c64166) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/207285 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Xisco Fauli <xiscofauli@libreoffice.org>
272 lines
14 KiB
Makefile
272 lines
14 KiB
Makefile
# -*- 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,afdko))
|
|
|
|
$(eval $(call gb_StaticLibrary_use_unpacked,afdko,afdko))
|
|
|
|
$(eval $(call gb_StaticLibrary_set_warnings_disabled,afdko))
|
|
|
|
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,afdko,cpp))
|
|
|
|
# c/shared/include must come before c/addfeatures/include so that the
|
|
# shared sources find their own pstoken.h. The addfeatures consumers of
|
|
# the other pstoken.h are patched to include it by relative path, see
|
|
# extern_addfeatures.patch.
|
|
$(eval $(call gb_StaticLibrary_set_include,afdko,\
|
|
-I$(gb_UnpackedTarball_workdir)/afdko/c/shared/include \
|
|
-I$(gb_UnpackedTarball_workdir)/afdko/c/shared/resource \
|
|
-I$(gb_UnpackedTarball_workdir)/afdko/c/addfeatures/include \
|
|
-I$(gb_UnpackedTarball_workdir)/afdko/a4/runtime/src \
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_use_externals,afdko,\
|
|
libxml2 \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_defs,afdko, \
|
|
-DANTLR4CPP_STATIC \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_cobjects,afdko,\
|
|
UnpackedTarball/afdko/c/shared/cffread \
|
|
UnpackedTarball/afdko/c/shared/ctutil \
|
|
UnpackedTarball/afdko/c/shared/da \
|
|
UnpackedTarball/afdko/c/shared/dynarr \
|
|
UnpackedTarball/afdko/c/shared/sha1 \
|
|
UnpackedTarball/afdko/c/shared/smem \
|
|
UnpackedTarball/afdko/c/shared/support/except \
|
|
UnpackedTarball/afdko/c/shared/support/fixed \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,afdko,\
|
|
UnpackedTarball/afdko/c/shared/absfont/absfont \
|
|
UnpackedTarball/afdko/c/shared/absfont/absfont_afm \
|
|
UnpackedTarball/afdko/c/shared/absfont/absfont_compare \
|
|
UnpackedTarball/afdko/c/shared/absfont/absfont_desc \
|
|
UnpackedTarball/afdko/c/shared/absfont/absfont_draw \
|
|
UnpackedTarball/afdko/c/shared/absfont/absfont_dump \
|
|
UnpackedTarball/afdko/c/shared/absfont/absfont_metrics \
|
|
UnpackedTarball/afdko/c/shared/absfont/absfont_path \
|
|
UnpackedTarball/afdko/c/shared/afdko_version \
|
|
UnpackedTarball/afdko/c/shared/cfembed \
|
|
UnpackedTarball/afdko/c/shared/cffread_abs \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite_charset \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite_dict \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite_encoding \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite_fdselect \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite_sindex \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite_subr \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite_t2cstr \
|
|
UnpackedTarball/afdko/c/shared/cffwrite/cffwrite_varstore \
|
|
UnpackedTarball/afdko/c/shared/designspace \
|
|
UnpackedTarball/afdko/c/shared/goadb \
|
|
UnpackedTarball/afdko/c/shared/namesupport \
|
|
UnpackedTarball/afdko/c/shared/pdfwrite \
|
|
UnpackedTarball/afdko/c/shared/pstoken \
|
|
UnpackedTarball/afdko/c/shared/sfile \
|
|
UnpackedTarball/afdko/c/shared/sfntread \
|
|
UnpackedTarball/afdko/c/shared/sfntwrite \
|
|
UnpackedTarball/afdko/c/shared/slogger \
|
|
UnpackedTarball/afdko/c/shared/svgwrite \
|
|
UnpackedTarball/afdko/c/shared/svread/svread \
|
|
UnpackedTarball/afdko/c/shared/t1cstr \
|
|
UnpackedTarball/afdko/c/shared/t1read \
|
|
UnpackedTarball/afdko/c/shared/t1write/t1write \
|
|
UnpackedTarball/afdko/c/shared/t2cstr \
|
|
UnpackedTarball/afdko/c/shared/ttread \
|
|
UnpackedTarball/afdko/c/shared/tx_shared \
|
|
UnpackedTarball/afdko/c/shared/uforead \
|
|
UnpackedTarball/afdko/c/shared/ufowrite \
|
|
UnpackedTarball/afdko/c/shared/varsupport \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,afdko,\
|
|
UnpackedTarball/afdko/c/mergefonts/mergeFonts \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_cobjects,afdko,\
|
|
UnpackedTarball/afdko/c/addfeatures/pstoken/pstoken \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,afdko,\
|
|
UnpackedTarball/afdko/c/addfeatures/cb \
|
|
UnpackedTarball/afdko/c/addfeatures/fcdb \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/BASE \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/FeatCtx \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/FeatLexer \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/FeatParser \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/FeatParserBaseVisitor \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/FeatParserVisitor \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/FeatVisitor \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/GDEF \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/GPOS \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/GSUB \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/MVAR \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/OS_2 \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/STAT \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/anon \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/cmap \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/glyphmetrics \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/head \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/hmtx \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/hot \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/hotlogger \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/map \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/maxp \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/name \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/otl \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/post \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/sfnt \
|
|
UnpackedTarball/afdko/c/addfeatures/hotconv/vmtx \
|
|
))
|
|
|
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,afdko,\
|
|
UnpackedTarball/afdko/a4/runtime/src/ANTLRErrorListener \
|
|
UnpackedTarball/afdko/a4/runtime/src/ANTLRErrorStrategy \
|
|
UnpackedTarball/afdko/a4/runtime/src/ANTLRFileStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/ANTLRInputStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/BailErrorStrategy \
|
|
UnpackedTarball/afdko/a4/runtime/src/BaseErrorListener \
|
|
UnpackedTarball/afdko/a4/runtime/src/BufferedTokenStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/CharStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/CommonToken \
|
|
UnpackedTarball/afdko/a4/runtime/src/CommonTokenFactory \
|
|
UnpackedTarball/afdko/a4/runtime/src/CommonTokenStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/ConsoleErrorListener \
|
|
UnpackedTarball/afdko/a4/runtime/src/DefaultErrorStrategy \
|
|
UnpackedTarball/afdko/a4/runtime/src/DiagnosticErrorListener \
|
|
UnpackedTarball/afdko/a4/runtime/src/Exceptions \
|
|
UnpackedTarball/afdko/a4/runtime/src/FailedPredicateException \
|
|
UnpackedTarball/afdko/a4/runtime/src/InputMismatchException \
|
|
UnpackedTarball/afdko/a4/runtime/src/InterpreterRuleContext \
|
|
UnpackedTarball/afdko/a4/runtime/src/IntStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/Lexer \
|
|
UnpackedTarball/afdko/a4/runtime/src/LexerInterpreter \
|
|
UnpackedTarball/afdko/a4/runtime/src/LexerNoViableAltException \
|
|
UnpackedTarball/afdko/a4/runtime/src/ListTokenSource \
|
|
UnpackedTarball/afdko/a4/runtime/src/NoViableAltException \
|
|
UnpackedTarball/afdko/a4/runtime/src/Parser \
|
|
UnpackedTarball/afdko/a4/runtime/src/ParserInterpreter \
|
|
UnpackedTarball/afdko/a4/runtime/src/ParserRuleContext \
|
|
UnpackedTarball/afdko/a4/runtime/src/ProxyErrorListener \
|
|
UnpackedTarball/afdko/a4/runtime/src/RecognitionException \
|
|
UnpackedTarball/afdko/a4/runtime/src/Recognizer \
|
|
UnpackedTarball/afdko/a4/runtime/src/RuleContext \
|
|
UnpackedTarball/afdko/a4/runtime/src/RuleContextWithAltNum \
|
|
UnpackedTarball/afdko/a4/runtime/src/RuntimeMetaData \
|
|
UnpackedTarball/afdko/a4/runtime/src/Token \
|
|
UnpackedTarball/afdko/a4/runtime/src/TokenSource \
|
|
UnpackedTarball/afdko/a4/runtime/src/TokenStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/TokenStreamRewriter \
|
|
UnpackedTarball/afdko/a4/runtime/src/UnbufferedCharStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/UnbufferedTokenStream \
|
|
UnpackedTarball/afdko/a4/runtime/src/Vocabulary \
|
|
UnpackedTarball/afdko/a4/runtime/src/WritableToken \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ActionTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/AmbiguityInfo \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ArrayPredictionContext \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ATNConfig \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ATNConfigSet \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ATN \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ATNDeserializationOptions \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ATNDeserializer \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ATNSimulator \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ATNState \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ATNStateType \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/AtomTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ContextSensitivityInfo \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/DecisionEventInfo \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/DecisionInfo \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/DecisionState \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/EpsilonTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ErrorInfo \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerActionExecutor \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerATNConfig \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerATNSimulator \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerChannelAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerCustomAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerIndexedCustomAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerModeAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerMoreAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerPopModeAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerPushModeAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerSkipAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LexerTypeAction \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LL1Analyzer \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/LookaheadEventInfo \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/NotSetTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/OrderedATNConfigSet \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ParseInfo \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ParserATNSimulator \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/PrecedencePredicateTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/PredicateEvalInfo \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/PredicateTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/PredictionContextCache \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/PredictionContext \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/PredictionContextMergeCache \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/PredictionMode \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/ProfilingATNSimulator \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/RangeTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/RuleTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/SemanticContext \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/SetTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/SingletonPredictionContext \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/StarLoopbackState \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/Transition \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/TransitionType \
|
|
UnpackedTarball/afdko/a4/runtime/src/atn/WildcardTransition \
|
|
UnpackedTarball/afdko/a4/runtime/src/dfa/DFA \
|
|
UnpackedTarball/afdko/a4/runtime/src/dfa/DFASerializer \
|
|
UnpackedTarball/afdko/a4/runtime/src/dfa/DFAState \
|
|
UnpackedTarball/afdko/a4/runtime/src/dfa/LexerDFASerializer \
|
|
UnpackedTarball/afdko/a4/runtime/src/internal/Synchronization \
|
|
UnpackedTarball/afdko/a4/runtime/src/misc/InterpreterDataReader \
|
|
UnpackedTarball/afdko/a4/runtime/src/misc/Interval \
|
|
UnpackedTarball/afdko/a4/runtime/src/misc/IntervalSet \
|
|
UnpackedTarball/afdko/a4/runtime/src/misc/MurmurHash \
|
|
UnpackedTarball/afdko/a4/runtime/src/misc/Predicate \
|
|
UnpackedTarball/afdko/a4/runtime/src/support/Any \
|
|
UnpackedTarball/afdko/a4/runtime/src/support/Arrays \
|
|
UnpackedTarball/afdko/a4/runtime/src/support/CPPUtils \
|
|
UnpackedTarball/afdko/a4/runtime/src/support/StringUtils \
|
|
UnpackedTarball/afdko/a4/runtime/src/support/Utf8 \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/ErrorNodeImpl \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/IterativeParseTreeWalker \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/ParseTree \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/ParseTreeListener \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/ParseTreeVisitor \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/ParseTreeWalker \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/TerminalNodeImpl \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/Trees \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/pattern/Chunk \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/pattern/ParseTreeMatch \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/pattern/ParseTreePattern \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/pattern/ParseTreePatternMatcher \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/pattern/RuleTagToken \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/pattern/TagChunk \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/pattern/TextChunk \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/pattern/TokenTagToken \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPath \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathElement \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathLexer \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathLexerErrorListener \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathRuleAnywhereElement \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathRuleElement \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathTokenAnywhereElement \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathTokenElement \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathWildcardAnywhereElement \
|
|
UnpackedTarball/afdko/a4/runtime/src/tree/xpath/XPathWildcardElement \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|