finish unfinished work at basing all install paths on the program name

This commit is contained in:
Paul Davis 2014-04-28 21:11:08 -04:00
parent ff25ebe7d9
commit 058986f77b
34 changed files with 40 additions and 39 deletions

View File

@ -11,7 +11,7 @@ def configure(conf):
def build(bld):
presets = bld.path.ant_glob ('*.preset')
formats = bld.path.ant_glob ('*.format')
bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'export'),
bld.install_files (os.path.join(bld.env['DATADIR'], 'export'),
presets + formats)
def options(opt):

View File

@ -57,7 +57,7 @@ def build(bld):
'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
]
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.uselib = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD OGG CURL DL'
obj.uselib += ' FFTW3F'
obj.uselib += ' AUDIOUNITS OSX LO '

View File

@ -355,7 +355,7 @@ def build(bld):
obj.use.extend(['librubberband', 'libltc_includes', 'libltc'])
obj.vnum = LIBARDOUR_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.defines += [
'PACKAGE="' + I18N_PACKAGE + '"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',
@ -569,7 +569,7 @@ def create_ardour_test_program(bld, includes, name, target, sources):
testobj.name = name
testobj.target = target
# not sure about install path
testobj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
testobj.install_path = os.path.join(bld.env['LIBDIR'])
testobj.defines = [
'PACKAGE="libardour3test"',
'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"',

View File

@ -82,7 +82,7 @@ def build(bld):
audiographer.uselib = 'GLIB GLIBMM GTHREAD SAMPLERATE SNDFILE'
audiographer.use = 'libpbd'
audiographer.vnum = AUDIOGRAPHER_LIB_VERSION
audiographer.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
audiographer.install_path = os.path.join(bld.env['LIBDIR'])
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):

View File

@ -31,7 +31,7 @@ def build(bld):
obj.target = 'dummy_audiobackend'
obj.use = 'libardour libpbd'
obj.vnum = DUMMYBACKEND_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends')
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
'ARDOURBACKEND_DLL_EXPORTS'
]

View File

@ -51,7 +51,7 @@ def build(bld):
obj.uselib = [ 'JACK' ]
obj.use = 'libardour libpbd'
obj.vnum = JACKBACKEND_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends')
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
'ARDOURBACKEND_DLL_EXPORTS'
]

View File

@ -67,7 +67,7 @@ def build(bld):
obj.target = 'waves_audiobackend'
obj.use = [ 'libardour', 'libpbd' ]
obj.vnum = WAVESAUDIOBACKEND_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'backends')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends')
obj.defines = ['PACKAGE="' + I18N_PACKAGE + '"',
'__MACOS__',
'ARDOURBACKEND_DLL_EXPORTS'

View File

@ -85,7 +85,7 @@ def build(bld):
obj.name = 'libcanvas'
obj.target = 'canvas'
obj.vnum = CANVAS_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:

View File

@ -35,7 +35,7 @@ def build(bld):
obj.target = 'clearlooks'
obj.uselib = 'GTK'
obj.includes = '.'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'engines')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'engines')
autowaf.ensure_visible_symbols (obj, True)
if sys.platform == 'darwin':

View File

