X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=bb4e2035ec6ad10a9c7bc54fd38cc57cb1738895;hb=f80859f3bdcb5c3b982379481ae3999446f35e81;hp=0b5a95fbdc8a1955147de44b773ab9d38060b6ef;hpb=ca031fb14aa797d3ced10b0e3109b3541604ba66;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 0b5a95fbdc..bb4e2035ec 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -5,16 +5,10 @@ import waflib.Logs as Logs, waflib.Utils as Utils import os import sys import re +import time +from waflib.Task import Task -# Version of this package (even if built as a child) -MAJOR = '3' -MINOR = '0' -MICRO = '0' -GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) - -# Variables for 'waf dist' -APPNAME = 'gtk2_ardour' -VERSION = GTK2_ARDOUR_VERSION +I18N_PACKAGE = 'gtk2_ardour3' # Mandatory variables top = '.' @@ -25,10 +19,10 @@ path_prefix = 'gtk2_ardour/' gtk2_ardour_sources = [ 'about.cc', 'actions.cc', - 'add_midi_cc_track_dialog.cc', 'add_route_dialog.cc', 'ambiguous_file_dialog.cc', 'analysis_window.cc', + 'ardour_button.cc', 'ardour_dialog.cc', 'ardour_ui.cc', 'ardour_ui2.cc', @@ -37,6 +31,7 @@ gtk2_ardour_sources = [ 'ardour_ui_ed.cc', 'ardour_ui_mixer.cc', 'ardour_ui_options.cc', + 'ardour_window.cc', 'audio_clock.cc', 'audio_region_editor.cc', 'audio_region_view.cc', @@ -48,8 +43,9 @@ gtk2_ardour_sources = [ 'automation_streamview.cc', 'automation_time_axis.cc', 'axis_view.cc', + 'big_clock_window.cc', 'bundle_manager.cc', - 'cairo_widget.cc', + 'button_joiner.cc', 'canvas-flag.cc', 'canvas-hit.cc', 'canvas-note-event.cc', @@ -63,8 +59,6 @@ gtk2_ardour_sources = [ 'configinfo.cc', 'control_point.cc', 'control_point_dialog.cc', - 'crossfade_edit.cc', - 'crossfade_view.cc', 'curvetest.cc', 'debug.cc', 'diamond.cc', @@ -87,12 +81,10 @@ gtk2_ardour_sources = [ 'editor_markers.cc', 'editor_mixer.cc', 'editor_mouse.cc', - 'editor_nudge.cc', 'editor_ops.cc', 'editor_regions.cc', 'editor_routes.cc', 'editor_rulers.cc', - 'editor_scrub.cc', 'editor_selection.cc', 'editor_snapshots.cc', 'editor_summary.cc', @@ -131,35 +123,49 @@ gtk2_ardour_sources = [ 'lineset.cc', 'location_ui.cc', 'main.cc', + 'main_clock.cc', 'marker.cc', 'midi_automation_line.cc', 'midi_channel_dialog.cc', 'midi_channel_selector.cc', 'midi_cut_buffer.cc', + 'midi_export_dialog.cc', 'midi_list_editor.cc', 'midi_port_dialog.cc', 'midi_region_view.cc', 'midi_scroomer.cc', + 'midi_selection.cc', 'midi_streamview.cc', 'midi_time_axis.cc', 'midi_tracer.cc', + 'midi_velocity_dialog.cc', 'missing_file_dialog.cc', 'missing_plugin_dialog.cc', + 'mixer_actor.cc', 'mixer_group_tabs.cc', 'mixer_strip.cc', 'mixer_ui.cc', + 'meterbridge.cc', + 'meter_strip.cc', + 'meter_patterns.cc', 'monitor_section.cc', 'mono_panner.cc', + 'mono_panner_editor.cc', 'mouse_cursors.cc', 'nag.cc', 'new_plugin_preset_dialog.cc', 'normalize_dialog.cc', 'note_player.cc', + 'nsm.cc', + 'nsmclient.cc', 'option_editor.cc', 'opts.cc', 'panner2d.cc', + 'panner_editor.cc', + 'panner_interface.cc', 'panner_ui.cc', 'piano_roll_header.cc', + 'pingback.cc', 'playlist_selector.cc', 'plugin_eq_gui.cc', 'plugin_selector.cc', @@ -209,6 +215,7 @@ gtk2_ardour_sources = [ 'step_editor.cc', 'step_entry.cc', 'stereo_panner.cc', + 'stereo_panner_editor.cc', 'streamview.cc', 'strip_silence_dialog.cc', 'tape_region_view.cc', @@ -227,9 +234,23 @@ gtk2_ardour_sources = [ 'utils.cc', 'verbose_cursor.cc', 'version.cc', + 'visibility_group.cc', 'volume_controller.cc', 'waveview.cc', - 'window_proxy.cc' + 'window_manager.cc', +# video-timeline related sources: + 'video_image_frame.cc', + 'add_video_dialog.cc', + 'editor_videotimeline.cc', + 'video_timeline.cc', + 'system_exec.cc', + 'video_monitor.cc', + 'transcode_ffmpeg.cc', + 'transcode_video_dialog.cc', + 'video_server_dialog.cc', + 'utils_videotl.cc', + 'export_video_dialog.cc', + 'export_video_infobox.cc' ] def options(opt): @@ -238,10 +259,11 @@ def options(opt): def configure(conf): conf.load('misc') conf.load('compiler_cxx') + # we don't use hard-coded micro versions with ardour, so hard code it to zero autowaf.build_version_files( path_prefix + 'version.h', path_prefix + 'version.cc', - 'gtk2_ardour', MAJOR, MINOR, MICRO) + 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0) autowaf.configure(conf) if re.search ("linux", sys.platform) != None: @@ -262,6 +284,8 @@ def configure(conf): autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM', atleast_version='2.16') autowaf.check_pkg(conf, 'ogg', uselib_store='OGG', atleast_version='1.1.2') + autowaf.check_pkg(conf, 'x11', uselib_store='X11', atleast_version='1.1', mandatory=False) + autowaf.check_pkg(conf, 'fontconfig', uselib_store='FONTCONFIG') conf.write_config_header('gtk2ardour-config.h', remove=False) @@ -276,18 +300,11 @@ def set_winegcc(self): self.env.LINK_CXX = self.env.LINK_CC = 'wineg++' self.env.CC = 'winegcc' -#pre-processor-like operation to merge GTK RC files -re_spaces = re.compile("\s+") - -def _doPyp(infileName): - """ - Does the main work of preprocessing. - Takes 'infileName' as a filename, opens and processes it, - and returns the processed file as a string - - Note - this works recursively. - """ +def _doPyp(infileName, deps = False): outStr = '' + out = [] + re_spaces = re.compile("\s+") + if infileName == '-': fd = sys.stdin else: @@ -295,19 +312,27 @@ def _doPyp(infileName): inLines = fd.readlines() if fd != sys.stdin: fd.close() + for line in inLines: bits = re_spaces.split(line) if bits[0] == '##include': incName = bits[1] - # assume included file comes from same place as source file - incName = os.path.join (os.path.dirname (infileName), incName); - outStr += _doPyp(incName) + if (deps): + out += [ incName ] + else: + # assume included file comes from same place as source file + incName = os.path.join (os.path.dirname (infileName), incName); + outStr += _doPyp(incName) else: - outStr += line + if not deps: + outStr += line # done - return outStr + if deps: + return out + else: + return outStr def include_processor(task): infileName = task.inputs[0].srcpath() @@ -334,102 +359,122 @@ def build_color_scheme(path, prefix): f.close() return color_scheme - def build(bld): - # GTK front-end; if we're using VST we build this as a shared library, - # otherwise it's a normal executabale - if bld.is_defined('VST_SUPPORT'): - obj = bld(features = 'cxx c cxxshlib') + + VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) + + if bld.is_defined('WINDOWS_VST_SUPPORT'): + # If we require VST support we build a stub main() and the FST library + # here using winegcc, and link it to the GTK front-end library + obj = bld(features = 'cxx c cxxprogram wine') + obj.source = ''' + ../libs/fst/fst.c + ../libs/fst/fstinfofile.c + ../libs/fst/vsti.c + ../libs/fst/vstwin.c + ../vst/winmain.c + ''' + obj.uselib = 'ALSA' + obj.use = [ 'libpbd', + 'libmidipp', + 'libtaglib', + 'libardour', + 'libardour_cp', + 'libgtk2_ardour', + 'libgtkmm2ext', + 'libtaglib'] + obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' + obj.includes = [ '../libs/fst', '.' ] + obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] + obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] + obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') + # end of the wine executable + + # now the shared library containing the GTK GUI for ardour + obj = bld (features = 'cxx c cxxshlib') + obj.source = gtk2_ardour_sources + obj.includes = [ '../libs/fst', '.' ] + obj.name = 'libgtk2_ardour' + obj.target = 'gtk2_ardour' else: + # just the normal executable version of the GTK GUI obj = bld(features = 'cxx c cxxprogram') + obj.source = gtk2_ardour_sources + obj.target = 'ardour-' + bld.env['VERSION'] + obj.includes = ['.'] + + # continue with setup of obj, which could be a shared library + # or an executable. - obj.includes = ['.'] - obj.source = gtk2_ardour_sources - obj.name = 'gtk2_ardour' - obj.linkflags = [] - if bld.is_defined('VST_SUPPORT'): - obj.target = 'gtk2_ardour' - obj.includes += ['../libs/fst'] - else: - obj.target = 'ardour-3.0' obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK OGG ALSA CURL DL' + + obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL' obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS ' - obj.uselib += ' AUDIOUNITS OSX GTKOSX ' + obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' obj.use = [ 'libpbd', 'libmidipp', 'libtaglib', - 'libardour', + 'ardour', 'libardour_cp', 'libgtkmm2ext', 'libtaglib' ] if sys.platform == 'darwin': obj.use += ' libappleutility' obj.defines = [ - 'PACKAGE="gtk2_ardour"', + 'PACKAGE="' + I18N_PACKAGE + '"', 'VERSIONSTRING="' + bld.env['VERSION'] + '"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', - 'MODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"', - 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), - 'locale') + '"', + 'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"', 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' ] obj.includes += ['../libs'] if bld.is_defined('HAVE_SUIL'): obj.source += [ 'lv2_plugin_ui.cc' ] - obj.uselib += ' SUIL ' + obj.use += [ 'SUIL' ] if bld.is_defined('FREESOUND'): obj.source += [ 'sfdb_freesound_mootcher.cc' ] + obj.defines += [ 'FREESOUND' ] - if bld.is_defined('VST_SUPPORT'): - obj.source += [ 'vst_pluginui.cc' ] - obj.defines += [ 'VST_SUPPORT' ] - bld.env.append ('LINKFLAGS', '-lX11') + if bld.is_defined('NEED_INTL'): + obj.linkflags = ' -lintl' + if bld.is_defined('WINDOWS_VST_SUPPORT'): + obj.source += [ 'windows_vst_plugin_ui.cc' ] + obj.defines += [ 'WINDOWS_VST_SUPPORT' ] + obj.use += [ 'X11' ] + if bld.is_defined('LXVST_SUPPORT'): - obj.source += [ 'lxvst_pluginui.cc' ] + obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ] obj.defines += [ 'LXVST_SUPPORT' ] - obj.linkflags += [ '-lX11' ] + obj.use += [ 'X11' ] + if bld.is_defined('WINDOWS_VST_SUPPORT') or bld.is_defined('LXVST_SUPPORT'): + obj.source += [ 'vst_plugin_ui.cc' ] + if bld.is_defined('PHONE_HOME'): obj.defines += [ 'PHONE_HOME' ] - if bld.is_defined('COREAUDIO'): + if bld.is_defined('HAVE_COREAUDIO'): TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] - obj.source += [ 'cocoacarbon.mm', 'au_pluginui.mm' ] + obj.source += [ 'cocoacarbon.mm' ] obj.use += ' libappleutility ' - if bld.is_defined('VST_SUPPORT'): - # If we require VST support we build a stub main() and the FST library - # here using winegcc, and link it to the GTK front-end library - obj = bld(features = 'cxx c cxxprogram wine') - obj.source = ''' - ../libs/fst/fst.c - ../libs/fst/fstinfofile.c - ../libs/fst/vsti.c - ../libs/fst/vstwin.c - ../vst/winmain.c - ''' - obj.includes = '../libs/fst' - obj.target = 'ardour-3.0-vst' - obj.linkflags += ['-mwindows', '-Wl,--export-dynamic', '-lpthread'] - obj.defines = ['_POSIX_SOURCE', 'USE_WS_PREFIX'] - obj.uselib = 'ALSA' - obj.use = ['libpbd','libmidipp','libtaglib','libardour', - 'libardour_cp','libgtkmm2ext','libtaglib', - 'gtk2_ardour'] + if bld.is_defined('AUDIOUNIT_SUPPORT'): + obj.source += [ 'au_pluginui.mm' ] # Wrappers wrapper_subst_dict = { 'INSTALL_PREFIX' : bld.env['PREFIX'], 'LIBDIR' : os.path.normpath(bld.env['LIBDIR']), + 'DATADIR' : os.path.normpath(bld.env['DATADIR']), + 'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']), 'LIBS' : 'build/libs', - 'VERSION' : '3.0', - 'EXECUTABLE' : 'build/gtk2_ardour/ardour-3.0' + 'VERSION' : bld.env['VERSION'], + 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION'] } def set_subst_dict(obj, dict): @@ -451,6 +496,15 @@ def build(bld): obj.install_path = bld.env['BINDIR'] set_subst_dict(obj, wrapper_subst_dict) + if bld.is_defined('WINDOWS_VST_SUPPORT'): + obj = bld(features = 'subst') + obj.source = '../vst/ardourvst.in' + obj.target = 'ardourvst3' + obj.chmod = Utils.O755 + obj.dict = wrapper_subst_dict + obj.install_path = bld.env['BINDIR'] + set_subst_dict(obj, wrapper_subst_dict) + # Font configuration dark_rc_subst_dict = {} @@ -460,32 +514,44 @@ def build(bld): # Set up font sizes if bld.is_defined('GTKOSX'): # OS X fonts - basefont = "Lucida Grande" + basefont = "" font_sizes = { - 'TINY' : '7', 'SMALLER' : '9', 'SMALL' : '10', 'NORMAL' : '11', - 'BIG' : '12', - 'BIGGER' : '14', + 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '28', 'HUGER' : '36', - 'MASSIVE' : '60' + 'MASSIVE' : '60', + } + + # There is no acceptable monospace font available on older versions of OS X + # and no API on those versions to load TTF files that will work with + # GTK/fontconfig/pango. + # + # In addition, the ArdourMono font gets clipped for some reason on OS X + # + # Moreover, Lucida Grande just seems to work even though it is not monospace + # so just use it. + # + font_names = { + 'MONOSPACE' : 'Lucida Grande', } else: # Linux/X11 fonts basefont = '' # unspecified - use system defaults font_sizes = { - 'TINY' : '6', 'SMALLER' : '8', 'SMALL' : '9', 'NORMAL' : '10', - 'BIG' : '14', - 'BIGGER' : '16', + 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '24', 'HUGER' : '34', - 'MASSIVE' : '60' + 'MASSIVE' : '60', + } + font_names = { + 'MONOSPACE' : 'ArdourMono', } # Set up font substitution dictionary @@ -508,6 +574,12 @@ def build(bld): dark_rc_subst_dict[key] = points light_rc_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 + # RC files dark_rc_subst_dict['COLOR_SCHEME'] = build_color_scheme( 'gtk2_ardour/ardour3_ui_dark.rc.in', 'ARDOUR_DARK') @@ -557,26 +629,27 @@ def build(bld): obj.target = 'ardour3_widgets.rc' obj.install_path = None - bld ( - rule = include_processor, - source = 'ardour3_ui_dark.rc.pre', - target = 'ardour3_ui_dark.rc', - install_path = '${SYSCONFDIR}/ardour3' - ) + 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 = '${SYSCONFDIR}/ardour3' - bld ( - rule = include_processor, - source = 'ardour3_ui_light.rc.pre', - target = 'ardour3_ui_light.rc', - install_path = '${SYSCONFDIR}/ardour3' - ) + 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.install_path = '${SYSCONFDIR}/ardour3' # Menus menus_argv = [] if bld.is_defined('GTKOSX'): - menus_argv = [ '-E', '-P', '-DGTKOSX' ] + menus_argv = [ '-E', '-P', '-DGTKOSX', '-DNOVIDEOTIMELINE' ] else: menus_argv = [ '-E', '-P' ] + obj = bld(features = 'command-output') obj.command = 'cpp' obj.command_is_external = True @@ -584,6 +657,7 @@ def build(bld): obj.argv = menus_argv obj.stdin = 'ardour.menus.in' obj.stdout = 'ardour.menus' + obj.dep_vars = ['GTKOSX'] bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), 'ardour.menus') @@ -596,35 +670,49 @@ def build(bld): obj = bld( target = b + '.bindings', source = b + '.bindings.in', - rule = '../tools/fmt-bindings --winkey="%s" --accelmap <${SRC} >${TGT}' % bld.env['WINDOWS_KEY'] + rule = '../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap <${SRC} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] ) ) obj.install_path = os.path.join(bld.env['SYSCONFDIR'], 'ardour3') # not modified at present bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), 'step_editing.bindings') + bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), + 'mixer.bindings') # Icons/Images bld.install_files('${DATADIR}/ardour3/icons', bld.path.ant_glob('icons/*.png')) bld.install_files('${DATADIR}/ardour3/pixmaps', bld.path.ant_glob('pixmaps/*.xpm')) bld.install_files('${DATADIR}/ardour3', 'splash.png') + bld.install_files('${DATADIR}/ardour3', 'ArdourMono.ttf') # Default UI configuration bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_ui_default.conf') - # Generic widget style mappings - bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_widgets.rc') # Default export stuff bld.install_files('${SYSCONFDIR}/ardour3/export', bld.path.ant_glob('export/*.format')) # i18n if bld.is_defined('ENABLE_NLS'): - mo_files = bld.path.ant_glob ('po/*.mo') + mo_files = bld.path.ant_glob('po/*.mo') for mo in mo_files: - lang = os.path.basename (mo).replace ('.mo', '') - bld.install_as (os.path.join(bld.env['PREFIX'], 'share', 'locale', - lang, 'LC_MESSAGES', APPNAME + '.mo'), - mo) + 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) def i18n(bld): - autowaf.build_i18n(bld, srcdir, 'gtk2_ardour', APPNAME, gtk2_ardour_sources) + autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') + +def i18n_pot(bld): + autowaf.build_i18n_pot(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') + +def i18n_po(bld): + autowaf.build_i18n_po(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis') + +def i18n_mo(bld): + autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis')