From d3343700ded6086cd47b10ebe8b900988ef25068 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 4 Jun 2019 15:15:21 +0200 Subject: Package commandline Lua-session tool --- tools/linux_packaging/build | 10 ++++++++++ tools/luadevel/wscript | 25 +++++++++++++++---------- tools/osx_packaging/osx_build | 10 ++++++++++ 3 files changed, 35 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build index 923a6ea9ea..f2907adcaf 100755 --- a/tools/linux_packaging/build +++ b/tools/linux_packaging/build @@ -477,6 +477,16 @@ 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 + BN=${lower_case_appname}${major_version}-lua + cp -v $BUILD_ROOT/tools/luadevel/luasession $APPLIB/$BN + if test x$STRIP = xall ; then + strip -s $APPLIB/${BN} + fi + ln -s ../lib/ardour-util.sh $APPBIN/${BN} + HAVE_SESSION_UTILS=true +fi + if test "$HAVE_SESSION_UTILS" = true ; then cat >> $APPLIB/ardour-util.sh << EOF #!/bin/sh diff --git a/tools/luadevel/wscript b/tools/luadevel/wscript index db6777fb5f..75fe790f39 100755 --- a/tools/luadevel/wscript +++ b/tools/luadevel/wscript @@ -43,15 +43,16 @@ def build(bld): obj.install_path = None ######################################### - # commandline luasession wrapper - obj = bld(features = 'subst') - obj.source = 'ardour-lua.sh.in' - obj.target = 'ardour' + str (bld.env['MAJOR']) + '-lua' - obj.chmod = Utils.O755 - obj.install_path = bld.env['BINDIR'] - obj.LIBDIR = os.path.normpath(bld.env['DLLDIR']) - obj.DATADIR = os.path.normpath(bld.env['DATADIR']) - obj.CONFDIR = os.path.normpath(bld.env['CONFDIR']) + # commandline luasession wrapper script + if bld.env['build_target'] != 'mingw': + obj = bld(features = 'subst') + obj.source = 'ardour-lua.sh.in' + obj.target = 'ardour' + str (bld.env['MAJOR']) + '-lua' + obj.chmod = Utils.O755 + obj.install_path = bld.env['BINDIR'] + obj.LIBDIR = os.path.normpath(bld.env['DLLDIR']) + obj.DATADIR = os.path.normpath(bld.env['DATADIR']) + obj.CONFDIR = os.path.normpath(bld.env['CONFDIR']) # commandline luasession obj = bld (features = 'cxx c cxxprogram') @@ -90,4 +91,8 @@ def build(bld): if bld.is_defined('NEED_INTL'): obj.linkflags = ' -lintl' - obj.install_path = bld.env['DLLDIR'] + if bld.env['build_target'] == 'mingw': + obj.install_path = bld.env['BINDIR'] + obj.target = 'ardour' + str (bld.env['MAJOR']) + '-lua' + else: + obj.install_path = bld.env['DLLDIR'] diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build index 08f47e5cd6..15bc3a47cd 100755 --- a/tools/osx_packaging/osx_build +++ b/tools/osx_packaging/osx_build @@ -428,6 +428,16 @@ 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 + BN=${lower_case_appname}${major_version}-lua + cp -v $BUILD_ROOT/tools/luadevel/luasession $Frameworks/$BN + if test x$STRIP = xall ; then + strip -s $Frameworks/${BN} + fi + ln -s ../lib/ardour-util.sh ${APPROOT}/MacOS/${BN} + HAVE_SESSION_UTILS=true +fi + # dynamically loaded NSS/SSL libs nsslibs="libsoftokn3.dylib libnsspem.dylib libnssckbi.dylib libfreebl3.dylib libnssdbm3.dylib libplds4.dylib" for nsslib in $nsslibs; do -- cgit v1.2.3