@ -73,7 +73,7 @@ def build(bld):
libsmf.uselib = 'GLIB'
libsmf.cxxflags = [ '-fPIC' ]
libsmf.cflags = [ '-fPIC' ]
libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
libsmf.install_path = os.path.join(bld.env['LIBDIR'])
lib_source = '''
src/Control.cpp
@ -108,7 +108,7 @@ def build(bld):
obj.uselib = 'GLIBMM GTHREAD SMF'
obj.use = 'libsmf libpbd'
obj.vnum = EVORAL_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="libevoral"', 'EVORAL_MIDI_XML=1' ]
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):

View File

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

View File

@ -101,7 +101,7 @@ def build(bld):
obj.uselib = 'GTKMM GTK GTKOSX OSX GDK'
obj.use = [ 'libpbd' ]
obj.vnum = GTKMM2EXT_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = os.path.join(bld.env['LIBDIR'])
obj.defines += [
'PACKAGE="' + I18N_PACKAGE + '"',
'LOCALEDIR="' + os.path.join(

View File

@ -75,7 +75,7 @@ def build(bld):
obj.uselib = 'GLIBMM SIGCPP XML OSX'
obj.use = 'libpbd libevoral libtimecode'
obj.vnum = LIBMIDIPP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = os.path.join(bld.env['LIBDIR'])
if bld.env['BUILD_TESTS'] and bld.is_defined('HAVE_CPPUNIT'):
# Unit tests

View File

@ -29,7 +29,7 @@ def build(bld):
obj.target = 'pan1in2out'
obj.use = 'libardour libardour_cp libpbd'
obj.vnum = LIBARDOUR_PAN1IN2OUT_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():
autowaf.shutdown()

View File

@ -29,7 +29,7 @@ def build(bld):
obj.target = 'pan2in2out'
obj.use = 'libardour libardour_cp libpbd'
obj.vnum = LIBARDOUR_PAN2IN2OUT_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():
autowaf.shutdown()

View File

@ -29,7 +29,7 @@ def build(bld):
obj.target = 'panbalance'
obj.use = 'libardour libardour_cp libpbd'
obj.vnum = LIBARDOUR_PAN2IN2OUT_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():
autowaf.shutdown()

View File

@ -29,7 +29,7 @@ def build(bld):
obj.target = 'panvbap'
obj.use = 'libardour libardour_cp libpbd'
obj.vnum = LIBARDOUR_PANVBAP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'panners')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'panners')
def shutdown():
autowaf.shutdown()

View File

@ -146,7 +146,7 @@ def build(bld):
obj.source += [ 'cocoa_open_uri.mm' ]
obj.uselib += ' OSX'
obj.vnum = LIBPBD_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = bld.env['LIBDIR']
obj.defines += [ 'PACKAGE="' + I18N_PACKAGE + '"',
]

View File

@ -53,7 +53,7 @@ def build(bld):
obj.name = 'libqmdsp'
obj.target = 'qmdsp'
obj.vnum = QM_DSP_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = os.path.join(bld.env['LIBDIR'])
def shutdown():
autowaf.shutdown()

View File

@ -41,7 +41,7 @@ def build(bld):
obj.target = 'ardourcp'
obj.use = 'libardour'
obj.vnum = LIBARDOUR_CP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = os.path.join(bld.env['LIBDIR'])
def shutdown():
autowaf.shutdown()

View File

@ -41,7 +41,7 @@ def build(bld):
obj.target = 'generic_midi'
obj.use = 'libardour libardourcp'
obj.vnum = LIBSURFACES_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -38,7 +38,7 @@ def build(bld):
obj.uselib = 'GTKMM GTK GDK'
obj.use = 'libardour libardour_cp libgtkmm2ext libpbd'
obj.vnum = LIBARDOUR_GENERIC_MIDI_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -50,7 +50,7 @@ def build(bld):
obj.uselib = 'GTKMM'
obj.use = 'libardour libardour_cp libgtkmm2ext'
obj.vnum = LIBARDOUR_MCP_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -35,7 +35,7 @@ def build(bld):
obj.uselib = ' LO '
obj.use = 'libardour libardour_cp libpbd'
obj.vnum = LIBARDOUR_OSC_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -46,7 +46,7 @@ def build(bld):
obj.target = 'ardour_tranzport'
obj.use = 'libardour libardour_cp'
obj.vnum = LIBARDOUR_TRANZPORT_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -33,7 +33,7 @@ def build(bld):
obj.uselib = 'GTKMM CWIID'
obj.use = 'libardour libardour_cp libgtkmm2ext'
obj.vnum = LIBARDOUR_WIIMOTE_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'surfaces')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'surfaces')
def shutdown():
autowaf.shutdown()

View File

@ -55,7 +55,7 @@ def build(bld):
obj.source += ' Onset.cpp '
obj.uselib += ' AUBIO '
obj.vnum = LIBARDOURVAMPPLUGINS_LIB_VERSION
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3', 'vamp')
obj.install_path = os.path.join(bld.env['LIBDIR'], 'vamp')
def shutdown():
autowaf.shutdown()

View File

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

View File

@ -11,8 +11,8 @@ def configure(conf):
def build(bld):
devinfo = bld.path.ant_glob ('*.device')
profiles = bld.path.ant_glob ('*.profile')
bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'mcp'), devinfo)
bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'mcp'), profiles)
bld.install_files (os.path.join(bld.env['DATADIR'], 'mcp'), devinfo)
bld.install_files (os.path.join(bld.env['DATADIR'], 'mcp'), profiles)
def options(opt):
pass

View File

@ -10,7 +10,7 @@ def configure(conf):
def build(bld):
maps = bld.path.ant_glob ('*.map')
bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'midi_maps'),
bld.install_files (os.path.join(bld.env['DATADIR'], 'midi_maps'),
maps)
def options(opt):

View File

@ -10,7 +10,7 @@ def configure(conf):
def build(bld):
patchfiles = bld.path.ant_glob ('*.midnam')
bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'patchfiles'), patchfiles)
bld.install_files (os.path.join(bld.env['DATADIR'], 'patchfiles'), patchfiles)
def options(opt):
pass

View File

@ -35,7 +35,7 @@ def build(bld):
name = 'template',
source = [ t ],
target = [ os.path.join(dir_name, file_name) ],
install_path = os.path.join(bld.env['DATADIR'], 'ardour3', os.path.join('templates', dir_name)))
install_path = os.path.join(bld.env['DATADIR'], os.path.join('templates', dir_name)))
def options(opt):
pass

View File

@ -20,4 +20,4 @@ def build(bld):
obj.source = [ 'main.cpp', 'systemtest.cpp' ]
obj.target = 'sanityCheck'
obj.name = 'sanityCheck'
obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.install_path = os.path.join(bld.env['LIBDIR'])

View File

@ -874,8 +874,9 @@ def build(bld):
bld.env['CONFDIR'] = os.path.join(bld.env['SYSCONFDIR'], lwrcase_dirname)
# data files loaded at run time go here
bld.env['DATADIR'] = os.path.join(bld.env['DATADIR'], lwrcase_dirname)
# shared objects loaded at runtime go here
# shared objects loaded at runtime go here (two aliases)
bld.env['DLLDIR'] = os.path.join(bld.env['LIBDIR'], lwrcase_dirname)
bld.env['LIBDIR'] = bld.env['DLLDIR']
autowaf.set_recursive()
@ -890,7 +891,7 @@ def build(bld):
for i in children:
bld.recurse(i)
bld.install_files (os.path.join(bld.env['SYSCONFDIR'], 'ardour3', ), 'ardour_system.rc')
bld.install_files (bld.env['SYSCONFDIR'], 'ardour_system.rc')
if bld.env['RUN_TESTS']:
bld.add_post_fun(test)