X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=libs%2Fcanvas%2Fwscript;h=b40f72412dbee5cbcc6779215ce62cc32314594e;hb=02b7db03bd11de67c8e5d981d6075ce9f0ca8963;hp=88ffc93dcafd3da75474221857ab3eb512f10206;hpb=6a5d805b383cd71bb1d0984964439c5ec08e9270;p=ardour.git

diff --git a/libs/canvas/wscript b/libs/canvas/wscript
index 88ffc93dca..b40f72412d 100644
--- a/libs/canvas/wscript
+++ b/libs/canvas/wscript
@@ -32,12 +32,15 @@ canvas_sources = [
         'arrow.cc',
         'canvas.cc',
         'circle.cc',
+        'colors.cc',
+        'colorspace.cc',
         'container.cc',
         'curve.cc',
         'debug.cc',
         'item.cc',
         'fill.cc',
         'flag.cc',
+        'framed_curve.cc',
         'image.cc',
         'line.cc',
         'line_set.cc',
@@ -53,6 +56,7 @@ canvas_sources = [
         'scroll_group.cc',
         'stateful_image.cc',
         'text.cc',
+        'tracking_text.cc',
         'types.cc',
         'utils.cc',
         'wave_view.cc',
@@ -66,9 +70,6 @@ def options(opt):
 def configure(conf):
     conf.load ('compiler_cxx')
     autowaf.configure(conf)
-    autowaf.build_version_files(path_prefix+'canvas/version.h', path_prefix+'version.cc',
-                                'libcanvas', conf.env['MAJOR'], conf.env['MINOR'], 0,
-                                'LIBCANVAS_API', 'canvas/visibility.h')
     autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4')
 
 def build(bld):
@@ -80,18 +81,44 @@ def build(bld):
         obj = bld.stlib(features = 'cxx cxxstlib', source=canvas_sources)
         obj.cxxflags     = [ '-fPIC' ]
         obj.cflags       = [ '-fPIC' ]
+        obj.defines      = [ ]
 
     obj.export_includes = ['.']
     obj.includes     = ['.']
-    obj.uselib       = 'SIGCPP CAIROMM GTKMM BOOST'
-    obj.use          = [ 'libpbd', 'libevoral', 'libardour', 'libgtkmm2ext' ]
+    obj.uselib       = 'SIGCPP CAIROMM GTKMM BOOST XML'
+    obj.use          = [ 'libpbd', 'libevoral', 'libardour', 'libgtkmm2ext', 'libevoral' ]
     obj.name         = 'libcanvas'
     obj.target       = 'canvas'
     obj.vnum         = CANVAS_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']
     obj.defines      += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
-    
-    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+
+    # canvas unit-tests are outdated
+    if False and bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
+            unit_testobj              = bld(features = 'cxx cxxprogram')
+            unit_testobj.source       = '''
+                    test/group.cc
+                    test/arrow.cc
+                    test/optimizing_lookup_table.cc
+                    test/polygon.cc
+                    test/types.cc
+                    test/render.cc
+                    test/xml.cc
+                    test/wave_view.cc
+                    test/item.cc
+                    test/testrunner.cpp
+                '''.split()
+
+            unit_testobj.includes     = obj.includes + ['test', '../pbd']
+            unit_testobj.uselib       = 'CPPUNIT SIGCPP CAIROMM GTKMM'
+            unit_testobj.uselib_local = 'libcanvas libevoral libardour libgtkmm2ext'
+            unit_testobj.name         = 'libcanvas-unit-tests'
+            unit_testobj.target       = 'run-tests'
+            unit_testobj.install_path = ''
+            unit_testobj.cxxflags     = ['-DPACKAGE="libcanvastest"']
+            unit_testobj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
+            unit_testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFDIR']) + '"']
+            unit_testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
 
             manual_tests              = '''
                         test/hello_world.cc
@@ -105,7 +132,7 @@ def build(bld):
             for t in manual_tests:
                     target = t[:-3]
                     name = t[t.find('/')+1:-3]
-                    manual_testobj = bld.new_task_gen('cxx', 'program')
+                    manual_testobj = bld(features = 'cxx cxxprogram')
                     manual_testobj.source = t
                     manual_testobj.includes = obj.includes + ['test', '../pbd']
                     manual_testobj.uselib       = 'CPPUNIT SIGCPP CAIROMM GTKMM'
@@ -113,32 +140,7 @@ def build(bld):
                     manual_testobj.name         = 'libcanvas-manual-test-%s' % name
                     manual_testobj.target       = target
                     manual_testobj.install_path = ''
-                    
-                    unit_testobj              = bld.new_task_gen('cxx', 'program')
-                    unit_testobj.source       = '''
-                        test/group.cc
-                        test/arrow.cc
-                        test/optimizing_lookup_table.cc
-                        test/polygon.cc
-                        test/types.cc
-                        test/render.cc
-                        test/xml.cc
-                        test/wave_view.cc
-                        test/item.cc
-                        test/testrunner.cpp
-                '''.split()
 
-                    unit_testobj.includes     = obj.includes + ['test', '../pbd']
-                    unit_testobj.uselib       = 'CPPUNIT SIGCPP CAIROMM GTKMM'
-                    unit_testobj.uselib_local = 'libcanvas libevoral libardour libgtkmm2ext'
-                    unit_testobj.name         = 'libcanvas-unit-tests'
-                    unit_testobj.target       = 'run-tests'
-                    unit_testobj.install_path = ''
-                    unit_testobj.cxxflags     = ['-DPACKAGE="libcanvastest"']
-                    unit_testobj.cxxflags     += ['-DDATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"']
-                    unit_testobj.cxxflags     += ['-DCONFIG_DIR="' + os.path.normpath(bld.env['CONFIGDIR']) + '"']
-                    unit_testobj.cxxflags     += ['-DMODULE_DIR="' + os.path.normpath(bld.env['LIBDIR']) + '"']
-                    
             benchmarks = '''
                         benchmark/items_at_point.cc
                         benchmark/render_parts.cc
@@ -149,7 +151,7 @@ def build(bld):
             for t in benchmarks:
                     target = t[:-3]
                     name = t[t.find('/')+1:-3]
-                    manual_testobj = bld.new_task_gen('cxx', 'program')
+                    manual_testobj = bld(features = 'cxx cxxprogram')
                     manual_testobj.source = [ t, 'benchmark/benchmark.cc' ]
                     manual_testobj.includes = obj.includes + ['test', '../pbd']
                     manual_testobj.uselib       = 'CPPUNIT SIGCPP CAIROMM GTKMM'