Install ardour as a binary, a script and a set of shared

libraries. Libraries are discovered via {LD,DYLD}_LIBRARY_PATH


git-svn-id: svn://localhost/trunk/ardour2@481 d708f5d6-7413-0410-9779-e7cbd77b26cf

SConstruct

@@ -560,6 +560,8 @@ if os.environ.has_key('DISTCC_HOSTS'):
 final_prefix = '$PREFIX'
 install_prefix = '$DESTDIR/$PREFIX'
 
+subst_dict['INSTALL_PREFIX'] = install_prefix;
+
 if env['PREFIX'] == '/usr':
     final_config_prefix = '/etc'
 else:

gtk2_ardour/SConscript

@@ -228,6 +228,11 @@ ardour = gtkardour.Program(target = executable, source = gtkardour_files + extra
 mtest = gtkardour.Program(target = 'mtest', source = mtest_files)
 itest = gtkardour.Program(target = 'itest', source = itest_files)
 
+my_subst_dict = { }
+my_subst_dict['%INSTALL_PREFIX%'] = install_prefix
+
+ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
+
 Default(ardour)
 
 if env['VERSIONED']:
@@ -239,12 +244,17 @@ if env['NLS']:
     
 #install
 
-
+# the executable - into the library dir
-env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour', ardour))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour))
+# the script - into the bin dir
+env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh))
+env.Alias('install', Execute(Chmod (os.path.join(install_prefix, 'bin')+'/ardour2', 0755)))
+# configuration files
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui.rc'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.menus'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.colors'))
+# data files
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), 'splash.ppm'))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files))
 env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/glade'), glade_files))

gtk2_ardour/ardour.sh.in

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export LD_LIBRARY_PATH=%INSTALL_PREFIX%/lib/ardour2:$LD_LIBRARY_PATH 
+# DYLD_LIBRARY_PATH is for Darwin
+export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
+
+exec %INSTALL_PREFIX%/lib/ardour2/ardour.bin $*
+
+

libs/ardour/SConscript

@@ -1,6 +1,7 @@
 # -*- python -*-
 
 import os
+import os.path
 import glob
 
 Import('env final_prefix install_prefix final_config_prefix libraries i18n')
@@ -214,6 +215,9 @@ Default(libardour)
 
 if env['NLS']:
 	i18n (ardour, ardour_files + vst_files + coreaudio_files, env)
+
+
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour))
 	      
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
 				     [ 'SConscript', 'i18n.h', 'gettext.h', 'sse_functions.s', 'sse_functions_64bit.s' ] +

libs/flowcanvas/SConscript

@@ -39,6 +39,8 @@ libflowcanvas = flowcanvas.SharedLibrary('flowcanvas', flowcanvas_files)
 
 Default(libflowcanvas)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libflowcanvas))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      ['SConscript'] +
                                      flowcanvas_files +

libs/glibmm2/SConscript

@@ -1,11 +1,13 @@
 # -*- python -*-
 
-import glob
 import os
+import os.path
+import glob
+
 
 glibmm2_files = glob.glob('glibmm/*.cc')
 
-Import('env libraries')
+Import('env libraries install_prefix')
 
 glibmm2 = env.Copy()
 glibmm2.Merge([libraries['sigc2'], libraries['glib2']])
@@ -23,6 +25,7 @@ if os.path.exists ('CVS'):
 else:
    Default([libglibmm2])
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglibmm2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'glibmm.h','glibmmconfig.h'] +

libs/gtkmm2/atk/SConscript

@@ -1,16 +1,20 @@
 # -*- python -*-
 
+import os
+import os.path
 import glob
 
 atkmm_files = glob.glob('atkmm/*.cc')
 
-Import('env libraries')
+Import('env libraries install_prefix')
 atkmm = env.Copy()
 atkmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] ])
 
 libatkmm = atkmm.SharedLibrary('atkmm', atkmm_files)
 Default(libatkmm)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libatkmm))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'atkmm.h'] + 
 				     atkmm_files + 

