diff options
| author | David Robillard <d@drobilla.net> | 2019-03-15 22:17:08 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-03-17 00:31:46 +0100 |
| commit | 29d4d293d23759b39e152241ab3669583afbdeca (patch) | |
| tree | a65a48d21b73c0c958d8fd2eef7302195482690d | |
| parent | 9fde01f46c499ee214d8c6b79abd876c7ff5cdc1 (diff) | |
| download | autowaf-29d4d293d23759b39e152241ab3669583afbdeca.tar.gz autowaf-29d4d293d23759b39e152241ab3669583afbdeca.tar.bz2 autowaf-29d4d293d23759b39e152241ab3669583afbdeca.zip | |
Fix in-tree library paths
| -rw-r--r-- | extras/autowaf.py | 3 | ||||
| -rw-r--r-- | extras/lv2.py | 32 |
2 files changed, 32 insertions, 3 deletions
diff --git a/extras/autowaf.py b/extras/autowaf.py index 39bed3a..554c312 100644 --- a/extras/autowaf.py +++ b/extras/autowaf.py @@ -480,11 +480,12 @@ def set_lib_env(conf, name, version): major_ver = version.split('.')[0] pkg_var_name = 'PKG_' + name.replace('-', '_') + '_' + major_ver lib_name = '%s-%s' % (name, major_ver) + lib_path = [str(conf.path.get_bld())] if conf.env.PARDEBUG: lib_name += 'D' conf.env[pkg_var_name] = lib_name conf.env['INCLUDES_' + NAME] = ['${INCLUDEDIR}/%s-%s' % (name, major_ver)] - conf.env['LIBPATH_' + NAME] = [conf.env.LIBDIR] + conf.env['LIBPATH_' + NAME] = lib_path conf.env['LIB_' + NAME] = [lib_name] conf.define(NAME + '_VERSION', version) diff --git a/extras/lv2.py b/extras/lv2.py index 815987f..ffcb2e7 100644 --- a/extras/lv2.py +++ b/extras/lv2.py @@ -10,6 +10,33 @@ def options(opt): help='install LV2 bundles to user location') conf_opts.add_option('--lv2dir', type='string', help='LV2 bundles [Default: LIBDIR/lv2]') + +def register_lv2_path(conf, path): + """Return the default LV2_PATH to use for this system""" + if 'LV2_PATH' not in conf.run_env and 'LV2_PATH' not in os.environ: + conf.run_env['LV2_PATH'] = [conf.env['LV2DIR']] + + conf.run_env.append_unique('LV2_PATH', path) + +def default_lv2_path(conf): + """Return the default LV2_PATH for the build target as a list""" + if conf.env.DEST_OS == 'darwin': + return ['~/Library/Audio/Plug-Ins/LV2', + '~/.lv2', + '/usr/local/lib/lv2', + '/usr/lib/lv2', + '/Library/Audio/Plug-Ins/LV2'] + elif conf.env.DEST_OS == 'haiku': + return ['~/.lv2', + '/boot/common/add-ons/lv2'] + elif conf.env.DEST_OS == 'win32': + return ['%APPDATA%\\\\LV2', + '%COMMONPROGRAMFILES%\\\\LV2'] + else: + libdirname = os.path.basename(conf.env.LIBDIR) + return ['~/.lv2', + '/usr/%s/lv2' % libdirname, + '/usr/local/%s/lv2' % libdirname] def configure(conf): def env_path(parent_dir_var, name): @@ -43,5 +70,6 @@ def configure(conf): else: conf.env['LV2DIR'] = os.path.join(conf.env['LIBDIR'], 'lv2') - conf.env['LV2DIR'] = normpath(conf.env['LV2DIR']) - + # Add default LV2_PATH to runtime environment for tests that use plugins + if 'LV2_PATH' not in os.environ: + conf.run_env['LV2_PATH'] = default_lv2_path(conf) |