13
0

Source-tree consistency (headless tools at top-level)

This move ardour-lua session tool to top-level, next to
headless/hardev.
This commit is contained in:
Robin Gareus 2020-03-26 19:00:11 +01:00
parent e7cdc91770
commit e219a6cd1e
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
9 changed files with 13 additions and 15 deletions

View File

@ -168,7 +168,7 @@ headless/
session_utils/ session_utils/
command-line tools using libardour (e.g. export) command-line tools using libardour (e.g. export)
tools/luadevel/ luasession/
arlua -- commandline interface to libardour arlua -- commandline interface to libardour
vst vst

View File

@ -17,7 +17,7 @@ fi
if test -z "$DBG"; then if test -z "$DBG"; then
exec $TOP/build/tools/luadevel/luasession "$@" exec $TOP/build/luasession/luasession "$@"
fi fi
if test "$DBG" = "valgrind"; then if test "$DBG" = "valgrind"; then
@ -28,7 +28,7 @@ if test "$DBG" = "valgrind"; then
--track-origins=yes \ --track-origins=yes \
--leak-check=full --show-leak-kinds=all \ --leak-check=full --show-leak-kinds=all \
--suppressions=${TOP}/tools/valgrind.supp \ --suppressions=${TOP}/tools/valgrind.supp \
$TOP/build/tools/luadevel/luasession "$@" $TOP/build/luasession/luasession "$@"
fi fi
if test "$DBG" = "callgrind"; then if test "$DBG" = "callgrind"; then
@ -39,12 +39,12 @@ if test "$DBG" = "callgrind"; then
--separate-threads=yes \ --separate-threads=yes \
--collect-systime=yes \ --collect-systime=yes \
--collect-jumps=yes \ --collect-jumps=yes \
$TOP/build/tools/luadevel/luasession "$@" $TOP/build/luasession/luasession "$@"
fi fi
if test -n "`which gdb`"; then if test -n "`which gdb`"; then
exec gdb --args $TOP/build/tools/luadevel/luasession "$@" exec gdb --args $TOP/build/luasession/luasession "$@"
fi fi
if test -n "`which lldb`"; then if test -n "`which lldb`"; then
exec lldb -- $TOP/build/tools/luadevel/luasession "$@" exec lldb -- $TOP/build/luasession/luasession "$@"
fi fi

View File

@ -472,9 +472,9 @@ for file in $BUILD_ROOT/session_utils/${lower_case_appname}${major_version}-*; d
HAVE_SESSION_UTILS=true HAVE_SESSION_UTILS=true
done 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 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 if test x$STRIP = xall ; then
strip -s $APPLIB/${BN} strip -s $APPLIB/${BN}
fi fi

View File

@ -342,9 +342,7 @@ cp $BUILD_ROOT/libs/surfaces/control_protocol/libardourcp*.dylib $Frameworks
cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners cp $BUILD_ROOT/libs/panners/*/lib*.dylib $Panners
# Backends # Backends
for backend in jack wavesaudio dummy coreaudio; do cp $BUILD_ROOT/libs/backends/*/lib*.dylib $Backends
cp $BUILD_ROOT/libs/backends/$backend/lib*.dylib $Backends
done
# Export Formats/Presets # Export Formats/Presets
for f in $BUILD_ROOT/../share/export/*.preset $BUILD_ROOT/../share/export/*.format ; do 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 HAVE_SESSION_UTILS=true
done 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 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 if test x$STRIP = xall ; then
strip -s $Frameworks/${BN} strip -s $Frameworks/${BN}
fi fi

View File

@ -144,7 +144,7 @@ cp build/libs/ptformat/ptformat-*.dll $DESTDIR/bin/
cp build/libs/audiographer/audiographer-*.dll $DESTDIR/bin/ cp build/libs/audiographer/audiographer-*.dll $DESTDIR/bin/
cp build/libs/fst/ardour-vst-scanner.exe $DESTDIR/bin/ || true cp build/libs/fst/ardour-vst-scanner.exe $DESTDIR/bin/ || true
cp build/session_utils/*-*.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} cp `ls -t build/gtk2_ardour/ardour-*.exe | head -n1` $DESTDIR/bin/${PRODUCT_EXE}
mkdir -p $DESTDIR/lib/gtk-2.0/engines mkdir -p $DESTDIR/lib/gtk-2.0/engines

View File

@ -274,12 +274,12 @@ children = [
'share/plugin_metadata', 'share/plugin_metadata',
'share/scripts', 'share/scripts',
'headless', 'headless',
'luasession',
'session_utils', 'session_utils',
# shared helper binaries (plugin-scanner, exec-wrapper) # shared helper binaries (plugin-scanner, exec-wrapper)
'libs/fst', 'libs/fst',
'libs/vfork', 'libs/vfork',
'libs/ardouralsautil', 'libs/ardouralsautil',
'tools/luadevel',
] ]
i18n_children = [ i18n_children = [