projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
rework check for old configuration files
[ardour.git] / libs / ardour / wscript
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 2b4cf453109b059439c93e28179dbdaaa5d78b5f..82aa2085f83cbbbfccb3d7819c17d1d1bc14b8a8 100644 (file)
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -10,9 +10,7 @@ import sys
 # default state file version for this build
 CURRENT_SESSION_FILE_VERSION = 3001
 
-# Variables for 'waf dist'
-APPNAME = 'libardour3'
-I18N_PACKAGE = 'ardour3'
+I18N_PACKAGE = 'ardour'
 
 # Mandatory variables
 top = '.'
@@ -134,6 +132,7 @@ libardour_sources = [
         'mididm.cc',
         'mtdm.cc',
         'mute_master.cc',
+        'note_fixer.cc',
         'onset_detector.cc',
         'operations.cc',
         'pan_controllable.cc',
@@ -213,10 +212,10 @@ libardour_sources = [
         'ticker.cc',
         'track.cc',
         'transient_detector.cc',
+        'transform.cc',
         'unknown_processor.cc',
         'user_bundle.cc',
         'utils.cc',
-        'version.cc',
         'vumeterdsp.cc',
         'worker.cc'
 ]
@@ -242,11 +241,6 @@ def configure(conf):
     conf.load('compiler_cxx')
     conf.load('gas')
     # we don't use hard-coded micro versions with ardour, so hard code it to zero
-    autowaf.build_version_files(
-        path_prefix + 'ardour/version.h',
-        path_prefix + 'version.cc',
-        'libardour3', conf.env['MAJOR'], conf.env['MINOR'], 0,
-        'LIBARDOUR_API', 'ardour/libardour_visibility.h')
     autowaf.configure(conf)
     autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
                       atleast_version='0.3.2')
@@ -254,8 +248,9 @@ def configure(conf):
                       atleast_version='0.4.0', mandatory=False)
     autowaf.check_pkg(conf, 'libxml-2.0', uselib_store='XML')
     if Options.options.dist_target != 'mingw':
-        autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF',
-                          atleast_version='0.4.0')
+        if not Options.options.no_lrdf:
+            autowaf.check_pkg(conf, 'lrdf', uselib_store='LRDF',
+                              atleast_version='0.4.0')
         autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
                           atleast_version='0.3.2')
     autowaf.check_pkg(conf, 'samplerate', uselib_store='SAMPLERATE',
@@ -282,6 +277,8 @@ def configure(conf):
                           atleast_version='0.16.0', mandatory=False)
         autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_19_2',
                           atleast_version='0.19.2', mandatory=False)
+        autowaf.check_pkg(conf, 'lilv-0', uselib_store='LILV_0_21_3',
+                          atleast_version='0.21.3', mandatory=False)
         autowaf.check_pkg(conf, 'suil-0', uselib_store='SUIL',
                           atleast_version='0.6.0', mandatory=False)
         conf.define ('LV2_SUPPORT', 1)
@@ -365,10 +362,11 @@ def build(bld):
     obj.vnum         = LIBARDOUR_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']
     obj.defines      += [
-        'PACKAGE="' + I18N_PACKAGE + '"',
+        'PACKAGE="' + I18N_PACKAGE + str(bld.env['MAJOR']) + '"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
+        'LIBARDOUR="' + bld.env['lwrcase_dirname'] + '"',
         'EVORAL_MIDI_XML=1',
         ]
 
@@ -387,7 +385,7 @@ def build(bld):
         obj.includes += [ '../fst' ]
         obj.defines += [ 'WINDOWS_VST_SUPPORT' ]
         if bld.env['build_target'] == 'mingw':
-            obj.source += [ '../fst/vstwin.c']
+            obj.use += [ 'vstwin' ]
             obj.uselib += ['GDI32']
 
     if bld.is_defined('LXVST_SUPPORT'):
@@ -415,7 +413,7 @@ def build(bld):
         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['LOCALEDIR'], lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
+            bld.install_as(os.path.join(bld.env['LOCALEDIR'], lang, 'LC_MESSAGES', I18N_PACKAGE + str(bld.env['MAJOR']) + '.mo'),
                            mo)
 
     if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
@@ -424,7 +422,7 @@ def build(bld):
         testcommon              = bld(features = 'cxx')
         testcommon.includes     = obj.includes + ['test', '../pbd', '..']
         testcommon.source       = ['test/testrunner.cc', 'test/test_needing_session.cc',
-                                   'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc']
+                                   'test/dummy_lxvst.cc', 'test/audio_region_test.cc', 'test/test_util.cc', 'test/test_ui.cc']
         testcommon.uselib       = ['CPPUNIT','SIGCPP','GLIBMM','GTHREAD',
                                    'SAMPLERATE','XML','LRDF','COREAUDIO','TAGLIB','VAMPSDK','VAMPHOSTSDK','RUBBERBAND']
         testcommon.use          = ['libpbd','libmidipp','libevoral',
@@ -434,7 +432,7 @@ def build(bld):
         else:
             testcommon.use.extend(['libltc', 'librubberband'])
         testcommon.defines      = [
-            'PACKAGE="libardour3test"',
+            'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'test"',
             'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
             'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
             'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
@@ -513,7 +511,7 @@ def build(bld):
         session_load_tester.target    = 'load-session'
         session_load_tester.install_path = ''
         session_load_tester.defines      = [
-            'PACKAGE="libardour3profile"',
+            'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'profile"',
             'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
             'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
             'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
@@ -545,7 +543,7 @@ def build(bld):
             profilingobj.target    = p
             profilingobj.install_path = ''
             profilingobj.defines      = [
-                'PACKAGE="libardour3profile"',
+                'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'profile"',
                 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
                 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
                 'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
@@ -576,7 +574,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
     # not sure about install path
     testobj.install_path = bld.env['LIBDIR']
     testobj.defines      = [
-        'PACKAGE="libardour3test"',
+        'PACKAGE="libardour' + str(bld.env['MAJOR']) + 'test"',
         'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'LOCALEDIR="' + os.path.normpath(bld.env['LOCALEDIR']) + '"',
@@ -586,17 +584,17 @@ def shutdown():
     autowaf.shutdown()
 
 def i18n(bld):
-    autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources,
+    autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
                        'Paul Davis')
 
 def i18n_pot(bld):
-    autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources,
+    autowaf.build_i18n(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
                        'Paul Davis')
 
 def i18n_po(bld):
-    autowaf.build_i18n_po(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources,
+    autowaf.build_i18n_po(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
                        'Paul Davis')
 
 def i18n_mo(bld):
-    autowaf.build_i18n_mo(bld, top, 'libs/ardour', I18N_PACKAGE, libardour_sources,
+    autowaf.build_i18n_mo(bld, top, 'libs/ardour', I18N_PACKAGE + str(bld.env['MAJOR']), libardour_sources,
                        'Paul Davis')
Unnamed repository; edit this file 'description' to name the repository.