summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gtk2_ardour/ardour.sh.in2
-rw-r--r--gtk2_ardour/theme_manager.cc8
-rw-r--r--gtk2_ardour/wscript60
-rw-r--r--libs/ardour/wscript13
-rw-r--r--libs/evoral/wscript5
-rw-r--r--libs/gtkmm2ext/wscript2
-rw-r--r--libs/midi++2/wscript3
-rw-r--r--libs/pbd/wscript3
-rw-r--r--libs/rubberband/wscript3
-rw-r--r--libs/surfaces/control_protocol/wscript3
-rw-r--r--libs/surfaces/frontier/wscript3
-rw-r--r--libs/surfaces/generic_midi/wscript3
-rw-r--r--libs/surfaces/mackie/wscript3
-rw-r--r--libs/surfaces/osc/wscript3
-rw-r--r--libs/surfaces/powermate/wscript3
-rw-r--r--libs/surfaces/tranzport/wscript3
-rw-r--r--libs/surfaces/wiimote/wscript3
-rw-r--r--libs/taglib/wscript3
-rw-r--r--libs/vamp-plugins/wscript3
-rw-r--r--libs/vamp-sdk/wscript5
20 files changed, 83 insertions, 51 deletions
diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index a08661785d..ec01615b5e 100644
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -11,7 +11,7 @@ export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
MLOCK_LIMIT=$(ulimit -l)
if [ "$MLOCK_LIMIT" != "unlimited" ]; then
echo "WARNING: Your system has a limit for maximum amount of locked memory!"
- echo " This might cause Ardour to run out of memory before your system runs"
+ echo " This might cause Ardour to run out of memory before your system runs"
echo " out of memory. You can view the memory limit with 'ulimit -l', and it"
echo " is normally controlled by /etc/security/limits.conf"
echo ""
diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc
index 8270c7bcb6..70f249c1c6 100644
--- a/gtk2_ardour/theme_manager.cc
+++ b/gtk2_ardour/theme_manager.cc
@@ -195,11 +195,11 @@ load_rc_file (const string& filename, bool themechange)
spath += user_config_directory();
spath += system_config_search_path();
- if(!find_file_in_search_path (spath, filename, rc_file_path))
- {
- warning << string_compose(_("Unable to find UI style file %1 in search path %2. Ardour will look strange"),
+ if (!find_file_in_search_path (spath, filename, rc_file_path)) {
+ warning << string_compose(
+ _("Unable to find UI style file %1 in search path %2. Ardour will look strange"),
filename, spath.to_string())
- << endmsg;
+ << endmsg;
return;
}
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 213975c0a6..712b978e2c 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -232,11 +232,11 @@ def build(bld):
obj.includes = ['.']
obj.name = 'gtk2_ardour'
obj.target = 'ardour-3.0'
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.uselib = 'UUID FLAC GLIBMM GTHREAD GTK GNOMECANVAS OGG ALSA'
obj.uselib += ' GTKMM GNOMECANVASMM'
obj.uselib_local = '''libpbd libmidipp libtaglib libardour libsurfaces
libgtkmm2ext libgtk2_ardour_c libtaglib'''
- obj.install_path = ''
obj.cxxflags = '-DVERSIONSTRING=\\\"' + GTK2_ARDOUR_VERSION + '\\\"'
obj.cxxflags += ' -DPACKAGE=\\\"gtk2_ardour\\\"'
obj.cxxflags += ' -DDATA_DIR=\\\"' + os.path.normpath(bld.env['DATADIRNAME']) + '\\\"'
@@ -255,11 +255,18 @@ def build(bld):
'EXECUTABLE' : 'build/default/gtk2_ardour/ardour-3.0'
}
- obj = bld.new_task_gen('subst')
- obj.source = 'ardev_common.sh.in'
- obj.target = 'ardev_common_waf.sh'
- obj.chmod = 0755
- obj.dict = wrapper_subst_dict
+ obj = bld.new_task_gen('subst')
+ obj.source = 'ardev_common.sh.in'
+ obj.target = 'ardev_common_waf.sh'
+ obj.chmod = 0755
+ obj.dict = wrapper_subst_dict
+
+ obj = bld.new_task_gen('subst')
+ obj.source = 'ardour.sh.in'
+ obj.target = 'ardour3'
+ obj.chmod = 0755
+ obj.dict = wrapper_subst_dict
+ obj.install_path = bld.env['BINDIR']
# Font configuration
@@ -311,25 +318,29 @@ def build(bld):
# RC files
- obj = bld.new_task_gen('subst')
- obj.source = 'ardour3_ui_dark.rc.in'
- obj.target = 'ardour3_ui_dark.rc'
- obj.dict = font_subst_dict
+ obj = bld.new_task_gen('subst')
+ obj.source = 'ardour3_ui_dark.rc.in'
+ obj.target = 'ardour3_ui_dark.rc'
+ obj.dict = font_subst_dict
+ obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
- obj = bld.new_task_gen('subst')
- obj.source = 'ardour3_ui_light.rc.in'
- obj.target = 'ardour3_ui_light.rc'
- obj.dict = font_subst_dict
+ obj = bld.new_task_gen('subst')
+ obj.source = 'ardour3_ui_light.rc.in'
+ obj.target = 'ardour3_ui_light.rc'
+ obj.dict = font_subst_dict
+ obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
- obj = bld.new_task_gen('subst')
- obj.source = 'ardour3_ui_dark_sae.rc.in'
- obj.target = 'ardour3_ui_dark_sae.rc'
- obj.dict = font_subst_dict
+ obj = bld.new_task_gen('subst')
+ obj.source = 'ardour3_ui_dark_sae.rc.in'
+ obj.target = 'ardour3_ui_dark_sae.rc'
+ obj.dict = font_subst_dict
+ obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
- obj = bld.new_task_gen('subst')
- obj.source = 'ardour3_ui_light_sae.rc.in'
- obj.target = 'ardour3_ui_light_sae.rc'
- obj.dict = font_subst_dict
+ obj = bld.new_task_gen('subst')
+ obj.source = 'ardour3_ui_light_sae.rc.in'
+ obj.target = 'ardour3_ui_light_sae.rc'
+ obj.dict = font_subst_dict
+ obj.install_path = os.path.join(bld.env['CONFIGDIR'], 'ardour3')
# Menus
menus_argv = []
@@ -366,6 +377,11 @@ def build(bld):
obj.target = b + '.bindings'
obj.source = obj.target + '.in'
obj.dict = keybindings_dict
+
+ # Icons/Images
+ bld.install_files('${DATADIR}/ardour3/icons', 'icons/*.png')
+ bld.install_files('${DATADIR}/ardour3/pixmaps', 'pixmaps/*.xpm')
+ bld.install_files('${DATADIR}/ardour3', 'splash.png')
def shutdown():
autowaf.shutdown()
diff --git a/libs/ardour/wscript b/libs/ardour/wscript
index 44969e0a6e..abd17ea5e4 100644
--- a/libs/ardour/wscript
+++ b/libs/ardour/wscript
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import autowaf
import os
+import glob
# Version of this package (even if built as a child)
MAJOR = '3'
@@ -216,15 +217,15 @@ def build(bld):
obj.uselib = 'GLIBMM AUBIO SIGCPP XML UUID JACK SNDFILE SAMPLERATE LRDF'
obj.uselib_local = 'libpbd libmidipp libevoral libvamphost libtaglib'
obj.vnum = LIBARDOUR_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.cxxflags = ' -DPACKAGE=\\\"libardour3\\\"'
- obj.cxxflags += ' -DDATA_DIR=\\\"' + os.path.normpath(bld.env['DATADIRNAME']) + '\\\"'
- obj.cxxflags += ' -DCONFIG_DIR=\\\"' + os.path.normpath(bld.env['CONFIGDIRNAME']) + '\\\"'
- obj.cxxflags += ' -DMODULE_DIR=\\\"' + os.path.normpath(bld.env['LIBDIRNAME']) + '\\\"'
+ obj.cxxflags += ' -DDATA_DIR=\\\"' + os.path.normpath(bld.env['DATADIR']) + '\\\"'
+ obj.cxxflags += ' -DCONFIG_DIR=\\\"' + os.path.normpath(bld.env['CONFIGDIR']) + '\\\"'
+ obj.cxxflags += ' -DMODULE_DIR=\\\"' + os.path.normpath(bld.env['LIBDIR']) + '\\\"'
obj.cxxflags += ' -DLOCALEDIR=\\\"' + os.path.join(
- os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"'
+ os.path.normpath(bld.env['DATADIR']), 'locale') + '\\\"'
obj.cxxflags += ' -DVAMP_DIR=\\\"' + os.path.join(
- os.path.normpath(bld.env['LIBDIRNAME']), 'ardour3', 'vamp') + '\\\"'
+ os.path.normpath(bld.env['LIBDIR']), 'ardour3', 'vamp') + '\\\"'
obj.source += ' rb_effect.cc '
obj.uselib_local += ' librubberband '
#obj.source += ' st_stretch.cc st_pitch.cc '
diff --git a/libs/evoral/wscript b/libs/evoral/wscript
index 88d4be0b6c..c9b400720b 100644
--- a/libs/evoral/wscript
+++ b/libs/evoral/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Version of this package (even if built as a child)
EVORAL_VERSION = '0.0.0'
@@ -57,7 +58,7 @@ def build(bld):
libsmf.name = 'libsmf'
libsmf.target = 'smf'
libsmf.uselib = 'GLIB'
- libsmf.install_path = ''
+ libsmf.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
# Library
obj = bld.new_task_gen('cxx', 'shlib')
@@ -79,7 +80,7 @@ def build(bld):
obj.uselib = 'GLIBMM GTHREAD SMF'
obj.uselib_local = 'libsmf'
obj.vnum = EVORAL_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
if bld.env['HAVE_CPPUNIT']:
# Unit tests
diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index 2a5532b9ac..48a21a71e2 100644
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -69,7 +69,7 @@ def build(bld):
obj.uselib = 'GTKMM'
obj.uselib_local = 'libpbd'
obj.vnum = GTKMM2EXT_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.cxxflags = '-DPACKAGE=\\\"libgtkmm2ext\\\"'
obj.cxxflags += ' -DLOCALEDIR=\\\"' + os.path.join(
os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '\\\"'
diff --git a/libs/midi++2/wscript b/libs/midi++2/wscript
index 8629d2c4c3..58fc16386d 100644
--- a/libs/midi++2/wscript
+++ b/libs/midi++2/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Version of this package (even if built as a child)
MAJOR = '2'
@@ -76,7 +77,7 @@ def build(bld):
obj.uselib = 'GLIBMM SIGCPP XML JACK'
obj.uselib_local = 'libpbd libevoral'
obj.vnum = LIBMIDIPP_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/pbd/wscript b/libs/pbd/wscript
index cf708c12b6..4c69934baf 100644
--- a/libs/pbd/wscript
+++ b/libs/pbd/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Version of this package (even if built as a child)
MAJOR = '4'
@@ -89,7 +90,7 @@ def build(bld):
obj.target = 'pbd'
obj.uselib = 'GLIBMM SIGCPP XML UUID'
obj.vnum = LIBPBD_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.cxxflags = '-DPACKAGE=\\\"libpbd\\\"'
if bld.env['PBD_HAVE_EXECINFO']:
obj.cxxflags += ' -DHAVE_EXECINFO '
diff --git a/libs/rubberband/wscript b/libs/rubberband/wscript
index 23d2950b53..2ef9155dfb 100644
--- a/libs/rubberband/wscript
+++ b/libs/rubberband/wscript
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import autowaf
import glob
+import os
# Version of this package (even if built as a child)
LIBRUBBERBAND_VERSION = '0.0.0'
@@ -56,7 +57,7 @@ def build(bld):
obj.uselib = 'FFTW3 FFTW3F SAMPLERATE SNDFILE'
obj.uselib_local = 'libvamphost'
obj.vnum = LIBRUBBERBAND_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
obj.cxxflags = '-DPACKAGE=\\\"librubberband\\\"'
def shutdown():
diff --git a/libs/surfaces/control_protocol/wscript b/libs/surfaces/control_protocol/wscript
index 8de86eadf1..78a674b375 100644
--- a/libs/surfaces/control_protocol/wscript
+++ b/libs/surfaces/control_protocol/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -31,7 +32,7 @@ def build(bld):
obj.target = 'surfaces'
obj.uselib_local = 'libardour'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/frontier/wscript b/libs/surfaces/frontier/wscript
index 559e0029ca..5fea9631dd 100644
--- a/libs/surfaces/frontier/wscript
+++ b/libs/surfaces/frontier/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Version of this package (even if built as a child)
LIBSURFACES_VERSION = '4.1.0'
@@ -39,7 +40,7 @@ def build(bld):
obj.target = 'generic_midi'
obj.uselib_local = 'libardour libsurfaces'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/generic_midi/wscript b/libs/surfaces/generic_midi/wscript
index 6fcce915e1..f0b245040a 100644
--- a/libs/surfaces/generic_midi/wscript
+++ b/libs/surfaces/generic_midi/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -31,7 +32,7 @@ def build(bld):
obj.target = 'generic_midi'
obj.uselib_local = 'libardour libsurfaces'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/mackie/wscript b/libs/surfaces/mackie/wscript
index c7b913e072..6225ae42e7 100644
--- a/libs/surfaces/mackie/wscript
+++ b/libs/surfaces/mackie/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -46,7 +47,7 @@ def build(bld):
obj.target = 'mackie'
obj.uselib_local = 'libardour libsurfaces'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/osc/wscript b/libs/surfaces/osc/wscript
index 6ee824170f..74e21fa3a8 100644
--- a/libs/surfaces/osc/wscript
+++ b/libs/surfaces/osc/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Version of this package (even if built as a child)
LIBSURFACES_VERSION = '4.1.0'
@@ -38,7 +39,7 @@ def build(bld):
obj.target = 'surfaces'
obj.uselib_local = 'libardour'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/powermate/wscript b/libs/surfaces/powermate/wscript
index 71b3fe9ce0..95aeb7e9f6 100644
--- a/libs/surfaces/powermate/wscript
+++ b/libs/surfaces/powermate/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -30,7 +31,7 @@ def build(bld):
obj.target = 'powermate'
obj.uselib_local = 'libardour libsurfaces'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/tranzport/wscript b/libs/surfaces/tranzport/wscript
index b83b9c374e..e6ee417140 100644
--- a/libs/surfaces/tranzport/wscript
+++ b/libs/surfaces/tranzport/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -44,7 +45,7 @@ def build(bld):
obj.target = 'tranzport'
obj.uselib_local = 'libardour libsurfaces'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/surfaces/wiimote/wscript b/libs/surfaces/wiimote/wscript
index 0de54b06cd..6136d7b685 100644
--- a/libs/surfaces/wiimote/wscript
+++ b/libs/surfaces/wiimote/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -30,7 +31,7 @@ def build(bld):
obj.target = 'wiimote'
obj.uselib_local = 'libardour libsurfaces'
obj.vnum = LIBSURFACES_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/taglib/wscript b/libs/taglib/wscript
index e8fd74a7d5..f0754c9b22 100644
--- a/libs/taglib/wscript
+++ b/libs/taglib/wscript
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import autowaf
import glob
+import os
# Version of this package (even if built as a child)
LIBTAGLIB_VERSION = '0.0.0'
@@ -71,7 +72,7 @@ def build(bld):
obj.name = 'libtaglib'
obj.target = 'taglib'
obj.vnum = LIBTAGLIB_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/vamp-plugins/wscript b/libs/vamp-plugins/wscript
index ae4a6ae1a8..38ffd76334 100644
--- a/libs/vamp-plugins/wscript
+++ b/libs/vamp-plugins/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Version of this package (even if built as a child)
LIBARDOURVAMPPLUGINS_VERSION = '0.0.0'
@@ -47,7 +48,7 @@ def build(bld):
obj.source += ' Onset.cpp '
obj.uselib += ' AUBIO '
obj.vnum = LIBARDOURVAMPPLUGINS_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
diff --git a/libs/vamp-sdk/wscript b/libs/vamp-sdk/wscript
index ebb1d71e4a..99b8e472e5 100644
--- a/libs/vamp-sdk/wscript
+++ b/libs/vamp-sdk/wscript
@@ -1,5 +1,6 @@
#!/usr/bin/env python
import autowaf
+import os
# Version of this package (even if built as a child)
LIBVAMP_VERSION = '0.0.0'
@@ -46,7 +47,7 @@ def build(bld):
obj.target = 'vamphost'
obj.uselib = 'FFTW3 FFTW3F'
obj.vnum = LIBVAMP_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
# Plugin Library
obj = bld.new_task_gen('cxx', 'shlib')
@@ -60,7 +61,7 @@ def build(bld):
obj.target = 'vampplugin'
obj.uselib = 'FFTW3 FFTW3F'
obj.vnum = LIBVAMP_LIB_VERSION
- obj.install_path = ''
+ obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
def shutdown():
autowaf.shutdown()
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 14:31:04 +0000