X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=d2aa69226d7b9dee294b0092e1083d857d9884db;hb=4c0cebf7f98ecd14873d26b6f4d8bdedd37cb994;hp=facc1297140e22c403dd70e9f21a7a24ab451585;hpb=c464feb6aa96226856305531fedb8fba2e06689e;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index facc129714..d2aa69226d 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -3,10 +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 +from waflib.Tools import winres I18N_PACKAGE = 'gtk2_ardour3' @@ -24,6 +26,9 @@ gtk2_ardour_sources = [ 'analysis_window.cc', 'ardour_button.cc', 'ardour_dialog.cc', + 'ardour_display.cc', + 'ardour_dropdown.cc', + 'ardour_knob.cc', 'ardour_ui.cc', 'ardour_ui2.cc', 'ardour_ui_dependents.cc', @@ -46,22 +51,13 @@ gtk2_ardour_sources = [ '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', + 'cursor_context.cc', 'curvetest.cc', 'debug.cc', - 'diamond.cc', 'edit_note_dialog.cc', 'editing.cc', 'editor.cc', @@ -103,25 +99,25 @@ 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', 'ghostregion.cc', 'global_port_matrix.cc', 'group_tabs.cc', - 'gtk-custom-hruler.c', - 'gtk-custom-ruler.c', 'gtk_pianokeyboard.c', 'gui_object.cc', 'insert_time_dialog.cc', + 'instrument_selector.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', @@ -156,7 +152,10 @@ gtk2_ardour_sources = [ 'nag.cc', 'new_plugin_preset_dialog.cc', 'normalize_dialog.cc', + 'note.cc', + 'note_base.cc', 'note_player.cc', + 'note_select_dialog.cc', 'nsm.cc', 'nsmclient.cc', 'option_editor.cc', @@ -165,6 +164,7 @@ gtk2_ardour_sources = [ 'panner_editor.cc', 'panner_interface.cc', 'panner_ui.cc', + 'patch_change.cc', 'piano_roll_header.cc', 'pingback.cc', 'playlist_selector.cc', @@ -200,8 +200,10 @@ gtk2_ardour_sources = [ 'route_processor_selection.cc', 'route_time_axis.cc', 'route_ui.cc', + 'ruler_dialog.cc', 'search_path_option.cc', 'selection.cc', + 'selection_memento.cc', 'send_ui.cc', 'session_dialog.cc', 'session_import_dialog.cc', @@ -209,8 +211,6 @@ gtk2_ardour_sources = [ 'session_option_editor.cc', 'sfdb_ui.cc', 'shuttle_control.cc', - 'simpleline.cc', - 'simplerect.cc', 'soundcloud_export_selector.cc', 'splash.cc', 'speaker_dialog.cc', @@ -221,6 +221,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', @@ -232,6 +233,7 @@ gtk2_ardour_sources = [ 'time_selection.cc', 'track_selection.cc', 'track_view_list.cc', + 'transform_dialog.cc', 'transpose_dialog.cc', 'ui_config.cc', 'utils.cc', @@ -239,7 +241,6 @@ gtk2_ardour_sources = [ 'version.cc', 'visibility_group.cc', 'volume_controller.cc', - 'waveview.cc', 'window_manager.cc', # video-timeline related sources: 'video_image_frame.cc', @@ -252,7 +253,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): @@ -265,12 +267,10 @@ def configure(conf): autowaf.build_version_files( path_prefix + 'version.h', path_prefix + 'version.cc', - 'gtk2_ardour', conf.env['MAJOR'], conf.env['MINOR'], 0) + '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', @@ -283,16 +283,18 @@ 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') 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') @@ -367,14 +369,12 @@ def build(bld): VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) - if bld.is_defined('WINDOWS_VST_SUPPORT'): + 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', ) @@ -389,12 +389,14 @@ def build(bld): 'libmidipp', 'libgtk2_ardour', 'libgtkmm2ext', + 'libcanvas' ] - obj.target = 'ardour-' + bld.env['VERSION'] + '-vst.exe.so' + obj.target = 'ardour-' + str (bld.env['VERSION']) + '-vst.exe.so' obj.includes = [ '../libs/fst', '.' ] obj.linkflags = ['-mwindows', '-Wl,--export-dynamic'] + obj.linkflags += bld.env['LDFLAGS'] 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 @@ -405,10 +407,18 @@ 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-' + bld.env['VERSION'] + obj.target = 'ardour-' + str (bld.env['VERSION']) obj.includes = ['.'] + obj.ldflags = ['-no-undefined'] + + if bld.is_defined('WINDOWS_VST_SUPPORT'): + # Windows VST support mingw + 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. @@ -419,31 +429,37 @@ def build(bld): 'libtimecode', 'libmidipp', 'libgtkmm2ext', + 'libcanvas', ] - # 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 CURL DL' - obj.uselib += ' GTKMM GNOMECANVASMM GNOMECANVAS FFTW3F' - obj.uselib += ' AUDIOUNITS OSX GTKOSX LO ' - if bld.is_defined('USE_EXTERNAL_LIBS'): - obj.uselib += ' TAGLIB' - else: - obj.use += ('libtaglib') - if sys.platform == 'darwin': - obj.use += ' libappleutility' - obj.defines = [ + 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'] + '"' + 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"', ] + 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' ] + obj.source += [ 'windows_icon.rc' ] + else: + obj.source += [ 'bundle_env_linux.cc' ] + obj.includes += ['../libs'] + 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' ] @@ -454,7 +470,8 @@ def build(bld): 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' ] @@ -469,7 +486,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'): @@ -479,19 +495,19 @@ def build(bld): 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']), + 'CONFDIR' : os.path.normpath(bld.env['CONFDIR']), 'LIBS' : 'build/libs', 'VERSION' : bld.env['VERSION'], - 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + bld.env['VERSION'] + 'EXECUTABLE' : 'build/gtk2_ardour/ardour-' + str (bld.env['VERSION']) } def set_subst_dict(obj, dict): for i in dict: setattr(obj, i, dict[i]) - obj = bld(features = 'subst', rule= 'chmod 0755 ${TGT}') + obj = bld(features = 'subst') obj.source = 'ardev_common.sh.in' obj.target = 'ardev_common_waf.sh' obj.chmod = Utils.O755 @@ -517,8 +533,7 @@ def build(bld): # Font configuration - dark_rc_subst_dict = {} - light_rc_subst_dict = {} + font_subst_dict = {} font_sizes = {} base_font = "" @@ -552,15 +567,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,84 +591,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 - + + 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 + 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 + font_subst_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) - - 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) - - 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) + # RC file 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.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_fonts.rc.in' ] - obj.target = 'ardour3_light_fonts.rc' - obj.install_path = None - set_subst_dict(obj, light_rc_subst_dict) - - obj = bld(rule = 'cp ${SRC} ${TGT}') - 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 = '${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' + 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 = [] @@ -662,56 +625,63 @@ def build(bld): else: menus_argv = [ '-E', '-P' ] - 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'] - 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'], 'dark.colors') + 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'], 'default_ui_config') + # Color Themes + bld.install_files(bld.env['CONFDIR'], 'dark.colors') # 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'): 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,