libs/gtkmm2/gdk/SConscript

@@ -1,10 +1,12 @@
 # -*- python -*-
 
+import os
+import os.path
 import glob
 
 gdkmm2_files = glob.glob('gdkmm/*.cc')
 
-Import('env libraries')
+Import('env libraries install_prefix')
 gdkmm2 = env.Copy()
 gdkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm']])
 gdkmm2.Append(CXXFLAGS="-Ilibs/gtkmm2/gtk")
@@ -12,6 +14,8 @@ gdkmm2.Append(CXXFLAGS="-Ilibs/gtkmm2/gtk")
 libgdkmm2 = gdkmm2.SharedLibrary('gdkmm2', gdkmm2_files)
 Default(libgdkmm2)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgdkmm2))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'gdkmmconfig.h', 'gdkmm.h'] + 
 				     gdkmm2_files + 

libs/gtkmm2/gtk/SConscript

@@ -1,16 +1,20 @@
 # -*- python -*-
 
+import os
+import os.path
 import glob
 
 gtkmm2_files = glob.glob('gtkmm/*.cc')
 
-Import('env libraries')
+Import('env libraries install_prefix')
 gtkmm2 = env.Copy()
 gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'] ])
 
 libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
 Default(libgtkmm2)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgtkmm2))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'gtkmmconfig.h', 'gtkmm.h'] + 
 				     gtkmm2_files + 

libs/gtkmm2/pango/SConscript

@@ -1,17 +1,20 @@
 # -*- python -*-
 
-import glob
 import os
+import os.path
+import glob
 
 pangomm_files = glob.glob('pangomm/*.cc')
 
-Import('env libraries')
+Import('env libraries install_prefix')
 pangomm = env.Copy()
 pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2']])
 
 libpangomm = pangomm.SharedLibrary('pangomm', pangomm_files)
 Default(libpangomm)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpangomm))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'pangomm.h'] + 
 				     pangomm_files + 

libs/gtkmm2ext/SConscript

@@ -67,6 +67,8 @@ Default(libgtkmm2ext)
 if env['NLS']:
     i18n (gtkmm2ext, gtkmm2ext_files, env)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgtkmm2ext))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'i18n.h', 'gettext.h'] +
                                      gtkmm2ext_files +

libs/gtkmm2ext/po/el_GR.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.99beta23\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-29 14:24-0500\n"
+"POT-Creation-Date: 2006-04-25 17:46-0400\n"
 "PO-Revision-Date: 2005-01-11\n"
 "Last-Translator: Muadibas\n"
 "Language-Team: Hellenic(Greek) <LL@li.org>\n"
@@ -15,20 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libs/gtkmm2ext/barcontroller.cc:405 libs/gtkmm2ext/bindable_button.cc:131
+#: libs/gtkmm2ext/barcontroller.cc:431 libs/gtkmm2ext/bindable_button.cc:131
 #: libs/gtkmm2ext/controller.cc:50 libs/gtkmm2ext/slider_controller.cc:132
 msgid "operate MIDI controller now"
 msgstr "λειτουργία ελεγκτή MIDI τώρα"
 
-#: libs/gtkmm2ext/gtk_ui.cc:58
+#: libs/gtkmm2ext/gtk_ui.cc:509
-msgid "cannot create thread request buffer key"
-msgstr ""
-
-#: libs/gtkmm2ext/gtk_ui.cc:403 libs/gtkmm2ext/gtk_ui.cc:599
-msgid "programming error: "
-msgstr ""
-
-#: libs/gtkmm2ext/gtk_ui.cc:761
 msgid "Press To Exit"
 msgstr ""
 

libs/gtkmm2ext/po/es_ES.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-29 14:24-0500\n"
+"POT-Creation-Date: 2006-04-25 17:46-0400\n"
 "PO-Revision-Date: 2004-02-13 00:35+0300\n"
 "Last-Translator: Alex Krohn alexkrohn@fastmail.fm\n"
 "Language-Team: Spanish\n"
