Makefile.fetch | 3 ++- config_host.mk.in | 2 ++ configure.ac | 27 ++++++++++++++++++++++++++- dev/null |binary download.lst | 1 + extras/CustomTarget_opensymbol.mk | 23 +++++++++++++++++++++++ extras/Module_extras.mk | 4 ++++ extras/Package_fonts.mk | 6 ++++-- 8 files changed, 62 insertions(+), 4 deletions(-)
New commits: commit 4c63572b2ca9648aeebe6df6f71da1308dbd5ac1 Author: Rene Engelhard <r...@rene-engelhard.de> Date: Wed May 23 17:30:04 2018 +0200 micro-optimization: do not check for ant if we don't need it Change-Id: I84644cddd8a318a2af23780ada9afc26fe23a9fe Reviewed-on: https://gerrit.libreoffice.org/54719 Tested-by: Jenkins <c...@libreoffice.org> Tested-by: Rene Engelhard <r...@debian.org> Reviewed-by: Rene Engelhard <r...@debian.org> diff --git a/configure.ac b/configure.ac index f45d8fde9866..b730bd2870ef 100644 --- a/configure.ac +++ b/configure.ac @@ -8503,6 +8503,7 @@ if test "$with_java" != "no"; then AC_MSG_RESULT([internal]) SYSTEM_HSQLDB= BUILD_TYPE="$BUILD_TYPE HSQLDB" + NEED_ANT=TRUE AC_MSG_CHECKING([whether hsqldb should be built with JDBC 4.1]) javanumver=`$JAVAINTERPRETER -version 2>&1 | $AWK -v num=true -f $SRC_ROOT/solenv/bin/getcompver.awk` if expr "$javanumver" '>=' 000100060000 > /dev/null; then @@ -10617,6 +10618,7 @@ if test "$enable_report_builder" != "no" -a "$with_java" != "no"; then AC_MSG_RESULT([internal]) SYSTEM_JFREEREPORT= BUILD_TYPE="$BUILD_TYPE JFREEREPORT" + NEED_ANT=TRUE fi else AC_MSG_RESULT([no]) @@ -10660,6 +10662,7 @@ if test "$ENABLE_REPORTBUILDER" = "TRUE"; then AC_MSG_RESULT([internal]) SYSTEM_APACHE_COMMONS= BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS" + NEED_ANT=TRUE fi fi AC_SUBST(SYSTEM_APACHE_COMMONS) @@ -10722,6 +10725,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then AC_MSG_RESULT([internal]) SYSTEM_RHINO= BUILD_TYPE="$BUILD_TYPE RHINO" + NEED_ANT=TRUE fi else AC_MSG_RESULT([no]) @@ -11650,7 +11654,7 @@ dnl =================================================================== dnl Test for the presence of Ant and that it works dnl =================================================================== -if test "$ENABLE_JAVA" != ""; then +if test "$ENABLE_JAVA" != "" -a "$NEED_ANT" = "TRUE"; then ANT_HOME=; export ANT_HOME WITH_ANT_HOME=; export WITH_ANT_HOME if test -z "$with_ant_home" -a -n "$LODE_HOME" ; then commit f54478ccfa8f4d2dc0289eec37a3191c922ce627 Author: Rene Engelhard <r...@debian.org> Date: Mon May 28 16:54:41 2018 +0200 add --enable-build-opensymbol option to build opens___.ttf from source ... and handle opens___.ttf like unowinreg.dll (-> download.lst/$(TARFILE_LOCATION)) Change-Id: Id4723fb15c4b4b04133dedf97b1262441baa4756 Reviewed-on: https://gerrit.libreoffice.org/54938 Tested-by: Rene Engelhard <r...@debian.org> Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Rene Engelhard <r...@debian.org> diff --git a/Makefile.fetch b/Makefile.fetch index fce291d2c3ac..44f5031aac4a 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -52,7 +52,7 @@ $(filter 32,$(words $(shell echo $(1) | sed -e 's/./& /g'))) endef define fetch_Download__subst_var -$(subst _DLL,_SHA256SUM,$(subst _TARBALL,_SHA256SUM,$(subst _PACK,_SHA256SUM,$(subst _JAR,_SHA256SUM,$(1))))) +$(subst _TTF,_SHA256SUM,$(subst _DLL,_SHA256SUM,$(subst _TARBALL,_SHA256SUM,$(subst _PACK,_SHA256SUM,$(subst _JAR,_SHA256SUM,$(1)))))) endef # fetch_Download_item url variable-name @@ -224,6 +224,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S ,$(call fetch_Download_item,https://dev-www.libreoffice.org/src,$(item))) $(foreach item, \ $(call fetch_Optional,ODK,UNOWINREG_DLL) \ + $(call fetch_Optional,OPENSYMBOL,OPENSYMBOL_TTF) \ $(call fetch_Optional,ODFVALIDATOR,ODFVALIDATOR_JAR) \ $(call fetch_Optional,OFFICEOTRON,OFFICEOTRON_JAR) \ ,$(call fetch_Download_item,https://dev-www.libreoffice.org/extern,$(item))) diff --git a/config_host.mk.in b/config_host.mk.in index 4a864c745424..0e3ba4864755 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -188,6 +188,7 @@ export FLEX=@FLEX@ export FLUTE_JAR=@FLUTE_JAR@ export FONTCONFIG_CFLAGS=$(gb_SPACE)@FONTCONFIG_CFLAGS@ export FONTCONFIG_LIBS=$(gb_SPACE)@FONTCONFIG_LIBS@ +export FONTFORGE=@FONTFORGE@ export FREEHAND_CFLAGS=$(gb_SPACE)@FREEHAND_CFLAGS@ export FREEHAND_LIBS=$(gb_SPACE)@FREEHAND_LIBS@ export FREETYPE_CFLAGS=$(gb_SPACE)@FREETYPE_CFLAGS@ @@ -432,6 +433,7 @@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ export OOO_VENDOR=@OOO_VENDOR@ export OPENSSL_CFLAGS=$(gb_SPACE)@OPENSSL_CFLAGS@ export OPENSSL_LIBS=$(gb_SPACE)@OPENSSL_LIBS@ +export OPENSYMBOL_TTF=@OPENSYMBOL_TTF@ export ORCUS_CFLAGS=$(gb_SPACE)@ORCUS_CFLAGS@ export ORCUS_LIBS=$(gb_SPACE)@ORCUS_LIBS@ export OS=@OS@ diff --git a/configure.ac b/configure.ac index 5dd419305b66..f45d8fde9866 100644 --- a/configure.ac +++ b/configure.ac @@ -1315,6 +1315,12 @@ AC_ARG_ENABLE(build-unowinreg, compiler is needed on Linux.]), ,) +AC_ARG_ENABLE(build-opensymbol, + AS_HELP_STRING([--enable-build-opensymbol], + [Do not use the prebuilt opens___.ttf. Build it instead. This needs + fontforge installed.]), +,) + AC_ARG_ENABLE(dependency-tracking, AS_HELP_STRING([--enable-dependency-tracking], [Do not reject slow dependency extractors.])[ @@ -11294,6 +11300,21 @@ if test "x$with_java" != "xno"; then libo_CHECK_EXTENSION([LanguageTool],[LANGUAGETOOL],[languagetool],[languagetool],[]) fi +AC_MSG_CHECKING([whether to build opens___.ttf]) +if test "$enable_build_opensymbol" = "yes"; then + AC_MSG_RESULT([yes]) + AC_PATH_PROG(FONTFORGE, fontforge) + if test -z "$FONTFORGE"; then + AC_MSG_ERROR([fontforge not installed]) + fi +else + AC_MSG_RESULT([no]) + OPENSYMBOL_TTF=49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf + BUILD_TYPE="$BUILD_TYPE OPENSYMBOL" +fi +AC_SUBST(OPENSYMBOL_TTF) +AC_SUBST(FONTFORGE) + TEST_FONTS_MISSING=0 # $1 = font family diff --git a/download.lst b/download.lst index 1a5e697767b6..492b90b6b82c 100644 --- a/download.lst +++ b/download.lst @@ -256,3 +256,4 @@ export ZMF_TARBALL := libzmf-0.0.2.tar.xz NUMBERTEXT_EXTENSION_SHA256SUM := 1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2 UNOWINREG_SHA256SUM := eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 +OPENSYMBOL_SHA256SUM := 49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63 diff --git a/extras/CustomTarget_opensymbol.mk b/extras/CustomTarget_opensymbol.mk new file mode 100644 index 000000000000..a27718feb377 --- /dev/null +++ b/extras/CustomTarget_opensymbol.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_CustomTarget_CustomTarget,extras/fonts)) + +$(eval $(call gb_CustomTarget_register_targets,extras/fonts,opens___.ttf)) + +ifneq (,$(FONTFORGE)) +$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \ + $(SRCDIR)/extras/source/truetype/symbol/OpenSymbol.sfd + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),FNT,1) + $(FONTFORGE) -lang=ff -c 'Open($$1); Generate($$2)' $< $@ +else +$(call gb_CustomTarget_get_workdir,extras/fonts)/opens___.ttf : \ + $(TARFILE_LOCATION)/$(OPENSYMBOL_TTF) + cp $< $@ +endif diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 2aa41bda3901..164d38aefd1c 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -68,4 +68,8 @@ $(eval $(call gb_Module_add_targets,extras,\ )) endif +$(eval $(call gb_Module_add_targets,extras,\ + CustomTarget_opensymbol \ +)) + # vim: set noet sw=4 ts=4: diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk index 952c8286a5e7..8d2d23cbed6b 100644 --- a/extras/Package_fonts.mk +++ b/extras/Package_fonts.mk @@ -7,8 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras)) +$(eval $(call gb_Package_Package,extras_fonts,$(call gb_CustomTarget_get_workdir,extras/fonts))) -$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf)) +$(eval $(call gb_Package_use_customtarget,extras_fonts,extras/fonts)) + +$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,opens___.ttf)) # vim: set noet sw=4 ts=4: diff --git a/extras/source/truetype/symbol/opens___.ttf b/extras/source/truetype/symbol/opens___.ttf deleted file mode 100644 index 5a10feb2b8da..000000000000 Binary files a/extras/source/truetype/symbol/opens___.ttf and /dev/null differ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits