From 8a93a87db0e90c1bf9057901950b7836630c3b1b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 16 Feb 2015 17:32:43 +0100 Subject: remove lib versioning for internal plugins Those objects do not have a versioned API by themselves. This fixes issues with duplicate deployment (OSX, Linux bundles: cp) and ardour listing control-surfaces multiple times (file index plugin dir). --- libs/backends/alsa/wscript | 6 ------ libs/backends/dummy/wscript | 7 ------- libs/backends/jack/wscript | 6 ------ libs/backends/wavesaudio/wscript | 7 ------- libs/panners/1in2out/wscript | 7 ------- libs/panners/2in2out/wscript | 7 ------- libs/panners/stereobalance/wscript | 7 ------- libs/panners/vbap/wscript | 7 ------- libs/surfaces/control_protocol/wscript | 8 -------- libs/surfaces/frontier/wscript | 14 -------------- libs/surfaces/generic_midi/wscript | 7 ------- libs/surfaces/mackie/wscript | 7 ------- libs/surfaces/osc/wscript | 7 ------- libs/surfaces/tranzport/wscript | 7 ------- libs/surfaces/wiimote/wscript | 7 ------- 15 files changed, 111 deletions(-) (limited to 'libs') diff --git a/libs/backends/alsa/wscript b/libs/backends/alsa/wscript index 173b6e0890..7a4649f779 100644 --- a/libs/backends/alsa/wscript +++ b/libs/backends/alsa/wscript @@ -4,11 +4,6 @@ import os import sys import re -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -ALSABACKEND_VERSION = '0.0.1' I18N_PACKAGE = 'alsa-backend' # Mandatory variables @@ -35,7 +30,6 @@ def build(bld): obj.target = 'alsa_audiobackend' obj.use = 'libardour libpbd ardouralsautil' obj.uselib = 'ALSA' - obj.vnum = ALSABACKEND_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends') obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 'ARDOURBACKEND_DLL_EXPORTS' diff --git a/libs/backends/dummy/wscript b/libs/backends/dummy/wscript index 9eb41a9ec0..e1a598525c 100644 --- a/libs/backends/dummy/wscript +++ b/libs/backends/dummy/wscript @@ -4,11 +4,6 @@ import os import sys import re -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -DUMMYBACKEND_VERSION = '0.0.1' I18N_PACKAGE = 'dummy-backend' # Mandatory variables @@ -30,8 +25,6 @@ def build(bld): obj.name = 'dummy_audiobackend' obj.target = 'dummy_audiobackend' obj.use = 'libardour libpbd' - if (bld.env['build_target'] != 'mingw'): - obj.vnum = DUMMYBACKEND_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends') obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"', 'ARDOURBACKEND_DLL_EXPORTS' diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript index 5cf7e91f02..d9e3146e7c 100644 --- a/libs/backends/jack/wscript +++ b/libs/backends/jack/wscript @@ -5,11 +5,6 @@ import os import sys import re -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -JACKBACKEND_VERSION = '1.0.0' I18N_PACKAGE = 'jack-backend' # Mandatory variables @@ -69,7 +64,6 @@ def build(bld): obj.uselib = [ 'PORTAUDIO' ] else: obj.uselib = [ ] - obj.vnum = JACKBACKEND_VERSION if bld.env['libjack_link'] == 'link': obj.uselib += [ 'JACK' ] diff --git a/libs/backends/wavesaudio/wscript b/libs/backends/wavesaudio/wscript index f37c7abbde..5235803034 100644 --- a/libs/backends/wavesaudio/wscript +++ b/libs/backends/wavesaudio/wscript @@ -4,11 +4,6 @@ import os import sys import re -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -WAVESAUDIOBACKEND_VERSION = '0.0.1' I18N_PACKAGE = 'wavesaudio-backend' # Mandatory variables @@ -95,8 +90,6 @@ def build(bld): obj.use = 'libardour libpbd' if bld.env['build_target'] == 'mingw': obj.uselib = ['PORTAUDIO'] - if (bld.env['build_target'] != 'mingw'): - obj.vnum = WAVESAUDIOBACKEND_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends') if bld.env['build_target']== 'mingw': diff --git a/libs/panners/1in2out/wscript b/libs/panners/1in2out/wscript index 6b7a04a7d9..2c1d9f1293 100644 --- a/libs/panners/1in2out/wscript +++ b/libs/panners/1in2out/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_PAN1IN2OUT_LIB_VERSION = '1.0.0' - # Mandatory variables top = '.' out = 'build' @@ -28,7 +22,6 @@ def build(bld): obj.name = 'libardour_pan1in2out' obj.target = 'pan1in2out' obj.use = 'libardour libardour_cp libpbd' - obj.vnum = LIBARDOUR_PAN1IN2OUT_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') def shutdown(): diff --git a/libs/panners/2in2out/wscript b/libs/panners/2in2out/wscript index f71f514b73..bd82526801 100644 --- a/libs/panners/2in2out/wscript +++ b/libs/panners/2in2out/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_PAN2IN2OUT_LIB_VERSION = '1.0.0' - # Mandatory variables top = '.' out = 'build' @@ -28,7 +22,6 @@ def build(bld): obj.name = 'libardour_pan2in2out' obj.target = 'pan2in2out' obj.use = 'libardour libardour_cp libpbd' - obj.vnum = LIBARDOUR_PAN2IN2OUT_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') def shutdown(): diff --git a/libs/panners/stereobalance/wscript b/libs/panners/stereobalance/wscript index 25ab9e5835..72b7c46f58 100644 --- a/libs/panners/stereobalance/wscript +++ b/libs/panners/stereobalance/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_PAN2IN2OUT_LIB_VERSION = '1.0.0' - # Mandatory variables top = '.' out = 'build' @@ -28,7 +22,6 @@ def build(bld): obj.name = 'libardour_panbalance' obj.target = 'panbalance' obj.use = 'libardour libardour_cp libpbd' - obj.vnum = LIBARDOUR_PAN2IN2OUT_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') def shutdown(): diff --git a/libs/panners/vbap/wscript b/libs/panners/vbap/wscript index c2bb313e27..bb2cb5bc39 100644 --- a/libs/panners/vbap/wscript +++ b/libs/panners/vbap/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_PANVBAP_LIB_VERSION = '1.0.0' - # Mandatory variables top = '.' out = 'build' @@ -28,7 +22,6 @@ def build(bld): obj.name = 'libardour_panvbap' obj.target = 'panvbap' obj.use = 'libardour libardour_cp libpbd' - obj.vnum = LIBARDOUR_PANVBAP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners') def shutdown(): diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript index 1c4235bd14..b3fcf236e4 100644 --- a/libs/surfaces/control_protocol/wscript +++ b/libs/surfaces/control_protocol/wscript @@ -2,13 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -APPNAME = 'libardour_cp' -LIBARDOUR_CP_LIB_VERSION = '4.1.0' - # Mandatory variables top = '.' out = 'build' @@ -40,7 +33,6 @@ def build(bld): obj.name = 'libardour_cp' obj.target = 'ardourcp' obj.use = 'libardour' - obj.vnum = LIBARDOUR_CP_LIB_VERSION obj.install_path = bld.env['LIBDIR'] def shutdown(): diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript index 614c6f2841..db9ffe76d1 100644 --- a/libs/surfaces/frontier/wscript +++ b/libs/surfaces/frontier/wscript @@ -2,19 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Version of this package (even if built as a child) -LIBSURFACES_VERSION = '4.1.0' - -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBSURFACES_LIB_VERSION = '4.1.0' - -# Variables for 'waf dist' -APPNAME = 'libsurfaces' -VERSION = LIBSURFACES_VERSION - # Mandatory variables top = '.' out = 'build' @@ -40,7 +27,6 @@ def build(bld): obj.name = 'libgeneric_midi' obj.target = 'generic_midi' obj.use = 'libardour libardourcp' - obj.vnum = LIBSURFACES_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') def shutdown(): diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript index b083423eec..39a6814c6a 100644 --- a/libs/surfaces/generic_midi/wscript +++ b/libs/surfaces/generic_midi/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_GENERIC_MIDI_LIB_VERSION = '4.1.0' - # Mandatory variables top = '.' out = 'build' @@ -37,7 +31,6 @@ def build(bld): obj.target = 'ardour_generic_midi' obj.uselib = 'GTKMM GTK GDK' obj.use = 'libardour libardour_cp libgtkmm2ext libpbd' - obj.vnum = LIBARDOUR_GENERIC_MIDI_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') def shutdown(): diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript index fd3e9552be..7657d76887 100644 --- a/libs/surfaces/mackie/wscript +++ b/libs/surfaces/mackie/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_MCP_LIB_VERSION = '4.1.0' - # Mandatory variables top = '.' out = 'build' @@ -49,7 +43,6 @@ def build(bld): obj.target = 'ardour_mcp' obj.uselib = 'GTKMM' obj.use = 'libardour libardour_cp libgtkmm2ext' - obj.vnum = LIBARDOUR_MCP_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') def shutdown(): diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript index fa4918a8f1..d6e8ff2f7c 100644 --- a/libs/surfaces/osc/wscript +++ b/libs/surfaces/osc/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_OSC_LIB_VERSION = '4.1.0' - # Mandatory variables top = '.' out = 'build' @@ -34,7 +28,6 @@ def build(bld): obj.target = 'ardour_osc' obj.uselib = ' LO ' obj.use = 'libardour libardour_cp libpbd' - obj.vnum = LIBARDOUR_OSC_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') def shutdown(): diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript index 6cbafb5173..21711149d7 100644 --- a/libs/surfaces/tranzport/wscript +++ b/libs/surfaces/tranzport/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_TRANZPORT_LIB_VERSION = '4.1.0' - # Mandatory variables top = '.' out = 'build' @@ -45,7 +39,6 @@ def build(bld): obj.name = 'libardour_tranzport' obj.target = 'ardour_tranzport' obj.use = 'libardour libardour_cp' - obj.vnum = LIBARDOUR_TRANZPORT_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') def shutdown(): diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript index b3ea4404a8..03d01635a1 100644 --- a/libs/surfaces/wiimote/wscript +++ b/libs/surfaces/wiimote/wscript @@ -2,12 +2,6 @@ from waflib.extras import autowaf as autowaf import os -# Library version (UNIX style major, minor, micro) -# major increment <=> incompatible changes -# minor increment <=> compatible changes (additions) -# micro increment <=> no interface changes -LIBARDOUR_WIIMOTE_LIB_VERSION = '4.1.0' - # Mandatory variables top = '.' out = 'build' @@ -32,7 +26,6 @@ def build(bld): obj.target = 'ardour_wiimote' obj.uselib = 'GTKMM CWIID' obj.use = 'libardour libardour_cp libgtkmm2ext' - obj.vnum = LIBARDOUR_WIIMOTE_LIB_VERSION obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') def shutdown(): -- cgit v1.2.3