@@ -14,20 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libs/gtkmm2ext/barcontroller.cc:405 libs/gtkmm2ext/bindable_button.cc:131
+#: libs/gtkmm2ext/barcontroller.cc:431 libs/gtkmm2ext/bindable_button.cc:131
 #: libs/gtkmm2ext/controller.cc:50 libs/gtkmm2ext/slider_controller.cc:132
 msgid "operate MIDI controller now"
 msgstr "Operar controladora de MIDI ahora"
 
-#: libs/gtkmm2ext/gtk_ui.cc:58
+#: libs/gtkmm2ext/gtk_ui.cc:509
-msgid "cannot create thread request buffer key"
-msgstr ""
-
-#: libs/gtkmm2ext/gtk_ui.cc:403 libs/gtkmm2ext/gtk_ui.cc:599
-msgid "programming error: "
-msgstr ""
-
-#: libs/gtkmm2ext/gtk_ui.cc:761
 msgid "Press To Exit"
 msgstr ""
 

libs/gtkmm2ext/po/pt_BR.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-29 14:24-0500\n"
+"POT-Creation-Date: 2006-04-25 17:46-0400\n"
 "PO-Revision-Date: 2004-05-17 20:36+0200\n"
 "Last-Translator: Chris Ross <chris.ross@tebibyte.org>\n"
 "Language-Team: Portuguese\n"
@@ -15,20 +15,12 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libs/gtkmm2ext/barcontroller.cc:405 libs/gtkmm2ext/bindable_button.cc:131
+#: libs/gtkmm2ext/barcontroller.cc:431 libs/gtkmm2ext/bindable_button.cc:131
 #: libs/gtkmm2ext/controller.cc:50 libs/gtkmm2ext/slider_controller.cc:132
 msgid "operate MIDI controller now"
 msgstr "Operar controladora de MIDI agora"
 
-#: libs/gtkmm2ext/gtk_ui.cc:58
+#: libs/gtkmm2ext/gtk_ui.cc:509
-msgid "cannot create thread request buffer key"
-msgstr ""
-
-#: libs/gtkmm2ext/gtk_ui.cc:403 libs/gtkmm2ext/gtk_ui.cc:599
-msgid "programming error: "
-msgstr ""
-
-#: libs/gtkmm2ext/gtk_ui.cc:761
 msgid "Press To Exit"
 msgstr ""
 

libs/gtkmm2ext/po/ru_RU.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtkmm2ext\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-29 14:24-0500\n"
+"POT-Creation-Date: 2006-04-25 17:46-0400\n"
 "PO-Revision-Date: 2004-02-13 00:35+0300\n"
 "Last-Translator: Igor Blinov pitstop@nm.ru\n"
 "Language-Team: Russian\n"
@@ -14,20 +14,12 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libs/gtkmm2ext/barcontroller.cc:405 libs/gtkmm2ext/bindable_button.cc:131
+#: libs/gtkmm2ext/barcontroller.cc:431 libs/gtkmm2ext/bindable_button.cc:131
 #: libs/gtkmm2ext/controller.cc:50 libs/gtkmm2ext/slider_controller.cc:132
 msgid "operate MIDI controller now"
 msgstr "×ËÌÀÞÉÔØ MIDI-ËÏÎÔÒÏÌÌÅÒ"
 
-#: libs/gtkmm2ext/gtk_ui.cc:58
+#: libs/gtkmm2ext/gtk_ui.cc:509
-msgid "cannot create thread request buffer key"
-msgstr ""
-
-#: libs/gtkmm2ext/gtk_ui.cc:403 libs/gtkmm2ext/gtk_ui.cc:599
-msgid "programming error: "
-msgstr ""
-
-#: libs/gtkmm2ext/gtk_ui.cc:761
 msgid "Press To Exit"
 msgstr ""
 

libs/libglademm/SConscript

@@ -1,8 +1,10 @@
 # -*- python -*-
-import glob
-import os
 
