Rename slv2 to lilv.

API breakage was proving too much of a hassle, and would be even further of a
mess after release and packaging.  Best to make a clean break now, and fix
installation to support parallel installs and prevent this kind of problem in
the future.


git-svn-id: http://svn.drobilla.net/lad/trunk/lilv@3217 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 70 insertions, 89 deletions

diff --git a/wscript b/wscript
index 79c7361..f809612 100644
--- a/wscript
+++ b/wscript
@@ -6,36 +6,19 @@ from waflib.extras import autowaf as autowaf
 import waflib.Options as Options
 
 # Version of this package (even if built as a child)
-SLV2_VERSION = '0.7.3'
+LILV_VERSION       = '0.0.0'
+LILV_MAJOR_VERSION = '0'
 
 # Library version (UNIX style major, minor, micro)
 # major increment <=> incompatible changes
 # minor increment <=> compatible changes (additions)
 # micro increment <=> no interface changes
-# Version history:
-#   0.0.1 = 0,0,0
-#   0.1.0 = 2,0,0
-#   0.2.0 = 3,0,0
-#   0.3.0 = 4,0,0
-#   0.3.1 = 4,0,0
-#   0.3.2 = 5,0,1
-#   0.4.0 = 6,0,0
-#   0.4.1 = 6,0,0 (oops, should have been 6,1,0)
-#   0.4.2 = 6,0,0 (oops, should have been 6,2,0)
-#   0.4.3 = 6,0,0 (oops, should have been 6,3,0)
-#   0.4.4 = 7,0,1
-#   0.4.5 = 7,0,1
-#   0.5.0 = 8,0,0
-#   0.6.0 = 9,0,0 (SVN r1282)
-#   0.6.1 = 9,1,0
-#   0.6.2 = 9,1,1
-#   0.6.4 = 9,2,0
-#   0.6.6 = 9,2,0
-SLV2_LIB_VERSION = '10.0.0'
+# Lilv uses the same version number for both library and package
+LILV_LIB_VERSION = LILV_VERSION
 
 # Variables for 'waf dist'
-APPNAME = 'slv2'
-VERSION = SLV2_VERSION
+APPNAME = 'lilv'
+VERSION = LILV_VERSION
 
 # Mandatory variables
 top = '.'
@@ -68,7 +51,7 @@ def options(opt):
 def configure(conf):
     conf.line_just = max(conf.line_just, 59)
     autowaf.configure(conf)
-    autowaf.display_header('SLV2 Configuration')
+    autowaf.display_header('Lilv Configuration')
     conf.load('compiler_cc')
     conf.load('python')
 
@@ -76,7 +59,7 @@ def configure(conf):
         try:
             conf.load('swig python')
             conf.check_python_headers()
-            autowaf.define(conf, 'SLV2_SWIG', 1);
+            autowaf.define(conf, 'LILV_SWIG', 1);
         except:
             pass
 
@@ -85,16 +68,14 @@ def configure(conf):
                       atleast_version='2.0.0', mandatory=True)
     autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD',
                       atleast_version='2.0.0', mandatory=False)
-    autowaf.check_pkg(conf, 'serd', uselib_store='SERD',
-                      atleast_version='0.1.0', mandatory=True)
-    autowaf.check_pkg(conf, 'sord', uselib_store='SORD',
-                      atleast_version='0.1.0', mandatory=True)
+    autowaf.check_pkg(conf, 'serd-0', uselib_store='SERD',
+                      atleast_version='0.2.0', mandatory=True)
+    autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
+                      atleast_version='0.2.0', mandatory=True)
     autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
                       atleast_version='0.107.0', mandatory=False)
     autowaf.check_pkg(conf, 'jack', uselib_store='NEW_JACK',
                       atleast_version='0.120.0', mandatory=False)
