adjust the way version and revision info are gathered, defined and used

[ardour.git] / gtk2_ardour / wscript

diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 1b5a72daa48f602d55ae562802120e8048df34b4..bba65c8c0afd27b1c72bfbbed74675f9638c7aa4 100644 (file)
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -10,13 +10,10 @@ 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)
+MINOR = '2'
 
 # Variables for 'waf dist'
-APPNAME = 'gtk2_ardour3'
-VERSION = GTK2_ARDOUR_VERSION
+VERSION = "%s.%s" % (MAJOR, MINOR)
 I18N_PACKAGE = 'gtk2_ardour3'
 
 # Mandatory variables
@@ -52,6 +49,7 @@ 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',
@@ -161,6 +159,8 @@ gtk2_ardour_sources = [
         'new_plugin_preset_dialog.cc',
         'normalize_dialog.cc',
         'note_player.cc',
+        'nsm.cc',
+        'nsmclient.cc',
         'option_editor.cc',
         'opts.cc',
         'panner2d.cc',
@@ -240,7 +240,20 @@ gtk2_ardour_sources = [
         '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):
@@ -249,10 +262,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', MAJOR, MINOR, 0)
     autowaf.configure(conf)
 
     if re.search ("linux", sys.platform) != None:
@@ -370,7 +384,7 @@ def build(bld):
                              'libgtk2_ardour',
                              'libgtkmm2ext',
                              'libtaglib']
-        obj.target = 'ardour-3.0-vst.exe.so'
+        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']
@@ -387,7 +401,7 @@ def build(bld):
         # just the normal executable version of the GTK GUI
         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
@@ -397,11 +411,11 @@ def build(bld):
 
     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' ]
@@ -460,8 +474,8 @@ def build(bld):
             '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):
@@ -512,17 +526,19 @@ def build(bld):
                 'HUGER' : '36',
                 'MASSIVE' : '60',
         }
-        if bld.env['build_target'] == 'tiger' or bld.env['build_target'] == 'leopard' :
-            # There is no acceptable monospace font available on older versions of OS X
-            # and no API to load TTF files that will work with GTK/fontconfig/pango.
-            # Fall back on a font that works, even though it is not monospace
-            font_names = {
-                'MONOSPACE' : 'Lucida Grande',
-            }
-        else:
-            font_names = {
-                'MONOSPACE' : 'ArdourMono',
-            }
+        
+        # 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 = {
@@ -631,9 +647,10 @@ def build(bld):
     # 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
@@ -641,6 +658,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')