From d521c2ede681f6d2188d4e9b6c6d9ec9c22d2100 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 19 Nov 2022 00:07:22 +0100 Subject: [PATCH] src-tree cleanup: separate surfaces from libraries libardourcp and now libardour_midisurface are not control surfaces, but helper libraries for those. They need to be deployed to the library folder (shared between ctrl surfaces) and not scanned as ctrl surfaces at runtime. --- gtk2_ardour/ardev_common.sh.in | 2 +- libs/ardour/wscript | 2 +- .../control_protocol/MSVCardour_cp/ardour_cp.vcproj | 0 .../{surfaces => ctrl-interface}/control_protocol/basic_ui.cc | 0 .../control_protocol/control_protocol.cc | 0 .../control_protocol/control_protocol/basic_ui.h | 0 .../control_protocol/control_protocol/control_protocol.h | 0 .../control_protocol/control_protocol/types.h | 0 .../control_protocol/control_protocol/visibility.h | 0 libs/{surfaces => ctrl-interface}/control_protocol/wscript | 0 .../midi_surface/midi_byte_array.cc | 0 .../{surfaces => ctrl-interface}/midi_surface/midi_surface.cc | 0 .../midi_surface}/midi_surface/midi_byte_array.h | 0 .../midi_surface}/midi_surface/midi_surface.h | 0 libs/{surfaces => ctrl-interface}/midi_surface/wscript | 4 ++-- libs/surfaces/faderport/wscript | 2 +- libs/surfaces/wscript | 4 ---- tools/linux_packaging/build | 2 +- tools/osx_packaging/osx_build | 2 +- wscript | 1 + 20 files changed, 8 insertions(+), 11 deletions(-) rename libs/{surfaces => ctrl-interface}/control_protocol/MSVCardour_cp/ardour_cp.vcproj (100%) rename libs/{surfaces => ctrl-interface}/control_protocol/basic_ui.cc (100%) rename libs/{surfaces => ctrl-interface}/control_protocol/control_protocol.cc (100%) rename libs/{surfaces => ctrl-interface}/control_protocol/control_protocol/basic_ui.h (100%) rename libs/{surfaces => ctrl-interface}/control_protocol/control_protocol/control_protocol.h (100%) rename libs/{surfaces => ctrl-interface}/control_protocol/control_protocol/types.h (100%) rename libs/{surfaces => ctrl-interface}/control_protocol/control_protocol/visibility.h (100%) rename libs/{surfaces => ctrl-interface}/control_protocol/wscript (100%) rename libs/{surfaces => ctrl-interface}/midi_surface/midi_byte_array.cc (100%) rename libs/{surfaces => ctrl-interface}/midi_surface/midi_surface.cc (100%) rename libs/{surfaces => ctrl-interface/midi_surface}/midi_surface/midi_byte_array.h (100%) rename libs/{surfaces => ctrl-interface/midi_surface}/midi_surface/midi_surface.h (100%) rename libs/{surfaces => ctrl-interface}/midi_surface/wscript (89%) diff --git a/gtk2_ardour/ardev_common.sh.in b/gtk2_ardour/ardev_common.sh.in index 60afd64190..d0779148f9 100644 --- a/gtk2_ardour/ardev_common.sh.in +++ b/gtk2_ardour/ardev_common.sh.in @@ -42,7 +42,7 @@ export ARDOUR_DLL_PATH=$libs export GTK_PATH=~/.ardour3:$libs/clearlooks-newer export VAMP_PATH=$libs/vamp-plugins:$libs/vamp-pyin${VAMP_PATH:+:$VAMP_PATH} -export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/surfaces/control_protocol:$libs/surfaces/midi_surface:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +export LD_LIBRARY_PATH=$libs/ptformat:$libs/qm-dsp:$libs/vamp-sdk:$libs/surfaces:$libs/ctrl-interface/control_protocol:$libs/ctrl-interface/midi_surface:$libs/ardour:$libs/midi++2:$libs/pbd:$libs/rubberband:$libs/soundtouch:$libs/gtkmm2ext:$libs/widgets:$libs/appleutility:$libs/taglib:$libs/evoral:$libs/evoral/src/libsmf:$libs/audiographer:$libs/temporal:$libs/libltc:$libs/canvas:$libs/waveview:$libs/ardouralsautil${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} # DYLD_LIBRARY_PATH is for darwin. export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH diff --git a/libs/ardour/wscript b/libs/ardour/wscript index 7f399ba317..f676f11130 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -391,7 +391,7 @@ def build(bld): obj.defines = [] obj.export_includes = ['.'] - obj.includes = ['.', '../vst3/', '../surfaces/control_protocol', '..'] + obj.includes = ['.', '../vst3/', '../ctrl-interface/control_protocol', '..'] obj.name = 'libardour' obj.target = 'ardour' obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID', 'LO', diff --git a/libs/surfaces/control_protocol/MSVCardour_cp/ardour_cp.vcproj b/libs/ctrl-interface/control_protocol/MSVCardour_cp/ardour_cp.vcproj similarity index 100% rename from libs/surfaces/control_protocol/MSVCardour_cp/ardour_cp.vcproj rename to libs/ctrl-interface/control_protocol/MSVCardour_cp/ardour_cp.vcproj diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/ctrl-interface/control_protocol/basic_ui.cc similarity index 100% rename from libs/surfaces/control_protocol/basic_ui.cc rename to libs/ctrl-interface/control_protocol/basic_ui.cc diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/ctrl-interface/control_protocol/control_protocol.cc similarity index 100% rename from libs/surfaces/control_protocol/control_protocol.cc rename to libs/ctrl-interface/control_protocol/control_protocol.cc diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h similarity index 100% rename from libs/surfaces/control_protocol/control_protocol/basic_ui.h rename to libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h similarity index 100% rename from libs/surfaces/control_protocol/control_protocol/control_protocol.h rename to libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h diff --git a/libs/surfaces/control_protocol/control_protocol/types.h b/libs/ctrl-interface/control_protocol/control_protocol/types.h similarity index 100% rename from libs/surfaces/control_protocol/control_protocol/types.h rename to libs/ctrl-interface/control_protocol/control_protocol/types.h diff --git a/libs/surfaces/control_protocol/control_protocol/visibility.h b/libs/ctrl-interface/control_protocol/control_protocol/visibility.h similarity index 100% rename from libs/surfaces/control_protocol/control_protocol/visibility.h rename to libs/ctrl-interface/control_protocol/control_protocol/visibility.h diff --git a/libs/surfaces/control_protocol/wscript b/libs/ctrl-interface/control_protocol/wscript similarity index 100% rename from libs/surfaces/control_protocol/wscript rename to libs/ctrl-interface/control_protocol/wscript diff --git a/libs/surfaces/midi_surface/midi_byte_array.cc b/libs/ctrl-interface/midi_surface/midi_byte_array.cc similarity index 100% rename from libs/surfaces/midi_surface/midi_byte_array.cc rename to libs/ctrl-interface/midi_surface/midi_byte_array.cc diff --git a/libs/surfaces/midi_surface/midi_surface.cc b/libs/ctrl-interface/midi_surface/midi_surface.cc similarity index 100% rename from libs/surfaces/midi_surface/midi_surface.cc rename to libs/ctrl-interface/midi_surface/midi_surface.cc diff --git a/libs/surfaces/midi_surface/midi_byte_array.h b/libs/ctrl-interface/midi_surface/midi_surface/midi_byte_array.h similarity index 100% rename from libs/surfaces/midi_surface/midi_byte_array.h rename to libs/ctrl-interface/midi_surface/midi_surface/midi_byte_array.h diff --git a/libs/surfaces/midi_surface/midi_surface.h b/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h similarity index 100% rename from libs/surfaces/midi_surface/midi_surface.h rename to libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h diff --git a/libs/surfaces/midi_surface/wscript b/libs/ctrl-interface/midi_surface/wscript similarity index 89% rename from libs/surfaces/midi_surface/wscript rename to libs/ctrl-interface/midi_surface/wscript index 8dd9bf5a4a..c7e9e33a06 100644 --- a/libs/surfaces/midi_surface/wscript +++ b/libs/ctrl-interface/midi_surface/wscript @@ -18,7 +18,7 @@ def build(bld): midi_surface.cc midi_byte_array.cc ''' - obj.export_includes = ['.'] + obj.export_includes = ['.', './midi_surface'] obj.defines = [ 'PACKAGE="ardour_midisurface"' ] obj.defines += [ 'ARDOURSURFACE_DLL_EXPORTS' ] obj.defines += [ 'VERSIONSTRING="' + bld.env['VERSION'] + '"' ] @@ -27,7 +27,7 @@ def build(bld): obj.target = 'ardour_midisurface' obj.uselib = 'GLIB GLIBMM SIGCPP XML OSX' obj.use = 'libardour libardour_cp libpbd libevoral libmidipp libtemporal' - obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces') + obj.install_path = bld.env['LIBDIR'] def shutdown(): autowaf.shutdown() diff --git a/libs/surfaces/faderport/wscript b/libs/surfaces/faderport/wscript index 64b4e55721..c442bb78d9 100644 --- a/libs/surfaces/faderport/wscript +++ b/libs/surfaces/faderport/wscript @@ -23,7 +23,7 @@ def build(bld): obj.export_includes = ['.'] obj.defines = [ 'PACKAGE="ardour_faderport"' ] obj.defines += [ 'ARDOURSURFACE_DLL_EXPORTS' ] - obj.includes = [ '.', '..', './faderport'] + obj.includes = [ '.', './faderport'] obj.name = 'libardour_faderport' obj.target = 'ardour_faderport' obj.uselib = 'GTKMM GTK GDK XML OSX' diff --git a/libs/surfaces/wscript b/libs/surfaces/wscript index 4a61f09a33..49d74c7af8 100644 --- a/libs/surfaces/wscript +++ b/libs/surfaces/wscript @@ -20,8 +20,6 @@ top = '.' out = 'build' children = [ - 'control_protocol', - 'midi_surface', 'faderport', 'faderport8', 'cc121', @@ -82,8 +80,6 @@ def configure(conf): sub_config_and_use(conf, i) def build(bld): - bld.recurse('control_protocol') - bld.recurse('midi_surface') bld.recurse('generic_midi') bld.recurse('faderport') bld.recurse('faderport8') diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 6da2368f1e..b34bce2b03 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -353,7 +353,7 @@ cp $GTKSTACK_ROOT/lib/gtk-2.0/2.10.0/engines/libpixmap.so $Libraries # Control Surfaces cp $BUILD_ROOT/libs/surfaces/*/libardour_*.so* $Surfaces -cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp.so* $Libraries +cp $BUILD_ROOT/libs/ctrl-interface/*/libardour_*.so* $Libraries # MidiMaps # got to be careful with names here diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 8f58222486..e52b43457c 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -316,7 +316,7 @@ cp $BUILD_ROOT/libs/clearlooks-newer/libclearlooks.dylib $GTK_ENGINE_DIR/libclea # Control Surface shared libraries cp $BUILD_ROOT/libs/surfaces/*/libardour_*.dylib $Surfaces -cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp*.dylib $Frameworks +cp $BUILD_ROOT/libs/ctrl-interface/*/libardour_*.dylib $Frameworks # Panners cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners diff --git a/wscript b/wscript index 1413480c54..62fb6ac02c 100644 --- a/wscript +++ b/wscript @@ -314,6 +314,7 @@ children = [ 'libs/pbd', 'libs/midi++2', 'libs/evoral', + 'libs/ctrl-interface', 'libs/surfaces', 'libs/panners', 'libs/backends',