-    autowaf.check_pkg(conf, 'suil', uselib_store='SUIL',
-                      atleast_version='0.0.0', mandatory=True)
 
     conf.check(function_name='wordexp',
                header_name='wordexp.h',
@@ -105,44 +86,44 @@ def configure(conf):
 
     if not Options.options.no_jack_session:
         if conf.is_defined('HAVE_NEW_JACK') and conf.is_defined('HAVE_GTHREAD'):
-            autowaf.define(conf, 'SLV2_JACK_SESSION', 1)
+            autowaf.define(conf, 'LILV_JACK_SESSION', 1)
 
     conf.env.append_value('CFLAGS', '-std=c99')
-    autowaf.define(conf, 'SLV2_VERSION', SLV2_VERSION)
+    autowaf.define(conf, 'LILV_VERSION', LILV_VERSION)
     if not Options.options.no_dyn_manifest:
-        autowaf.define(conf, 'SLV2_DYN_MANIFEST', 1)
+        autowaf.define(conf, 'LILV_DYN_MANIFEST', 1)
 
-    slv2_path_sep = ':'
-    slv2_dir_sep  = '/'
+    lilv_path_sep = ':'
+    lilv_dir_sep  = '/'
     if sys.platform == 'win32':
-        slv2_path_sep = ';'
-        slv2_dir_sep = '\\\\'
+        lilv_path_sep = ';'
+        lilv_dir_sep = '\\\\'
 
-    autowaf.define(conf, 'SLV2_PATH_SEP', slv2_path_sep)
-    autowaf.define(conf, 'SLV2_DIR_SEP',  slv2_dir_sep)
+    autowaf.define(conf, 'LILV_PATH_SEP', lilv_path_sep)
+    autowaf.define(conf, 'LILV_DIR_SEP',  lilv_dir_sep)
 
     if Options.options.default_lv2_path == '':
         if Options.platform == 'darwin':
-            Options.options.default_lv2_path = slv2_path_sep.join([
+            Options.options.default_lv2_path = lilv_path_sep.join([
                     '~/Library/Audio/Plug-Ins/LV2',
                     '~/.lv2',
                     '/usr/local/lib/lv2',
                     '/usr/lib/lv2',
                     '/Library/Audio/Plug-Ins/LV2'])
         elif Options.platform == 'haiku':
-            Options.options.default_lv2_path = slv2_path_sep.join([
+            Options.options.default_lv2_path = lilv_path_sep.join([
                     '~/.lv2',
                     '/boot/common/add-ons/lv2'])
         elif Options.platform == 'win32':
             Options.options.default_lv2_path = '%APPDATA%\\\\LV2;%PROGRAMFILES%\\\\LV2'
         else:
             libdirname = os.path.basename(conf.env['LIBDIR'])
-            Options.options.default_lv2_path = slv2_path_sep.join([
+            Options.options.default_lv2_path = lilv_path_sep.join([
                     '~/.lv2',
                     '/usr/%s/lv2' % libdirname,
                     '/usr/local/%s/lv2' % libdirname])
 
-    autowaf.define(conf, 'SLV2_DEFAULT_LV2_PATH', Options.options.default_lv2_path)
+    autowaf.define(conf, 'LILV_DEFAULT_LV2_PATH', Options.options.default_lv2_path)
 
     conf.env['BUILD_TESTS']     = Options.options.build_tests
     conf.env['BUILD_UTILS']     = not Options.options.no_utils
@@ -158,35 +139,35 @@ def configure(conf):
         if (conf.is_defined('HAVE_LV2_EVENT')
             and conf.is_defined('HAVE_LV2_EVENT_HELPERS')
             and conf.is_defined('HAVE_LV2_URI_MAP')):
-            autowaf.define(conf, 'SLV2_USE_JACK', 1)
+            autowaf.define(conf, 'LILV_USE_JACK', 1)
 
-    conf.write_config_header('slv2-config.h', remove=False)
+    conf.write_config_header('lilv-config.h', remove=False)
 
     autowaf.display_msg(conf, "Default LV2_PATH",
-                        conf.env['SLV2_DEFAULT_LV2_PATH'])
+                        conf.env['LILV_DEFAULT_LV2_PATH'])
     autowaf.display_msg(conf, "Utilities",
                         bool(conf.env['BUILD_UTILS']))
     autowaf.display_msg(conf, "Jack clients",
-                        bool(conf.is_defined('SLV2_USE_JACK')))
+                        bool(conf.is_defined('LILV_USE_JACK')))
     autowaf.display_msg(conf, "Jack session support",
-                        bool(conf.env['SLV2_JACK_SESSION']))
+                        bool(conf.env['LILV_JACK_SESSION']))
     autowaf.display_msg(conf, "Unit tests",
                         bool(conf.env['BUILD_TESTS']))
     autowaf.display_msg(conf, "Dynamic manifest support",
-                        bool(conf.env['SLV2_DYN_MANIFEST']))
+                        bool(conf.env['LILV_DYN_MANIFEST']))
     autowaf.display_msg(conf, "Python bindings",
-                        conf.is_defined('SLV2_SWIG'))
-    autowaf.display_msg(conf, "UI wrapping support (via Suil)",
-                        bool(conf.is_defined('HAVE_SUIL')))
+                        conf.is_defined('LILV_SWIG'))
     print('')
 
 def build(bld):
     # C/C++ Headers
-    bld.install_files('${INCLUDEDIR}/slv2', bld.path.ant_glob('slv2/*.h'))
-    bld.install_files('${INCLUDEDIR}/slv2', bld.path.ant_glob('slv2/*.hpp'))
+    includedir = '${INCLUDEDIR}/lilv-%s/lilv' % LILV_MAJOR_VERSION
+    bld.install_files(includedir, bld.path.ant_glob('lilv/*.h'))
+    bld.install_files(includedir, bld.path.ant_glob('lilv/*.hpp'))
 
     # Pkgconfig file
-    autowaf.build_pc(bld, 'SLV2', SLV2_VERSION, ['SORD','GLIB'])
+    autowaf.build_pc(bld, 'LILV', LILV_VERSION, LILV_MAJOR_VERSION, ['SORD','GLIB'],
+                     {'LILV_MAJOR_VERSION' : LILV_MAJOR_VERSION})
 
     lib_source = '''
         src/collections.c
@@ -213,36 +194,36 @@ def build(bld):
               export_includes = ['.'],
               source          = lib_source,
               includes        = ['.', './src'],
-              name            = 'libslv2',
-              target          = 'slv2',
-              vnum            = SLV2_LIB_VERSION,
+              name            = 'liblilv',
+              target          = 'lilv-%s' % LILV_MAJOR_VERSION,
+              vnum            = LILV_LIB_VERSION,
               install_path    = '${LIBDIR}',
               cflags          = libflags + [
-                                  '-DSLV2_SHARED',
-                                  '-DSLV2_INTERNAL' ],
+                                  '-DLILV_SHARED',
+                                  '-DLILV_INTERNAL' ],
               linkflags       = linkflags)
-    autowaf.use_lib(bld, obj, 'SORD SERD LV2CORE GLIB SUIL')
+    autowaf.use_lib(bld, obj, 'SORD SERD LV2CORE GLIB')
 
     if bld.env['BUILD_TESTS']:
         # Static library (for unit test code coverage)
         obj = bld(features     = 'c cstlib',
                   source       = lib_source,
                   includes     = ['.', './src'],
-                  name         = 'libslv2_static',
-                  target       = 'slv2_static',
+                  name         = 'liblilv_static',
+                  target       = 'lilv_static',
                   install_path = '',
-                  cflags       = [ '-fprofile-arcs',  '-ftest-coverage', '-DSLV2_INTERNAL' ],
+                  cflags       = [ '-fprofile-arcs',  '-ftest-coverage', '-DLILV_INTERNAL' ],
                   linkflags    = linkflags)
-        autowaf.use_lib(bld, obj, 'SORD SERD LV2CORE GLIB SUIL')
+        autowaf.use_lib(bld, obj, 'SORD SERD LV2CORE GLIB')
 
         # Unit test program
         obj = bld(features     = 'c cprogram',
-                  source       = 'test/slv2_test.c',
+                  source       = 'test/lilv_test.c',
                   includes     = ['.', './src'],
-                  use          = 'libslv2_static',
+                  use          = 'liblilv_static',
                   uselib       = 'SORD SERD LV2CORE',
                   linkflags    = linkflags + ['-lgcov'],
-                  target       = 'test/slv2_test',
+                  target       = 'test/lilv_test',
                   install_path = '',
                   cflags       = [ '-fprofile-arcs',  '-ftest-coverage' ])
 
@@ -251,66 +232,66 @@ def build(bld):
         utils = '''
             utils/lv2_inspect
             utils/lv2_list
-            utils/slv2_bench
+            utils/lilv_bench
         '''
         for i in utils.split():
             obj = bld(features     = 'c cprogram',
                       source       = i + '.c',
                       includes     = ['.', './src', './utils'],
-                      use          = 'libslv2',
+                      use          = 'liblilv',
                       target       = i,
                       install_path = '${BINDIR}')
 
     # JACK Host
-    if bld.is_defined('SLV2_USE_JACK'):
+    if bld.is_defined('LILV_USE_JACK'):
         obj = bld(features     = 'c cprogram',
                   source       = 'utils/lv2_jack_host.c',
                   includes     = ['.', './src', './utils'],
                   uselib       = 'JACK',
-                  use          = 'libslv2',
+                  use          = 'liblilv',
                   target       = 'utils/lv2_jack_host',
                   install_path = '${BINDIR}')
-        if bld.is_defined('SLV2_JACK_SESSION'):
+        if bld.is_defined('LILV_JACK_SESSION'):
             autowaf.use_lib(bld, obj, 'GLIB GTHREAD')
 
     # Documentation
-    autowaf.build_dox(bld, 'SLV2', SLV2_VERSION, top, out)
+    autowaf.build_dox(bld, 'LILV', LILV_VERSION, top, out)
 
     # Bash completion
     if bld.env['BASH_COMPLETION']:
         bld.install_as(
-            '/etc/bash_completion.d/slv2', 'utils/slv2.bash_completion')
+            '/etc/bash_completion.d/lilv', 'utils/lilv.bash_completion')
 
-    if bld.is_defined('SLV2_SWIG'):
+    if bld.is_defined('LILV_SWIG'):
         # Python Wrapper
         obj = bld(features   = 'cxx cxxshlib pyext',
-                  source     = 'swig/slv2.i',
-                  target     = 'swig/_slv2',
+                  source     = 'swig/lilv.i',
+                  target     = 'swig/_lilv',
                   includes   = ['..'],
-                  swig_flags = '-c++ -python -Wall -I.. -lslv2 -features autodoc=1',
-                  vnum       = SLV2_LIB_VERSION,
-                  use        = 'libslv2')
-        autowaf.use_lib(bld, obj, 'SLV2')
+                  swig_flags = '-c++ -python -Wall -I.. -llilv -features autodoc=1',
+                  vnum       = LILV_LIB_VERSION,
+                  use        = 'liblilv')
+        autowaf.use_lib(bld, obj, 'LILV')
 
-        bld.install_files('${PYTHONDIR}', 'swig/slv2.py')
+        bld.install_files('${PYTHONDIR}', 'swig/lilv.py')
 
     bld.add_post_fun(autowaf.run_ldconfig)
 
 def fix_docs(ctx):
     try:
         os.chdir('build/doc/html')
-        os.system("sed -i 's/SLV2_API //' group__slv2.html")
-        os.system("sed -i 's/SLV2_DEPRECATED //' group__slv2.html")
+        os.system("sed -i 's/LILV_API //' group__lilv.html")
+        os.system("sed -i 's/LILV_DEPRECATED //' group__lilv.html")
         os.remove('index.html')
-        os.symlink('group__slv2.html',
+        os.symlink('group__lilv.html',
                    'index.html')
     except Exception, e:
         Logs.error("Failed to fix up Doxygen documentation (%s)\n" % e)
 
 def upload_docs(ctx):
-    os.system("rsync -avz --delete -e ssh build/doc/html/* drobilla@drobilla.net:~/drobilla.net/docs/slv2")
+    os.system("rsync -avz --delete -e ssh build/doc/html/* drobilla@drobilla.net:~/drobilla.net/docs/lilv")
 
 def test(ctx):
     autowaf.pre_test(ctx, APPNAME)
-    autowaf.run_tests(ctx, APPNAME, ['test/slv2_test'], dirs=['./src','./test'])
+    autowaf.run_tests(ctx, APPNAME, ['test/lilv_test'], dirs=['./src','./test'])
     autowaf.post_test(ctx, APPNAME)