From e219a6cd1e786dd8a8daa6e6da28953ae3705fcb Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 26 Mar 2020 19:00:11 +0100
Subject: [PATCH] Source-tree consistency (headless tools at top-level)

This move ardour-lua session tool to top-level, next to
headless/hardev.
---
 doc/source_tree_layout.txt                      |  2 +-
 gtk2_ardour/arlua                               | 10 +++++-----
 {tools/luadevel => luasession}/ardour-lua.sh.in |  0
 {tools/luadevel => luasession}/luasession.cc    |  0
 {tools/luadevel => luasession}/wscript          |  0
 tools/linux_packaging/build                     |  4 ++--
 tools/osx_packaging/osx_build                   |  8 +++-----
 tools/x-win/package.sh                          |  2 +-
 wscript                                         |  2 +-
 9 files changed, 13 insertions(+), 15 deletions(-)
 rename {tools/luadevel => luasession}/ardour-lua.sh.in (100%)
 rename {tools/luadevel => luasession}/luasession.cc (100%)
 rename {tools/luadevel => luasession}/wscript (100%)

diff --git a/doc/source_tree_layout.txt b/doc/source_tree_layout.txt
index 87226ee7d4..e75675e6f0 100644
--- a/doc/source_tree_layout.txt
+++ b/doc/source_tree_layout.txt
@@ -168,7 +168,7 @@ headless/
 session_utils/
  command-line tools using libardour (e.g. export)
 
-tools/luadevel/
+luasession/
  arlua -- commandline interface to libardour
 
 vst
diff --git a/gtk2_ardour/arlua b/gtk2_ardour/arlua
index 1286f79d6a..67d4d57ba7 100755
--- a/gtk2_ardour/arlua
+++ b/gtk2_ardour/arlua
@@ -17,7 +17,7 @@ fi
 
 
 if test -z "$DBG"; then
-	exec $TOP/build/tools/luadevel/luasession "$@"
+	exec $TOP/build/luasession/luasession "$@"
 fi
 
 if test "$DBG" = "valgrind"; then
@@ -28,7 +28,7 @@ if test "$DBG" = "valgrind"; then
 		--track-origins=yes \
 		 --leak-check=full --show-leak-kinds=all \
 		--suppressions=${TOP}/tools/valgrind.supp \
-		$TOP/build/tools/luadevel/luasession "$@"
+		$TOP/build/luasession/luasession "$@"
 fi
 
 if test "$DBG" = "callgrind"; then
@@ -39,12 +39,12 @@ if test "$DBG" = "callgrind"; then
 		--separate-threads=yes \
 		--collect-systime=yes \
 		--collect-jumps=yes \
-		$TOP/build/tools/luadevel/luasession "$@"
+		$TOP/build/luasession/luasession "$@"
 fi
 
 if test -n "`which gdb`"; then
-	exec gdb --args $TOP/build/tools/luadevel/luasession "$@"
+	exec gdb --args $TOP/build/luasession/luasession "$@"
 fi
 if test -n "`which lldb`"; then
-	exec lldb -- $TOP/build/tools/luadevel/luasession "$@"
+	exec lldb -- $TOP/build/luasession/luasession "$@"
 fi
diff --git a/tools/luadevel/ardour-lua.sh.in b/luasession/ardour-lua.sh.in
similarity index 100%
rename from tools/luadevel/ardour-lua.sh.in
rename to luasession/ardour-lua.sh.in
diff --git a/tools/luadevel/luasession.cc b/luasession/luasession.cc
similarity index 100%
rename from tools/luadevel/luasession.cc
rename to luasession/luasession.cc
diff --git a/tools/luadevel/wscript b/luasession/wscript
similarity index 100%
rename from tools/luadevel/wscript
rename to luasession/wscript
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 359fdbc805..d94f59727f 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -472,9 +472,9 @@ for file in $BUILD_ROOT/session_utils/${lower_case_appname}${major_version}-*; d
 	HAVE_SESSION_UTILS=true
 done
 
-if test -x $BUILD_ROOT/tools/luadevel/luasession; then
+if test -x $BUILD_ROOT/luasession/luasession; then
 	BN=${lower_case_appname}${major_version}-lua
-	cp -v $BUILD_ROOT/tools/luadevel/luasession $APPLIB/$BN
+	cp -v $BUILD_ROOT/luasession/luasession $APPLIB/$BN
 	if test x$STRIP = xall ; then
 		strip -s $APPLIB/${BN}
 	fi
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 04fc0e6640..1559735a6c 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -342,9 +342,7 @@ cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp*.dylib $Frameworks
 cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners
 
 # Backends
-for backend in jack wavesaudio dummy coreaudio; do
-	cp $BUILD_ROOT/libs/backends/$backend/lib*.dylib $Backends
-done
+cp $BUILD_ROOT/libs/backends/*/lib*.dylib $Backends
 
 # Export Formats/Presets
 for f in $BUILD_ROOT/../share/export/*.preset $BUILD_ROOT/../share/export/*.format ; do
@@ -434,9 +432,9 @@ for file in $BUILD_ROOT/session_utils/${lower_case_appname}${major_version}-*; d
 	HAVE_SESSION_UTILS=true
 done
 
-if test -x $BUILD_ROOT/tools/luadevel/luasession; then
+if test -x $BUILD_ROOT/luasession/luasession; then
 	BN=${lower_case_appname}${major_version}-lua
-	cp -v $BUILD_ROOT/tools/luadevel/luasession $Frameworks/$BN
+	cp -v $BUILD_ROOT/luasession/luasession $Frameworks/$BN
 	if test x$STRIP = xall ; then
 		strip -s $Frameworks/${BN}
 	fi
diff --git a/tools/x-win/package.sh b/tools/x-win/package.sh
index b2e8190377..237a472d6a 100755
--- a/tools/x-win/package.sh
+++ b/tools/x-win/package.sh
@@ -144,7 +144,7 @@ cp build/libs/ptformat/ptformat-*.dll $DESTDIR/bin/
 cp build/libs/audiographer/audiographer-*.dll $DESTDIR/bin/
 cp build/libs/fst/ardour-vst-scanner.exe $DESTDIR/bin/ || true
 cp build/session_utils/*-*.exe $DESTDIR/bin/ || true
-cp build/tools/luadevel/ardour6-lua.exe $DESTDIR/bin/ || true
+cp build/luasession/ardour6-lua.exe $DESTDIR/bin/ || true
 cp `ls -t build/gtk2_ardour/ardour-*.exe | head -n1` $DESTDIR/bin/${PRODUCT_EXE}
 
 mkdir -p $DESTDIR/lib/gtk-2.0/engines
diff --git a/wscript b/wscript
index 8270411ae5..dbb85708c9 100644
--- a/wscript
+++ b/wscript
@@ -274,12 +274,12 @@ children = [
         'share/plugin_metadata',
         'share/scripts',
         'headless',
+        'luasession',
         'session_utils',
         # shared helper binaries (plugin-scanner, exec-wrapper)
         'libs/fst',
         'libs/vfork',
         'libs/ardouralsautil',
-        'tools/luadevel',
 ]
 
 i18n_children = [