X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=ddae851127e33039f132ec941ab962c937639f82;hb=6fbaa5403bcefba3186fb5490017e110210122e3;hp=39951e35622e085a70f60124fe55a6ae71c8f62a;hpb=3804e3bc497f68d4b68f51794815db3ffe5e7a91;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 39951e3562..ddae851127 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -2,12 +2,15 @@ import autowaf import os import glob -from w18n import build_i18n +import Options +import sys +import TaskGen +import re # Version of this package (even if built as a child) -MAJOR = '1' +MAJOR = '3' MINOR = '0' -MICRO = '2' +MICRO = '0' GTK2_ARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO) # Variables for 'waf dist' @@ -48,6 +51,7 @@ gtk2_ardour_sources = [ 'bundle_manager.cc', 'cairo_widget.cc', 'canvas-flag.cc', + 'canvas-hit.cc', 'canvas-note-event.cc', 'canvas-note.cc', 'canvas-program-change.cc', @@ -55,6 +59,7 @@ gtk2_ardour_sources = [ 'canvas-simplerect.c', 'canvas-sysex.cc', 'canvas-waveview.c', + 'configinfo.cc', 'control_point.cc', 'control_point_dialog.cc', 'crossfade_edit.cc', @@ -74,9 +79,9 @@ gtk2_ardour_sources = [ 'editor_route_groups.cc', 'editor_export_audio.cc', 'editor_group_tabs.cc', - 'editor_hscroller.cc', 'editor_keyboard.cc', 'editor_keys.cc', + 'editor_locations.cc', 'editor_markers.cc', 'editor_mixer.cc', 'editor_mouse.cc', @@ -87,7 +92,6 @@ gtk2_ardour_sources = [ 'editor_rulers.cc', 'editor_scrub.cc', 'editor_selection.cc', - 'editor_selection_list.cc', 'editor_snapshots.cc', 'editor_summary.cc', 'editor_tempodisplay.cc', @@ -112,24 +116,30 @@ gtk2_ardour_sources = [ 'group_tabs.cc', 'gtk-custom-hruler.c', 'gtk-custom-ruler.c', + 'interthread_progress_window.cc', 'io_selector.cc', 'keyboard.cc', 'keyeditor.cc', 'latency_gui.cc', + 'led.cc', 'level_meter.cc', 'lineset.cc', 'location_ui.cc', 'main.cc', 'marker.cc', 'midi_channel_selector.cc', + 'midi_cut_buffer.cc', + 'midi_list_editor.cc', 'midi_port_dialog.cc', 'midi_region_view.cc', 'midi_scroomer.cc', 'midi_streamview.cc', 'midi_time_axis.cc', + 'midi_tracer.cc', 'mixer_group_tabs.cc', 'mixer_strip.cc', 'mixer_ui.cc', + 'monitor_section.cc', 'nag.cc', 'option_editor.cc', 'opts.cc', @@ -152,7 +162,9 @@ gtk2_ardour_sources = [ 'processor_box.cc', 'prompter.cc', 'public_editor.cc', + 'quantize_dialog.cc', 'rc_option_editor.cc', + 'region_editor.cc', 'region_gain_line.cc', 'region_selection.cc', 'region_view.cc', @@ -185,16 +197,16 @@ gtk2_ardour_sources = [ 'time_fx_dialog.cc', 'time_selection.cc', 'track_selection.cc', + 'track_view_list.cc', 'ui_config.cc', 'utils.cc', 'version.cc', + 'volume_controller.cc', 'waveview.cc', ] def set_options(opt): autowaf.set_options(opt) - opt.add_option('--potupdate', action='store_true', dest='potupdate', - help='Rebuild pot file for translators') def configure(conf): autowaf.build_version_files(path_prefix+'version.h', path_prefix+'version.cc', @@ -202,7 +214,13 @@ def configure(conf): autowaf.configure(conf) conf.check_tool('compiler_cxx') - autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') + if re.search ("linux", sys.platform) != None: + autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') + # + # TODO: Insert a sanity check for on OS X + # to ensure that CoreAudio is present.... + # Really shouldn't these checks be in AutoWaf? + # autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread', uselib_store='GTHREAD', atleast_version='2.10.1') autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1') @@ -214,10 +232,7 @@ def configure(conf): conf.check_tool('misc') # subst tool conf.write_config_header('gtk2ardour-config.h') - - # TODO - conf.define('WINDOWS_KEY', 'Mod4') - + # Boost headers autowaf.check_header(conf, 'boost/shared_ptr.hpp') autowaf.check_header(conf, 'boost/weak_ptr.hpp') @@ -231,17 +246,19 @@ def build(bld): obj.target = 'ardour-3.0' obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA' - obj.uselib += ' GTKMM GNOMECANVASMM' + obj.uselib += ' GTKMM GNOMECANVASMM OSX GTKOSX COREAUDIO' obj.uselib_local = '''libpbd libmidipp libtaglib libardour libardour_cp libgtkmm2ext libtaglib''' obj.cflags = ['-DPACKAGE="gtk2_ardour"'] obj.cxxflags = ['-DPACKAGE="gtk2_ardour"'] - obj.cxxflags += ['-DVERSIONSTRING="' + GTK2_ARDOUR_VERSION + '"'] - obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIRNAME']) + '"'] - obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '"'] - obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIRNAME']) + '"'] + obj.cxxflags += ['-DVERSIONSTRING="' + bld.env['VERSION'] + '"'] + obj.cxxflags += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"'] + obj.cxxflags += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"'] + obj.cxxflags += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"'] obj.cxxflags += ['-DLOCALEDIR="' + os.path.join( - os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"'] + os.path.normpath(bld.env['DATADIR']), 'locale') + '"'] + obj.cxxflags += ['-DPROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"'] + if bld.env['HAVE_SLV2']: obj.source += [ 'lv2_plugin_ui.cc' ] obj.uselib += ' SLV2 ' @@ -254,16 +271,13 @@ def build(bld): obj.cxxflags += [ '-DVST_SUPPORT' ] if bld.env['GTKOSX']: - obj.features += ' objc ' + TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] obj.source += [ 'cocoacarbon.mm' ] - obj.cxxflags += [ '-DTOP_MENUBAR', '-DGTKOSX' ] - obj.linkflags += [ '-framework', 'AppKit', '-framework', 'CoreAudioKit' ] - + if bld.env['AUDIOUNITS']: obj.source += [ 'au_pluginui.mm' ] - obj.cxxflags += [ '-DHAVE_AUDIOUNITS' ] obj.uselib_local += ' libappleutility ' - + else: obj.source += [ 'x11.cc' ] @@ -296,18 +310,6 @@ def build(bld): font_sizes = {} base_font = "" - # Set up font substitution dictionary - for style in ['', 'BOLD', 'ITALIC']: - for sizename,points in font_sizes.iteritems(): - if (len (style)): - key = "_".join (['FONT',style,sizename]) - fontstyle = " ".join ([basefont,style.lower(),points]) - else: - key = "_".join (['FONT',sizename]) - fontstyle = " ".join ([basefont,points]) - key = '%' + key + '%' - font_subst_dict[key] = fontstyle - # Set up font sizes if bld.env['IS_OSX']: # OS X fonts basefont = "Lucida Grande" @@ -338,8 +340,22 @@ def build(bld): 'MASSIVE' : '60' } - # RC files + # Set up font substitution dictionary + for style in ['', 'BOLD', 'ITALIC']: + for sizename,points in font_sizes.iteritems(): + if (len (style)): + key = "_".join (['FONT',style,sizename]) + fontstyle = " ".join ([basefont,style.lower(),points]) + else: + key = "_".join (['FONT',sizename]) + fontstyle = " ".join ([basefont,points]) + + font_subst_dict[key] = fontstyle + + # add normal monospace to font dict + font_subst_dict['FONT_MONOSPACE_NORMAL'] = 'monospace 10' + # RC files obj = bld.new_task_gen('subst') obj.source = 'ardour3_ui_dark.rc.in' obj.target = 'ardour3_ui_dark.rc' @@ -367,7 +383,7 @@ def build(bld): # Menus menus_argv = [] if bld.env['GTKOSX']: - menus_argv = [ '-E', '-P', '-DGTKOSX', '-DTOP_MENUBAR' ] + menus_argv = [ '-E', '-P', '-DGTKOSX' ] else: menus_argv = [ '-E', '-P' ] obj = bld.new_task_gen('command-output') @@ -377,35 +393,28 @@ def build(bld): obj.argv = menus_argv obj.stdin = 'ardour.menus.in' obj.stdout = 'ardour.menus' - obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') + bld.install_files(os.path.join(bld.env['CONFIGDIR'], 'ardour3'), 'ardour.menus') # Keybindings - keybindings_dict = {} - if bld.env['GTKOSX']: - keybindings_dict['PRIMARY'] = 'Meta' - keybindings_dict['SECONDARY'] = 'Mod1' - keybindings_dict['TERTIARY'] = 'Shift' - keybindings_dict['LEVEL4'] = 'Ctrl' - keybindings_dict['WINDOW'] = 'Mod1' - else: - keybindings_dict['PRIMARY'] = 'Ctrl' - keybindings_dict['SECONDARY'] = 'Alt' - keybindings_dict['TERTIARY'] = 'Shift' - keybindings_dict['LEVEL4'] = bld.env['WINDOWS_KEY'] - keybindings_dict['WINDOW'] = 'Alt' - - for b in [ 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', - 'mnemonic-us', 'ergonomic-us' ]: - obj = bld.new_task_gen('subst') - obj.target = b + '.bindings' - obj.source = obj.target + '.in' - obj.dict = keybindings_dict + + # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', 'SAE-us-nokeypad', 'ergonomic-us' + + for b in [ 'mnemonic-us' ] : + obj = bld.new_task_gen ( + target = b + '.bindings', + source = b + '.bindings.in', + rule = '../tools/fmt-bindings --winkey=%s --accelmap <${SRC} >${TGT}' % bld.env['windows_key'] + ) + obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3') # Icons/Images bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png') bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm') bld.install_files('${DATADIR}/ardour3', 'splash.png') + # Default UI configuration + bld.install_files('${CONFIGDIR}/ardour3', 'ardour3_ui_default.conf') + # i18n if bld.env['ENABLE_NLS']: mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo')) @@ -414,4 +423,5 @@ def build(bld): bld.install_as (os.path.join (bld.env['PREFIX'], 'share', 'locale', lang, 'LC_MESSAGES', APPNAME + '.mo'), mo) def i18n(bld): - build_i18n (bld, 'gtk2_ardour', APPNAME, gtk2_ardour_sources) + autowaf.build_i18n (bld, 'gtk2_ardour', APPNAME, gtk2_ardour_sources) +