-Import('env libraries')
+import os
+import os.path
+import glob
+
+Import('env libraries install_prefix')
 
 libglademm_files = glob.glob('libglademm/*.cc')
 
@@ -13,6 +15,8 @@ libglade = libglademm.SharedLibrary('libglademm', libglademm_files)
 
 Default(libglade)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglade))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'libglademmconfig.h', 'libglademm.h'] +
 				     libglademm_files + 

libs/libgnomecanvasmm/SConscript

@@ -1,16 +1,20 @@
 # -*- python -*-
 
+import os
+import os.path
 import glob
 
 gnomecanvasmm_files = glob.glob('libgnomecanvasmm/*.cc')
 
-Import('env libraries')
+Import('env libraries install_prefix')
 gnomecanvasmm = env.Copy()
 gnomecanvasmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libraries['pangomm'], libraries['atkmm'], libraries['gdkmm2'], libraries['gtkmm2'], libraries['libgnomecanvas2'] ])
 
 libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files)
 Default(libgnomecanvasmm)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgnomecanvasmm))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'libgnomecanvasmmconfig.h', 'libgnomecanvasmm.h'] +
 				     gnomecanvasmm_files + 

libs/midi++2/SConscript

@@ -1,8 +1,10 @@
 # -*- python -*-
 
+import os
+import os.path
 import glob
 
-Import('env libraries')
+Import('env libraries install_prefix')
 
 midi2 = env.Copy()
 midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['pbd3'] ])
@@ -50,6 +52,8 @@ libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
 
 Default(libmidi2)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libmidi2))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript' ] + sources + sysdep_sources +
                                      glob.glob('midi++/*.h')))

libs/pbd3/SConscript

@@ -1,8 +1,10 @@
 # -*- python -*-
 
+import os
+import os.path
 import glob
 
-Import('env libraries i18n')
+Import('env libraries i18n install_prefix')
 
 pbd3 = env.Copy()
 
@@ -55,6 +57,8 @@ Default(libpbd3)
 if env['NLS']:
     i18n (pbd3, pbd3_files, env)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd3))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript' ] +
                                      pbd3_files +

libs/sigc++2/SConscript

@@ -1,11 +1,12 @@
 # -*- python -*-
 
-import glob
 import os
+import os.path
+import glob
 
 sigc2_files = glob.glob('sigc++/*.cc') + glob.glob('sigc++/functors/*.cc') + glob.glob('sigc++/adaptors/lambda/*.cc')
 
-Import('env')
+Import('env install_prefix')
 sigc2 = env.Copy()
 
 libsigc2 = sigc2.SharedLibrary('sigc++2', sigc2_files)
@@ -17,6 +18,8 @@ if os.path.exists ('CVS'):
 else:
     Default([libsigc2])
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libsigc2))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',
                                        'configure', 'Makefile.am', 'SConscript',

libs/soundtouch/SConscript

@@ -1,5 +1,7 @@
 # -*- python -*-
 
+import os
+import os.path
 import glob
 
 soundtouch_files = Split("""
@@ -13,7 +15,7 @@ mmx_gcc.cpp
 cpu_detect_x86_gcc.cpp
 """)
 
-Import('env')
+Import('env install_prefix')
 st = env.Copy()
 st.Append(CCFLAGS="-DHAVE_CONFIG_H -D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 
@@ -21,6 +23,8 @@ libst = st.SharedLibrary('soundtouch', soundtouch_files)
 
 Default(libst)
 
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libst))
+
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
 	[ 'SConscript'] + soundtouch_files + glob.glob('*.h')))
 

libs/surfaces/generic_midi/SConscript

@@ -1,6 +1,7 @@
 # -*- python -*-
 
 import os
+import os.path
 import glob
 
 Import('env final_prefix install_prefix final_config_prefix libraries i18n')

libs/surfaces/tranzport/SConscript

@@ -1,6 +1,7 @@
 # -*- python -*-
 
 import os
+import os.path
 import glob
 
 Import('env final_prefix install_prefix final_config_prefix libraries i18n')