X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fwscript;h=84db23987fd41a200d9144d46cc1e7a213fb473e;hb=d9cb8a807e9cd9e355e9445caad2f7f9adc0bfad;hp=cb01d67752de28f7de650068f70964d45b695c9a;hpb=10ad55fcf59c6a89ed42c9a78024e184e153d81e;p=ardour.git diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript index cb01d67752..84db23987f 100644 --- a/gtk2_ardour/wscript +++ b/gtk2_ardour/wscript @@ -10,8 +10,6 @@ import time from waflib.Task import Task from waflib.Tools import winres -I18N_PACKAGE = 'gtk2_ardour3' - # Mandatory variables top = '.' out = 'build' @@ -146,6 +144,7 @@ gtk2_ardour_sources = [ 'meter_strip.cc', 'meter_patterns.cc', 'monitor_section.cc', + 'monitor_selector.cc', 'mono_panner.cc', 'mono_panner_editor.cc', 'mouse_cursors.cc', @@ -201,6 +200,7 @@ gtk2_ardour_sources = [ 'route_time_axis.cc', 'route_ui.cc', 'ruler_dialog.cc', + 'save_as_dialog.cc', 'search_path_option.cc', 'selection.cc', 'selection_memento.cc', @@ -231,13 +231,14 @@ gtk2_ardour_sources = [ 'time_fx_dialog.cc', 'time_info_box.cc', 'time_selection.cc', + 'timers.cc', 'track_selection.cc', 'track_view_list.cc', + 'transform_dialog.cc', 'transpose_dialog.cc', 'ui_config.cc', 'utils.cc', 'verbose_cursor.cc', - 'version.cc', 'visibility_group.cc', 'volume_controller.cc', 'window_manager.cc', @@ -256,18 +257,26 @@ gtk2_ardour_sources = [ 'video_tool_paths.cc' ] +def enoify (major, minor): + if major == 3: + return "\\n\\\"E-No\\\"" + elif major == 4: + if minor == 0: + return "\\n\\\"No Pussyfooting\\\"" + elif minor == 1: + return "\\n\\\"Here Come the Warm Jets\\\"" + elif minor == 2: + return "\\n\\\"Taking Tiger Mountain\\\"" + elif minor == 3: + return "\\n\\\"Lady June's Linguistic Leprosy\\\"" + return "\\\"\\\"" + def options(opt): autowaf.set_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', conf.env['MAJOR'], conf.env['MINOR'], 0, - '', '') autowaf.configure(conf) # TODO: Insert a sanity check for on OS X to ensure CoreAudio is present @@ -290,7 +299,8 @@ def configure(conf): bak = conf.env['define_key'] conf.define('VERSIONSTRING', str (conf.env['VERSION'])) - conf.env['define_key'] = ['VERSIONSTRING'] + conf.define('CODENAME', enoify(int(conf.env['MAJOR']), int(conf.env['MINOR']))) + conf.env['define_key'] = ['VERSIONSTRING', 'CODENAME' ] conf.write_config_header('gtk2ardour-version.h') conf.env['define_key'] = bak; @@ -367,16 +377,14 @@ def build_color_scheme(path, prefix): def build(bld): VERSION = "%s.%s" % (bld.env['MAJOR'], bld.env['MINOR']) + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] 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/vstwin.c', - '../vst/winmain.c', - ) + 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? # @@ -388,11 +396,12 @@ def build(bld): 'libmidipp', 'libgtk2_ardour', 'libgtkmm2ext', - 'libcanvas' + 'libcanvas', ] 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 = bld.env['DLLDIR'] # end of the wine executable @@ -455,8 +464,7 @@ def build(bld): obj.includes += ['../libs'] if bld.env['build_target'] == 'mingw': - if bld.env['DEBUG'] == False: - obj.linkflags = ['-mwindows'] + obj.linkflags = ['-mwindows'] if bld.is_defined('HAVE_SUIL'): obj.source += [ 'lv2_plugin_ui.cc' ] @@ -505,7 +513,7 @@ def build(bld): 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 @@ -514,7 +522,7 @@ def build(bld): obj = bld(features = 'subst') obj.source = 'ardour.sh.in' - obj.target = 'ardour3' + obj.target = 'ardour' + str (bld.env['MAJOR']) obj.chmod = Utils.O755 obj.dict = wrapper_subst_dict obj.install_path = bld.env['BINDIR'] @@ -523,7 +531,7 @@ def build(bld): if bld.is_defined('WINDOWS_VST_SUPPORT'): obj = bld(features = 'subst') obj.source = '../vst/ardourvst.in' - obj.target = 'ardourvst3' + obj.target = 'ardourvst' + str (bld.env['MAJOR']) obj.chmod = Utils.O755 obj.dict = wrapper_subst_dict obj.install_path = bld.env['BINDIR'] @@ -560,7 +568,8 @@ def build(bld): # so just use it. # font_names = { - 'MONOSPACE' : 'Lucida Grande', + 'MONOSPACE' : 'Monaco', + 'CLOCKFONT' : 'Lucida Grande', } else: # Linux/X11 fonts basefont = '' # unspecified - use system defaults @@ -577,6 +586,7 @@ def build(bld): } font_names = { 'MONOSPACE' : 'ArdourMono', + 'CLOCKFONT' : 'ArdourMono', } # Set up font substitution dictionary @@ -631,7 +641,7 @@ def build(bld): obj.command_is_external = True obj.no_inputs = True obj.argv = menus_argv - obj.dep_vars = ['GTKOSX'] + obj.dep_vars = ['GTKOSX', 'WINDOWS'] obj.stdin = program + '.menus.in' obj.stdout = program + '.menus' bld.install_files (bld.env['CONFDIR'], program + '.menus') @@ -671,7 +681,7 @@ def build(bld): 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')) + bld.install_files(os.path.join(bld.env['CONFDIR'], 'export'), bld.path.ant_glob('export/*.format')) # i18n if bld.is_defined('ENABLE_NLS'): @@ -682,17 +692,21 @@ def build(bld): mo) def i18n(bld): - autowaf.build_i18n(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, - 'Paul Davis') - + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + 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') + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + 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') - + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + 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') + I18N_PACKAGE = 'gtk2_ardour' + bld.env['MAJOR'] + autowaf.build_i18n_mo(bld, top, 'gtk2_ardour', I18N_PACKAGE, gtk2_ardour_sources, + 'Paul Davis')