X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=cb01d67752de28f7de650068f70964d45b695c9a;hb=10ad55fcf59c6a89ed42c9a78024e184e153d81e;hp=e99d97b5161efa931dac86923a1911067dec64dd;hpb=5424119b559fc6f68ca0d85c22a4866739c2ab73;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index e99d97b516..cb01d67752 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -8,6 +8,7 @@ import sys import re import time from waflib.Task import Task +from waflib.Tools import winres I18N_PACKAGE = 'gtk2_ardour3' @@ -54,6 +55,7 @@ gtk2_ardour_sources = [ 'configinfo.cc', 'control_point.cc', 'control_point_dialog.cc', + 'cursor_context.cc', 'curvetest.cc', 'debug.cc', 'edit_note_dialog.cc', @@ -97,6 +99,7 @@ gtk2_ardour_sources = [ 'fft.cc', 'fft_graph.cc', 'fft_result.cc', + 'floating_text_entry.cc', 'sfdb_freesound_mootcher.cc', 'gain_meter.cc', 'generic_pluginui.cc', @@ -106,6 +109,7 @@ gtk2_ardour_sources = [ 'gtk_pianokeyboard.c', 'gui_object.cc', 'insert_time_dialog.cc', + 'instrument_selector.cc', 'interthread_progress_window.cc', 'io_selector.cc', 'hit.cc', @@ -151,6 +155,7 @@ gtk2_ardour_sources = [ 'note.cc', 'note_base.cc', 'note_player.cc', + 'note_select_dialog.cc', 'nsm.cc', 'nsmclient.cc', 'option_editor.cc', @@ -198,6 +203,7 @@ gtk2_ardour_sources = [ 'ruler_dialog.cc', 'search_path_option.cc', 'selection.cc', + 'selection_memento.cc', 'send_ui.cc', 'session_dialog.cc', 'session_import_dialog.cc', @@ -246,7 +252,8 @@ gtk2_ardour_sources = [ 'video_server_dialog.cc', 'utils_videotl.cc', 'export_video_dialog.cc', - 'export_video_infobox.cc' + 'export_video_infobox.cc', + 'video_tool_paths.cc' ] def options(opt): @@ -281,6 +288,12 @@ def configure(conf): conf.write_config_header('gtk2ardour-config.h', remove=False) + bak = conf.env['define_key'] + conf.define('VERSIONSTRING', str (conf.env['VERSION'])) + conf.env['define_key'] = ['VERSIONSTRING'] + conf.write_config_header('gtk2ardour-version.h') + conf.env['define_key'] = bak; + # Boost headers autowaf.check_header(conf, 'cxx', 'boost/shared_ptr.hpp') autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp') @@ -392,7 +405,10 @@ def build(bld): obj.target = 'gtk2_ardour' else: # just the normal executable version of the GTK GUI - obj = bld (features = 'cxx c cxxprogram') + if bld.env['build_target'] == 'mingw': + obj = bld (features = 'cxx c cxxprogram winres') + else: + obj = bld (features = 'cxx c cxxprogram') obj.source = gtk2_ardour_sources obj.target = 'ardour-' + str (bld.env['VERSION']) obj.includes = ['.'] @@ -400,7 +416,6 @@ def build(bld): if bld.is_defined('WINDOWS_VST_SUPPORT'): # Windows VST support mingw - obj.source += [ '../vst/winmain.c' ] obj.includes += [ '../libs/fst' ] # at this point, "obj" refers to either the normal native executable @@ -417,10 +432,9 @@ def build(bld): obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"', - 'VERSIONSTRING="' + str (bld.env['VERSION']) + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', - 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', + 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', ] obj.install_path = bld.env['DLLDIR'] obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL' @@ -434,6 +448,7 @@ def build(bld): obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ] elif bld.env['build_target'] == 'mingw': obj.source += [ 'bundle_env_mingw.cc' ] + obj.source += [ 'windows_icon.rc' ] else: obj.source += [ 'bundle_env_linux.cc' ] @@ -516,9 +531,7 @@ def build(bld): # Font configuration - dark_rc_subst_dict = {} - light_rc_subst_dict = {} - ui_conf_dict = {} + font_subst_dict = {} font_sizes = {} base_font = "" @@ -552,15 +565,15 @@ def build(bld): else: # Linux/X11 fonts basefont = '' # unspecified - use system defaults font_sizes = { - 'SMALLER' : '8', - 'SMALL' : '9', - 'NORMAL' : '10', - 'BIG' : '14', - 'BIGGER' : '17', - 'LARGE' : '18', - 'LARGER' : '24', - 'HUGER' : '34', - 'MASSIVE' : '60', + 'SMALLER' : '6', + 'SMALL' : '7', + 'NORMAL' : '8', + 'BIG' : '11', + 'BIGGER' : '13.5', + 'LARGE' : '14.5', + 'LARGER' : '19', + 'HUGER' : '27', + 'MASSIVE' : '48', } font_names = { 'MONOSPACE' : 'ArdourMono', @@ -576,93 +589,32 @@ def build(bld): else: key = "_".join (['FONT',sizename]) fontstyle = " ".join ([basefont,points]) - - dark_rc_subst_dict[key] = fontstyle - light_rc_subst_dict[key] = fontstyle - ui_conf_dict[key] = points + + font_subst_dict[key] = fontstyle # @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 + font_subst_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( - 'gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK') - dark_rc_subst_dict['COLPREFIX'] = 'ARDOUR_DARK' - light_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme( - 'gtk2_ardour/ardour3_ui_light.rc.in', 'ARDOUR_LIGHT') - light_rc_subst_dict['COLPREFIX'] = 'ARDOUR_LIGHT' - - obj = bld(features = 'subst') - obj.source = [ 'ardour3_ui_dark.rc.in' ] - obj.target = 'ardour3_ui_dark.rc.pre' - obj.install_path = None - set_subst_dict(obj, dark_rc_subst_dict) - - obj = bld(features = 'subst') - obj.source = [ 'ardour3_ui_light.rc.in' ] - obj.target = 'ardour3_ui_light.rc.pre' - obj.install_path = None - set_subst_dict(obj, light_rc_subst_dict) + font_subst_dict[key] = text - obj = bld(features = 'subst') - obj.source = [ 'ardour3_styles.rc.in' ] - obj.target = 'ardour3_dark_styles.rc' - obj.install_path = None - set_subst_dict(obj, dark_rc_subst_dict) + # RC file obj = bld(features = 'subst') - obj.source = [ 'ardour3_styles.rc.in' ] - obj.target = 'ardour3_light_styles.rc' - obj.install_path = None - set_subst_dict(obj, light_rc_subst_dict) - - obj = bld(features = 'subst') - obj.source = [ 'ardour3_fonts.rc.in' ] - obj.target = 'ardour3_dark_fonts.rc' - obj.install_path = None - set_subst_dict(obj, dark_rc_subst_dict) - - obj = bld(features = 'subst') - obj.source = [ 'ardour3_fonts.rc.in' ] - obj.target = 'ardour3_light_fonts.rc' - obj.install_path = None - set_subst_dict(obj, light_rc_subst_dict) - - obj = bld(rule = autowaf.copyfile) - obj.source = [ 'ardour3_widget_list.rc' ] - obj.target = 'ardour3_widgets.rc' - obj.install_path = None - - obj = bld (rule = include_processor) - obj.source = [ 'ardour3_ui_dark.rc.pre' ] - # find and add all ##include dependencies as sources - obj.source += _doPyp (bld.path.find_resource ('ardour3_ui_dark.rc.in').srcpath(), True) - obj.target = 'ardour3_ui_dark.rc' - obj.install_path = bld.env['CONFDIR'] - - obj = bld (rule = include_processor) - obj.source = [ 'ardour3_ui_light.rc.pre' ] - # find and add all ##include dependencies as sources - obj.source += _doPyp (bld.path.find_resource ('ardour3_ui_light.rc.in').srcpath(), True) - obj.target = 'ardour3_ui_light.rc' + obj.source = [ 'clearlooks.rc.in' ] + obj.target = 'clearlooks.rc' obj.install_path = bld.env['CONFDIR'] + set_subst_dict(obj, font_subst_dict) 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) + obj.source = [ 'default_ui_config.in' ] + obj.target = 'default_ui_config' + obj.install_path = bld.env['CONFDIR'] + set_subst_dict(obj, font_subst_dict) # Menus menus_argv = [] @@ -702,6 +654,7 @@ def build(bld): obj.install_path = bld.env['CONFDIR'] # not modified at present + bld.install_files(bld.env['CONFDIR'], 'dark.colors') bld.install_files(bld.env['CONFDIR'], 'step_editing.bindings') bld.install_files(bld.env['CONFDIR'], 'mixer.bindings') @@ -713,7 +666,9 @@ def build(bld): bld.install_files(bld.env['DATADIR'], 'ArdourMono.ttf') # Default UI configuration - bld.install_files(bld.env['CONFDIR'], 'ardour3_ui_default.conf') + bld.install_files(bld.env['CONFDIR'], 'default_ui_config') + # Color Themes + bld.install_files(bld.env['CONFDIR'], 'dark.colors') # Default export stuff bld.install_files(os.path.join(bld.env['CONFDIR'],' export'), bld.path.ant_glob('export/*.format')) @@ -723,9 +678,8 @@ def build(bld): mo_files = bld.path.ant_glob('po/*.mo') for mo in mo_files: lang = os.path.basename(mo.srcpath()).replace('.mo', '') - bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale', - lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'), - mo) + bld.install_as (os.path.join(os.path.normpath(bld.env['LOCALEDIR']), lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'), + mo) def i18n(bld): autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources,