Commit 0ea3c003 authored by Jérome Perrin's avatar Jérome Perrin

software/plantuml: switch to new $FONTCONFIG_FILE

parent e5687602
...@@ -15,12 +15,8 @@ ...@@ -15,12 +15,8 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = f35aa36b41cd197ab3d763dcb884e96a md5sum = d1dff3fc39eefc57b36dbaa195b6890e
[tomcat-server-xml] [tomcat-server-xml]
filename = server.xml.in filename = server.xml.in
md5sum = fdfa7eb249082855039ca98f310324e9 md5sum = fdfa7eb249082855039ca98f310324e9
[font.conf]
filename = font.conf.in
md5sum = caa3463c9c3766ac5f2396a517d6f926
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<cachedir>$${:fontcache}</cachedir>
<!-- installed fonts: $${:installed-fonts} -->
<dir>${fonts:location}</dir>
<dir>$${:fonts}</dir>
<include>${fontconfig:location}/etc/fonts/conf.d</include>
</fontconfig>
\ No newline at end of file
...@@ -10,20 +10,23 @@ offline = true ...@@ -10,20 +10,23 @@ offline = true
extends = ${monitor2-template:rendered} extends = ${monitor2-template:rendered}
[fontconfig-conf] [fontconfig-conf]
recipe = slapos.recipe.template recipe = slapos.recipe.template:jinja2
url = ${font.conf:output} template = ${template-fonts-conf:output}
output = $${directory:etc}/font.conf rendered = $${directory:etc}/fonts.conf
context =
fonts = $${directory:fonts} key cachedir directory:fontconfig-cache
fontcache = $${directory:fontcache} key fonts :fonts
installed-fonts = key includes :includes
${liberation-fonts:location} fonts =
${ipaex-fonts:location}
${ipa-fonts:location}
${ocrb-fonts:location}
${android-fonts:location} ${android-fonts:location}
${dejavu-fonts:location} ${dejavu-fonts:location}
${ipa-fonts:location}
${ipaex-fonts:location}
${liberation-fonts:location}
${ocrb-fonts:location}
$${directory:fonts}
includes =
${fontconfig:location}/etc/fonts/conf.d
[tomcat-server-xml] [tomcat-server-xml]
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${tomcat-server-xml:output} url = ${tomcat-server-xml:output}
...@@ -59,7 +62,7 @@ environment = ...@@ -59,7 +62,7 @@ environment =
JRE_HOME=${java-re-8:location} JRE_HOME=${java-re-8:location}
CATALINA_BASE=$${directory:catalina_base} CATALINA_BASE=$${directory:catalina_base}
GRAPHVIZ_DOT=${graphviz:location}/bin/dot GRAPHVIZ_DOT=${graphviz:location}/bin/dot
FONTCONFIG_FILE=$${fontconfig-conf:output} FONTCONFIG_FILE=$${fontconfig-conf:rendered}
LD_LIBRARY_PATH=${fontconfig:location}/lib:${freetype:location}/lib LD_LIBRARY_PATH=${fontconfig:location}/lib:${freetype:location}/lib
# XXX java is still loading system fonts ... ( even with $JAVA_FONTS or -Djava.awt.fonts ) # XXX java is still loading system fonts ... ( even with $JAVA_FONTS or -Djava.awt.fonts )
# related links: # related links:
...@@ -110,9 +113,8 @@ srv = $${buildout:directory}/srv ...@@ -110,9 +113,8 @@ srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin bin = $${buildout:directory}/bin
tmp = $${buildout:directory}/tmp tmp = $${buildout:directory}/tmp
services = $${:etc}/service services = $${:etc}/service
fontconfig-cache = $${buildout:directory}/.fontconfig
fonts = $${:srv}/fonts/ fonts = $${:srv}/fonts/
fontcache = $${buildout:directory}/.fontcache/
# tomcat directories # tomcat directories
catalina_base = $${:var}/tomcat catalina_base = $${:var}/tomcat
......
...@@ -25,11 +25,6 @@ recipe = slapos.recipe.template ...@@ -25,11 +25,6 @@ recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename} url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/${:_buildout_section_name_} output = ${buildout:directory}/${:_buildout_section_name_}
[font.conf]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/${:_buildout_section_name_}
[plantuml.war] [plantuml.war]
recipe = slapos.recipe.build:download recipe = slapos.recipe.build:download
url = https://downloads.sourceforge.net/project/plantuml/1.2018.13/plantuml.1.2018.13.war url = https://downloads.sourceforge.net/project/plantuml/1.2018.13/plantuml.1.2018.13.war
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment