From 16aa2fb61c891f6565865bb63b6c8746bd8539f5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 13 Jun 2014 12:20:33 -0400 Subject: [PATCH] build ardour3_ui_default.conf at build time, to allow font substitutions to be done (which are platform dependent) --- ...r3_ui_default.conf => ardour3_ui_default.conf.in} | 0 gtk2_ardour/{canvas_vars.h.in => canvas_vars.h} | 0 gtk2_ardour/wscript | 12 +++++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) rename gtk2_ardour/{ardour3_ui_default.conf => ardour3_ui_default.conf.in} (100%) rename gtk2_ardour/{canvas_vars.h.in => canvas_vars.h} (100%) diff --git a/gtk2_ardour/ardour3_ui_default.conf b/gtk2_ardour/ardour3_ui_default.conf.in similarity index 100% rename from gtk2_ardour/ardour3_ui_default.conf rename to gtk2_ardour/ardour3_ui_default.conf.in diff --git a/gtk2_ardour/canvas_vars.h.in b/gtk2_ardour/canvas_vars.h similarity index 100% rename from gtk2_ardour/canvas_vars.h.in rename to gtk2_ardour/canvas_vars.h diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 23368bdc74..14114a5baf 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -519,6 +519,7 @@ def build(bld): dark_rc_subst_dict = {} light_rc_subst_dict = {} + ui_conf_dict = {} font_sizes = {} base_font = "" @@ -579,18 +580,21 @@ def build(bld): dark_rc_subst_dict[key] = fontstyle light_rc_subst_dict[key] = fontstyle - + ui_conf_dict[key] = points + # @FONT_SIZE_XXXX@ for sizename,points in iter(font_sizes.items()): key = "_".join (['FONT_SIZE',sizename]) dark_rc_subst_dict[key] = points light_rc_subst_dict[key] = points + ui_conf_dict[key] = points # various font names, eg @BOLD_MONOSPACE@ for font_sym,text in iter(font_names.items()): key = font_sym dark_rc_subst_dict[key] = text light_rc_subst_dict[key] = text + ui_conf_dict[key] = text # RC files dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme( @@ -655,6 +659,12 @@ def build(bld): obj.target = 'ardour3_ui_light.rc' obj.install_path = bld.env['CONFDIR'] + obj = bld(features = 'subst') + obj.source = [ 'ardour3_ui_default.conf.in' ] + obj.target = 'ardour3_ui_default.conf' + obj.install_path = None + set_subst_dict(obj, ui_conf_dict) + # Menus menus_argv = [] if bld.is_defined('GTKOSX'): -- 2.30.2