remove redundant os.path.join() calls when specifying install path as bld.env['LIBDIR']

[ardour.git] / libs / evoral / wscript

diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 11cb749a99a9fa0798352a0c1dd7784fd1a1138f..a4aea3a3a269f137dd16c089b25460532eb8497d 100644 (file)
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -26,6 +26,8 @@ def options(opt):
     autowaf.set_options(opt)
     opt.add_option('--test', action='store_true', default=False, dest='build_tests',
                     help="Build unit tests")
+    opt.add_option('--test-coverage', action='store_true', default=False, dest='test_coverage',
+                    help="Use gcov to test for code coverage")
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -42,6 +44,7 @@ def configure(conf):
     autowaf.check_header(conf, 'cxx', 'boost/weak_ptr.hpp')
 
     conf.env['BUILD_TESTS'] = Options.options.build_tests
+    conf.env['TEST_COVERAGE'] = Options.options.test_coverage
 
     #autowaf.display_msg(conf, "Unit tests", str(conf.env['BUILD_TESTS']))
     #print
@@ -54,7 +57,7 @@ def build(bld):
     # Pkgconfig file
     #autowaf.build_pc(bld, 'EVORAL', EVORAL_VERSION, 'GLIBMM GTHREAD')
 
-    libsmf = bld(features = 'c cshlib')
+    libsmf = bld(features = 'c cstlib')
     libsmf.source = '''
             src/libsmf/smf.c
             src/libsmf/smf_decode.c
@@ -63,12 +66,14 @@ def build(bld):
             src/libsmf/smf_tempo.c
     '''
     libsmf.export_includes = ['./src/libsmf']
-    libsmf.defines      = 'SMF_VERSION="1.2"'
+    libsmf.defines      = ['SMF_VERSION="1.2"', 'LIBSMF_DLL_EXPORTS']
     libsmf.includes     = ['./src']
     libsmf.name         = 'libsmf'
     libsmf.target       = 'smf'
     libsmf.uselib       = 'GLIB'
-    libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
+    libsmf.cxxflags     = [ '-fPIC' ]
+    libsmf.cflags       = [ '-fPIC' ]
+    libsmf.install_path = bld.env['LIBDIR']
 
     lib_source = '''
             src/Control.cpp
@@ -76,6 +81,7 @@ def build(bld):
             src/ControlSet.cpp
             src/Curve.cpp
             src/Event.cpp
+            src/IdentityConverter.cpp
             src/midi_util.cpp
             src/MIDIEvent.cpp
             src/Note.cpp
@@ -85,8 +91,16 @@ def build(bld):
     '''
 
     # Library
-    obj = bld(features = 'cxx cxxshlib')
-    obj.source         = lib_source
+    if bld.is_defined ('INTERNAL_SHARED_LIBS'):
+        obj              = bld.shlib(features = 'c cxx cshlib cxxshlib', source=lib_source)
+        # DLL exports for this library
+        obj.defines      = [ 'LIBEVORAL_DLL_EXPORTS' ]
+    else:
+        obj              = bld.stlib(features = 'c cxx cstlib cxxstlib', source=lib_source)
+        obj.cxxflags     = [ '-fPIC' ]
+        obj.cflags       = [ '-fPIC' ]
+        obj.defines      = [ ]
+
     obj.export_includes = ['.']
     obj.includes       = ['.', './src']
     obj.name           = 'libevoral'
@@ -94,10 +108,10 @@ def build(bld):
     obj.uselib         = 'GLIBMM GTHREAD SMF'
     obj.use            = 'libsmf libpbd'
     obj.vnum           = EVORAL_LIB_VERSION
-    obj.install_path   = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.defines = ['PACKAGE="libevoral"' ]
+    obj.install_path   = bld.env['LIBDIR']
+    obj.defines       += [ 'PACKAGE="libevoral"', 'EVORAL_MIDI_XML=1' ]
 
-    if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
+    if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
         # Static library (for unit test code coverage)
         obj = bld(features = 'cxx cstlib')
         obj.source       = lib_source
@@ -110,26 +124,30 @@ def build(bld):
         obj.use            = 'libsmf libpbd'
         obj.vnum           = EVORAL_LIB_VERSION
         obj.install_path   = ''
-        obj.cflags         = [ '-fprofile-arcs',  '-ftest-coverage' ]
-        obj.cxxflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
-        obj.defines        = ['PACKAGE="libevoral"' ]
+        if bld.env['TEST_COVERAGE']:
+            obj.linkflags      = '-lgcov'
+            obj.cflags         = [ '-fprofile-arcs',  '-ftest-coverage' ]
+            obj.cxxflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
+        obj.defines        = ['PACKAGE="libevoral"', 'EVORAL_MIDI_XML=1' ]
 
         # Unit tests
         obj              = bld(features = 'cxx cxxprogram')
         obj.source       = '''
                 test/SequenceTest.cpp
                 test/SMFTest.cpp
+                test/RangeTest.cpp
                 test/testrunner.cpp
         '''
         obj.includes     = ['.', './src']
         obj.use          = 'libevoral_static'
         obj.uselib       = 'CPPUNIT SNDFILE'
-        obj.libs         = 'gcov'
         obj.target       = 'run-tests'
         obj.name         = 'libevoral-tests'
         obj.install_path = ''
-        obj.cflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
-        obj.cxxflags     = [ '-fprofile-arcs',  '-ftest-coverage' ]
+        if bld.env['TEST_COVERAGE']:
+            obj.linkflags      = '-lgcov'
+            obj.cflags         = [ '-fprofile-arcs',  '-ftest-coverage' ]
+            obj.cxxflags       = [ '-fprofile-arcs',  '-ftest-coverage' ]
 
 def shutdown():
     autowaf.shutdown()