smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 07:45:00 +01:00
Code Issues Projects Releases Wiki Activity

install all additional binaries in $libdir

Browse source
This commit is contained in:
Robin Gareus 2014-11-13 19:57:40 +01:00
parent 9a9a8f78ef
commit cb38034334
6 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/ardour/plugin_manager.cc
View file

@ -116,12 +116,17 @@ PluginManager::PluginManager ()
string lrdf_path; string lrdf_path;
#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT #if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
// source-tree (ardev, etc)
PBD::Searchpath vstsp(Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst")); PBD::Searchpath vstsp(Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst"));
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
// on windows the .exe needs to be in the same folder with libardour.dll
vstsp += Glib::build_filename(g_win32_get_package_installation_directory_of_module (0), "bin"); vstsp += Glib::build_filename(g_win32_get_package_installation_directory_of_module (0), "bin");
#else #else
vstsp += Glib::getenv("PATH"); // on Unices additional internal-use binaries are deployed to $libdir
vstsp += ARDOUR::ardour_dll_directory();
#endif #endif
if (!PBD::find_file (vstsp, if (!PBD::find_file (vstsp,
#ifdef PLATFORM_WINDOWS #ifdef PLATFORM_WINDOWS
#ifdef DEBUGGABLE_SCANNER_APP #ifdef DEBUGGABLE_SCANNER_APP

5
libs/ardour/system_exec.cc
View file

@ -35,7 +35,10 @@ static char *vfork_exec_wrapper_path() {
#else #else
std::string vfork_exec_wrapper; std::string vfork_exec_wrapper;
if (!PBD::find_file ( if (!PBD::find_file (
PBD::Searchpath(Glib::build_filename(ARDOUR::ardour_dll_directory(), "vfork")), PBD::Searchpath(
ARDOUR::ardour_dll_directory() // deployed
+ G_SEARCHPATH_SEPARATOR_S + Glib::build_filename(ARDOUR::ardour_dll_directory(), "vfork") // src, build (ardev, etc)
),
"ardour-exec-wrapper", vfork_exec_wrapper)) { "ardour-exec-wrapper", vfork_exec_wrapper)) {
PBD::fatal << "vfork exec wrapper 'ardour-exec-wrapper' was not found in $PATH." << endmsg; PBD::fatal << "vfork exec wrapper 'ardour-exec-wrapper' was not found in $PATH." << endmsg;
/* not reached */ /* not reached */

4
libs/fst/wscript
View file

@ -51,7 +51,7 @@ def build(bld):
obj.source = 'scanner.wine' obj.source = 'scanner.wine'
obj.target = 'ardour-vst-scanner' obj.target = 'ardour-vst-scanner'
obj.chmod = Utils.O755 obj.chmod = Utils.O755
obj.install_path = os.path.join(bld.env['LIBDIR'], 'fst') obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.dict = { obj.dict = {
'VERSION' : bld.env['VERSION'], 'VERSION' : bld.env['VERSION'],
} }
@ -83,4 +83,4 @@ def build(bld):
'VST_SCANNER_APP', 'VST_SCANNER_APP',
'PACKAGE="' + I18N_PACKAGE + '"', 'PACKAGE="' + I18N_PACKAGE + '"',
] ]
obj.install_path = os.path.join(bld.env['LIBDIR'], 'fst') obj.install_path = os.path.join(bld.env['LIBDIR'])

2
libs/vfork/wscript
View file

@ -21,7 +21,7 @@ def build(bld):
obj = bld (features = 'c cprogram') obj = bld (features = 'c cprogram')
obj.source = 'exec_wrapper.c' obj.source = 'exec_wrapper.c'
obj.target = 'ardour-exec-wrapper' obj.target = 'ardour-exec-wrapper'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'vfork') obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.defines = [ obj.defines = [
'_POSIX_SOURCE', '_POSIX_SOURCE',
'_XOPEN_SOURCE=500', '_XOPEN_SOURCE=500',

2
tools/linux_packaging/build
View file

@ -418,7 +418,7 @@ fi
# vfork wrapper # vfork wrapper
if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $APPLIB
fi fi
# ALSA device reservation tool (if available) # ALSA device reservation tool (if available)

6
tools/osx_packaging/osx_build
View file

@ -110,7 +110,6 @@ ExportFormats=$Shared/export
Templates=$Shared/templates Templates=$Shared/templates
PatchFiles=$Shared/patchfiles PatchFiles=$Shared/patchfiles
MackieControl=$Shared/mcp MackieControl=$Shared/mcp
VFork=$Frameworks/vfork
if [ x$PRINT_SYSDEPS != x ] ; then if [ x$PRINT_SYSDEPS != x ] ; then
# #
@ -147,7 +146,6 @@ mkdir -p $Frameworks/modules
mkdir -p $Etc mkdir -p $Etc
mkdir -p $MackieControl mkdir -p $MackieControl
mkdir -p $PatchFiles mkdir -p $PatchFiles
mkdir -p $VFork
# maybe set variables # maybe set variables
env="" env=""
@ -393,13 +391,13 @@ fi
# VST scanner app and wrapper script, if they exist # VST scanner app and wrapper script, if they exist
if test -d $BUILD_ROOT/libs/fst ; then if test -d $BUILD_ROOT/libs/fst ; then
cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/ || true cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/
fi fi
# vfork wrapper # vfork wrapper
if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
mkdir -p $Frameworks/vfork mkdir -p $Frameworks/vfork
cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $Frameworks/
fi fi