X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=c9d6fc8c494fc39aced0bc4eb6a56687e4e06446;hb=ee8fb7758aa01a2b64e9547f866360a4e245a80a;hp=5beeebb74d66054f4ac526e8eb5259ff8bbddca8;hpb=3b20beb8d80e6b0ac12ef17e4f10e1d5dcc9fe55;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index 5beeebb74d..c9d6fc8c49 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -3,20 +3,12 @@ from waflib.extras import autowaf as autowaf from waflib import Options, TaskGen import waflib.Logs as Logs, waflib.Utils as Utils import os +import shutil 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_ardour3' -VERSION = GTK2_ARDOUR_VERSION I18N_PACKAGE = 'gtk2_ardour3' # Mandatory variables @@ -33,6 +25,7 @@ gtk2_ardour_sources = [ 'analysis_window.cc', 'ardour_button.cc', 'ardour_dialog.cc', + 'ardour_dropdown.cc', 'ardour_ui.cc', 'ardour_ui2.cc', 'ardour_ui_dependents.cc', @@ -52,24 +45,15 @@ gtk2_ardour_sources = [ 'automation_streamview.cc', 'automation_time_axis.cc', 'axis_view.cc', + 'big_clock_window.cc', 'bundle_manager.cc', 'button_joiner.cc', - 'canvas-flag.cc', - 'canvas-hit.cc', - 'canvas-note-event.cc', - 'canvas-note.cc', - 'canvas_patch_change.cc', - 'canvas-simpleline.c', - 'canvas-simplerect.c', - 'canvas-sysex.cc', - 'canvas-waveview.c', 'clock_group.cc', 'configinfo.cc', 'control_point.cc', 'control_point_dialog.cc', 'curvetest.cc', 'debug.cc', - 'diamond.cc', 'edit_note_dialog.cc', 'editing.cc', 'editor.cc', @@ -111,6 +95,7 @@ gtk2_ardour_sources = [ 'fft.cc', 'fft_graph.cc', 'fft_result.cc', + 'sfdb_freesound_mootcher.cc', 'gain_meter.cc', 'generic_pluginui.cc', 'ghostregion.cc', @@ -123,12 +108,12 @@ gtk2_ardour_sources = [ 'insert_time_dialog.cc', 'interthread_progress_window.cc', 'io_selector.cc', + 'hit.cc', 'keyboard.cc', 'keyeditor.cc', 'latency_gui.cc', 'led.cc', 'level_meter.cc', - 'lineset.cc', 'location_ui.cc', 'main.cc', 'main_clock.cc', @@ -153,6 +138,9 @@ gtk2_ardour_sources = [ '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', @@ -160,13 +148,18 @@ gtk2_ardour_sources = [ 'nag.cc', 'new_plugin_preset_dialog.cc', 'normalize_dialog.cc', + 'note.cc', + 'note_base.cc', 'note_player.cc', + 'nsm.cc', + 'nsmclient.cc', 'option_editor.cc', 'opts.cc', 'panner2d.cc', 'panner_editor.cc', 'panner_interface.cc', 'panner_ui.cc', + 'patch_change.cc', 'piano_roll_header.cc', 'pingback.cc', 'playlist_selector.cc', @@ -205,13 +198,13 @@ gtk2_ardour_sources = [ 'search_path_option.cc', 'selection.cc', 'send_ui.cc', + 'session_dialog.cc', 'session_import_dialog.cc', 'session_metadata_dialog.cc', 'session_option_editor.cc', 'sfdb_ui.cc', 'shuttle_control.cc', - 'simpleline.cc', - 'simplerect.cc', + 'soundcloud_export_selector.cc', 'splash.cc', 'speaker_dialog.cc', 'startup.cc', @@ -221,6 +214,7 @@ gtk2_ardour_sources = [ 'stereo_panner_editor.cc', 'streamview.cc', 'strip_silence_dialog.cc', + 'sys_ex.cc', 'tape_region_view.cc', 'tempo_dialog.cc', 'tempo_lines.cc', @@ -239,8 +233,19 @@ gtk2_ardour_sources = [ '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', + '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): @@ -249,17 +254,18 @@ 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: - autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA') - # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present + autowaf.check_pkg(conf, 'fftw3f', uselib_store='FFTW3F', + mandatory=True) autowaf.check_pkg(conf, 'flac', uselib_store='FLAC', atleast_version='1.2.1') autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD', @@ -268,10 +274,6 @@ def configure(conf): atleast_version='2.18') autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.18') - autowaf.check_pkg(conf, 'libgnomecanvas-2.0', - uselib_store='GNOMECANVAS', atleast_version='2.30') - 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') @@ -350,31 +352,35 @@ def build_color_scheme(path, prefix): def build(bld): - if bld.is_defined('WINDOWS_VST_SUPPORT'): + VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) + + if bld.is_defined('WINDOWS_VST_SUPPORT') and bld.env['build_target'] != 'mingw': + # Windows VST support w/wine # 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 = bld (features = 'cxx c cxxprogram wine') + obj.source = ( + '../libs/fst/vstwin.c', + '../vst/winmain.c', + ) + # + # XXX do we really need to explicitly link to all of these for the wine executable? + # obj.use = [ 'libpbd', 'libmidipp', - 'libtaglib', 'libardour', 'libardour_cp', + 'libtimecode', + 'libmidipp', 'libgtk2_ardour', 'libgtkmm2ext', - 'libtaglib'] - obj.target = 'ardour-3.0-vst.exe.so' + 'libcanvas' + ] + 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') + obj.install_path = bld.env['DLLDIR'] # end of the wine executable # now the shared library containing the GTK GUI for ardour @@ -385,70 +391,69 @@ def build(bld): obj.target = 'gtk2_ardour' else: # just the normal executable version of the GTK GUI - obj = bld(features = 'cxx c cxxprogram') + obj = bld (features = 'cxx c cxxprogram') obj.source = gtk2_ardour_sources - obj.target = 'ardour-3.0' + obj.target = 'ardour-' + bld.env['VERSION'] obj.includes = ['.'] - - # continue with setup of obj, which could be a shared library - # or an executable. - - obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3') - - obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG ALSA CURL DL' - obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS ' - obj.uselib += ' AUDIOUNITS OSX GTKOSX ' - obj.use = [ 'libpbd', - 'libmidipp', - 'libtaglib', - 'ardour', - 'libardour_cp', - 'libgtkmm2ext', - 'libtaglib' ] - if sys.platform == 'darwin': - obj.use += ' libappleutility' - obj.defines = [ + obj.ldflags = ['-no-undefined'] + + 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 + # OR the shared library built for use with wine on linux. + + obj.use = [ 'libpbd', + 'libardour', + 'libardour_cp', + 'libtimecode', + 'libmidipp', + 'libgtkmm2ext', + 'libcanvas', + ] + + obj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"', 'VERSIONSTRING="' + 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') + '"', - 'PROGRAM_NAME="' + bld.env['PROGRAM_NAME'] + '"' ] + obj.install_path = bld.env['DLLDIR'] + obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL' + obj.uselib += ' GTKMM CANVAS FFTW3F' + obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' + obj.uselib += ' TAGLIB ' + + if sys.platform == 'darwin': + obj.uselib += ' AUDIOUNITS OSX GTKOSX' + obj.use += ' libappleutility' + obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ] + elif bld.env['build_target'] == 'mingw': + obj.source += [ 'bundle_env_mingw.cc' ] + else: + obj.source += [ 'bundle_env_linux.cc' ] + obj.includes += ['../libs'] - if bld.env['VIDEOTIMELINE']: - obj.source += [ - 'video_image_frame.cc', - 'add_video_dialog.cc', - 'editor_videotimeline.cc', - 'video_timeline.cc', - 'system_exec.cc', - 'video_monitor.cc', - 'open_video_monitor_dialog.cc', - 'transcode_ffmpeg.cc', - 'transcode_video_dialog.cc', - 'video_server_dialog.cc', - 'utils_videotl.cc', - 'export_video_dialog.cc', - 'export_video_infobox.cc' - ] + if bld.env['build_target'] == 'mingw': + if bld.env['DEBUG'] == False: + obj.linkflags = ['-mwindows'] if bld.is_defined('HAVE_SUIL'): obj.source += [ 'lv2_plugin_ui.cc' ] obj.use += [ 'SUIL' ] - if bld.is_defined('FREESOUND'): - obj.source += [ 'sfdb_freesound_mootcher.cc' ] - obj.defines += [ 'FREESOUND' ] - 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.env['build_target'] != 'mingw': + obj.use += [ 'X11' ] if bld.is_defined('LXVST_SUPPORT'): obj.source += [ 'linux_vst_gui_support.cc', 'lxvst_plugin_ui.cc' ] @@ -463,7 +468,6 @@ def build(bld): if bld.is_defined('HAVE_COREAUDIO'): TaskGen.task_gen.mappings['.mm'] = TaskGen.task_gen.mappings['.cc'] - obj.source += [ 'cocoacarbon.mm' ] obj.use += ' libappleutility ' if bld.is_defined('AUDIOUNIT_SUPPORT'): @@ -471,14 +475,18 @@ def build(bld): # Wrappers + print 'DLL = ' + bld.env['DLLDIR'], '\n' + print 'DATADIR = ' + bld.env['DATADIR'], '\n' + print 'CONF = ' + bld.env['CONFDIR'], '\n' + wrapper_subst_dict = { 'INSTALL_PREFIX' : bld.env['PREFIX'], - 'LIBDIR' : os.path.normpath(bld.env['LIBDIR']), + 'LIBDIR' : os.path.normpath(bld.env['DLLDIR']), 'DATADIR' : os.path.normpath(bld.env['DATADIR']), - 'SYSCONFDIR' : os.path.normpath(bld.env['SYSCONFDIR']), + 'SYSCONFDIR' : os.path.normpath(bld.env['CONFDIR']), '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): @@ -523,6 +531,7 @@ def build(bld): 'SMALLER' : '9', 'SMALL' : '10', 'NORMAL' : '11', + 'BIG' : '13', 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '28', @@ -548,6 +557,7 @@ def build(bld): 'SMALLER' : '8', 'SMALL' : '9', 'NORMAL' : '10', + 'BIG' : '14', 'BIGGER' : '17', 'LARGE' : '18', 'LARGER' : '24', @@ -628,7 +638,7 @@ def build(bld): obj.install_path = None set_subst_dict(obj, light_rc_subst_dict) - obj = bld(rule = 'cp ${SRC} ${TGT}') + obj = bld(rule = autowaf.copyfile) obj.source = [ 'ardour3_widget_list.rc' ] obj.target = 'ardour3_widgets.rc' obj.install_path = None @@ -638,14 +648,14 @@ def build(bld): # 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' + 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.install_path = '${SYSCONFDIR}/ardour3' + obj.install_path = bld.env['CONFDIR'] # Menus menus_argv = [] @@ -654,49 +664,52 @@ def build(bld): else: menus_argv = [ '-E', '-P' ] - if bld.env['VIDEOTIMELINE']: - menus_argv.append ('-DWITH_VIDEOTIMELINE') - obj = bld(features = 'command-output') - obj.command = 'cpp' - obj.command_is_external = True - obj.no_inputs = True - obj.argv = menus_argv - obj.stdin = 'ardour.menus.in' - obj.stdout = 'ardour.menus' - obj.dep_vars = ['GTKOSX', 'VIDEOTIMELINE'] - bld.install_files(os.path.join(bld.env['SYSCONFDIR'], 'ardour3'), - 'ardour.menus') + # always build all versions of the menu definitions + # so that we can try them out with different program builds. + for program in [ 'ardour', 'trx' ]: + obj = bld(features = 'command-output') + obj.command = 'cpp' + obj.command_is_external = True + obj.no_inputs = True + obj.argv = menus_argv + obj.dep_vars = ['GTKOSX'] + obj.stdin = program + '.menus.in' + obj.stdout = program + '.menus' + bld.install_files (bld.env['CONFDIR'], program + '.menus') # Keybindings # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad', # 'SAE-us-nokeypad', 'ergonomic-us' + # + # explicitly state the use of perl here so that it works on windows too + # + a_rule = 'perl ../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap <${SRC} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] ) for b in [ 'mnemonic-us' ] : obj = bld( target = b + '.bindings', source = b + '.bindings.in', - rule = '../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap <${SRC} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] ) + rule = a_rule ) - obj.install_path = os.path.join(bld.env['SYSCONFDIR'], 'ardour3') + obj.install_path = bld.env['CONFDIR'] # 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') + bld.install_files(bld.env['CONFDIR'], 'step_editing.bindings') + bld.install_files(bld.env['CONFDIR'], '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') + bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png')) + bld.install_files(os.path.join (bld.env['DATADIR'], 'pixmaps'), bld.path.ant_glob('pixmaps/*.xpm')) + bld.install_files(bld.env['DATADIR'], 'splash.png') + bld.install_files(bld.env['DATADIR'], 'small-splash.png') + bld.install_files(bld.env['DATADIR'], 'ArdourMono.ttf') # Default UI configuration - bld.install_files('${SYSCONFDIR}/ardour3', 'ardour3_ui_default.conf') + bld.install_files(bld.env['CONFDIR'], 'ardour3_ui_default.conf') # Default export stuff - bld.install_files('${SYSCONFDIR}/ardour3/export', bld.path.ant_glob('export/*.format')) + bld.install_files(os.path.join(bld.env['CONFDIR'],' export'), bld.path.ant_glob('export/*.format')) # i18n if bld.is_defined('ENABLE_NLS'):