X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=651a6a3eab3607205d5e576fab578956d1026f8a;hb=e92c1669c1cdf857b8a3900abb9f891e6ca9fdad;hp=b684e8794831990f32b4beae6494a9c4f1f6d62b;hpb=b2e7ca288a13a6f1fd615bde6ff6e95426d22852;p=ardour.git diff --git a/SConstruct b/SConstruct index b684e87948..651a6a3eab 100644 --- a/SConstruct +++ b/SConstruct @@ -16,7 +16,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.0beta11' +ardour_version = '3.0' subst_dict = { } @@ -29,6 +29,8 @@ opts.AddOptions( ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0), BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0), + BoolOption('GTKOSX', 'Compile for use with GTK-OSX, not GTK-X11', 0), + BoolOption('NATIVE_OSX_KEYS', 'Build key bindings file that matches OS X conventions', 0), BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'), EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2), @@ -41,9 +43,11 @@ opts.AddOptions( PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'), BoolOption('SURFACES', 'Build support for control surfaces', 1), BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0), + BoolOption('UNIVERSAL', 'Compile as universal binary. Requires that external libraries are already universal.', 0), BoolOption('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0), BoolOption('VST', 'Compile with support for VST', 0), - BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 0) + BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), + BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1) ) #---------------------------------------------------------------------- @@ -61,6 +65,7 @@ class LibraryInfo(Environment): self.Append (LIBPATH = other.get ('LIBPATH', [])) self.Append (CPPPATH = other.get('CPPPATH', [])) self.Append (LINKFLAGS = other.get('LINKFLAGS', [])) + self.Append (CCFLAGS = other.get('CCFLAGS', [])) self.Replace(LIBPATH = list(Set(self.get('LIBPATH', [])))) self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[])))) #doing LINKFLAGS breaks -framework @@ -226,6 +231,7 @@ def i18n (buildenv, sources, installenv): buildenv.PoBuild(po_file, ['po/'+po_file, potfile]) mo_file = po_file.replace (".po", ".mo") installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file)) + installenv.Alias ('msgupdate', buildenv.MoBuild (mo_file, po_file)) for lang in languages: modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/')) @@ -311,7 +317,7 @@ env.Append (BUILDERS = {'VersionBuild' : version_bld}) # def versioned_builder(target,source,env): - w, r = os.popen2( "svn info | awk '/^Revision:/ { print $2}'") + w, r = os.popen2( "LANG= svn info | awk '/^Revision:/ { print $2}'") last_revision = r.readline().strip() w.close() @@ -358,7 +364,7 @@ def distcopy (target, source, env): return p.close () def tarballer (target, source, env): - cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~'" + cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~'" + " --exclude .svn --exclude '.svn/*'" print 'running ', cmd, ' ... ' p = os.popen (cmd) return p.close () @@ -380,15 +386,46 @@ env.Append (BUILDERS = {'Tarball' : tarball_bld}) # if env['VST']: - sys.stdout.write ("Are you building Ardour for personal use (rather than distribution to others)? [no]: ") - answer = sys.stdin.readline () - answer = answer.rstrip().strip() - if answer != "yes" and answer != "y": - print 'You cannot build Ardour with VST support for distribution to others.\nIt is a violation of several different licenses. Build with VST=false.' - sys.exit (-1); + if os.path.isfile('.personal_use_only'): + print "Enabling VST support. Note that distributing a VST-enabled ardour\nis a violation of several different licences.\nBuild with VST=false if you intend to distribute ardour to others." else: - print "OK, VST support will be enabled" + sys.stdout.write ("Are you building Ardour for personal use (rather than distribution to others)? [no]: ") + answer = sys.stdin.readline () + answer = answer.rstrip().strip() + if answer == "yes" or answer == "y": + fh = open('.personal_use_only', 'w') + fh.close() + print "OK, VST support will be enabled" + else: + print 'You cannot build Ardour with VST support for distribution to others.\nIt is a violation of several different licenses. Build with VST=false.' + sys.exit (-1); +else: + if os.path.isfile('.personal_use_only'): + os.remove('.personal_use_only') + + +#################### +# push environment +#################### +def pushEnvironment(context): + if os.environ.has_key('PATH'): + context.Append(PATH = os.environ['PATH']) + + if os.environ.has_key('PKG_CONFIG_PATH'): + context.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH']) + + if os.environ.has_key('CC'): + context['CC'] = os.environ['CC'] + + if os.environ.has_key('CXX'): + context['CXX'] = os.environ['CXX'] + + if os.environ.has_key('DISTCC_HOSTS'): + context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] + context['ENV']['HOME'] = os.environ['HOME'] + +pushEnvironment (env) ####################### # Dependency Checking # @@ -412,16 +449,22 @@ def DependenciesRequiredMessage(): print 'Please consult http://ardour.org/building for more information' def CheckPKGConfig(context, version): - context.Message( 'Checking for pkg-config version >= %s... ' %version ) - ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0] - context.Result( ret ) - return ret + context.Message( 'Checking for pkg-config version >= %s... ' %version ) + ret = context.TryAction('pkg-config --atleast-pkgconfig-version=%s' % version)[0] + context.Result( ret ) + return ret def CheckPKGVersion(context, name, version): - context.Message( 'Checking for %s... ' % name ) - ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0] - context.Result( ret ) - return ret + context.Message( 'Checking for %s... ' % name ) + ret = context.TryAction('pkg-config --atleast-version=%s %s' %(version,name) )[0] + context.Result( ret ) + return ret + +def CheckPKGExists(context, name): + context.Message ('Checking for %s...' % name) + ret = context.TryAction('pkg-config --exists %s' % name)[0] + context.Result (ret) + return ret conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, 'CheckPKGVersion' : CheckPKGVersion }) @@ -461,17 +504,30 @@ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') libraries['samplerate'] = LibraryInfo() libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate') +conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) + +if conf.CheckPKGExists ('fftw3f'): + libraries['fftw3f'] = LibraryInfo() + libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') + +if conf.CheckPKGExists ('fftw3'): + libraries['fftw3'] = LibraryInfo() + libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3') + +env = conf.Finish () + if env['FFT_ANALYSIS']: - libraries['fftw3f'] = LibraryInfo() - libraries['fftw3f'].ParseConfig('pkg-config --cflags --libs fftw3f') # # Check for fftw3 header as well as the library - conf = Configure (libraries['fftw3f']) - if conf.CheckHeader ('fftw3.h') == False: - print "FFT Analysis cannot be compiled without the FFTW3 headers, which don't seem to be installed" - sys.exit (1) - libraries['fftw3f'] = conf.Finish(); + # + + conf = Configure(libraries['fftw3']) + if conf.CheckHeader ('fftw3.h') == False: + print ('FFT Analysis cannot be compiled without the FFTW3 headers, which do not seem to be installed') + sys.exit (1) + conf.Finish() + libraries['jack'] = LibraryInfo() libraries['jack'].ParseConfig('pkg-config --cflags --libs jack') @@ -513,7 +569,7 @@ libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext # SCons should really do this for us -conf = Configure (env) +conf = env.Configure () have_cxx = conf.TryAction (Action (str(env['CXX']) + ' --version')) if have_cxx[0] != 1: @@ -530,7 +586,10 @@ env = conf.Finish() # opt_flags = [] -debug_flags = [ '-g' ] +if env['GPROFILE'] == 1: + debug_flags = [ '-g', '-pg' ] +else: + debug_flags = [ '-g' ] # guess at the platform, used to define compiler flags @@ -596,7 +655,7 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6 if env['DIST_TARGET'] != 'i386': flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1] - x86_flags = flag_line.split (": ")[1:][0].split (' ') + x86_flags = flag_line.split (": ")[1:][0].split () if "mmx" in x86_flags: opt_flags.append ("-mmmx") @@ -611,8 +670,8 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6 opt_flags.append ("-march=i686") if ((env['DIST_TARGET'] == 'i686') or (env['DIST_TARGET'] == 'x86_64')) and build_host_supports_sse: - opt_flags.extend (["-msse", "-mfpmath=sse"]) - debug_flags.extend (["-msse", "-mfpmath=sse"]) + opt_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) + debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) # end of processor-specific section # optimization section @@ -660,13 +719,19 @@ opt_flags[:0] = [ "-fomit-frame-pointer", "-ffast-math", "-fstrength-reduce", - "-fno-strict-aliasing" + "-pipe" ] if env['DEBUG'] == 1: env.Append(CCFLAGS=" ".join (debug_flags)) + env.Append(LINKFLAGS=" ".join (debug_flags)) else: env.Append(CCFLAGS=" ".join (opt_flags)) + env.Append(LINKFLAGS=" ".join (opt_flags)) + +if env['UNIVERSAL'] == 1: + env.Append(CCFLAGS="-arch i386 -arch ppc") + env.Append(LINKFLAGS="-arch i386 -arch ppc") # # warnings flags @@ -676,8 +741,9 @@ env.Append(CCFLAGS="-Wall") env.Append(CXXFLAGS="-Woverloaded-virtual") if env['EXTRA_WARN']: - env.Append(CCFLAGS="-Wextra -pedantic") + env.Append(CCFLAGS="-Wextra -pedantic -ansi") env.Append(CXXFLAGS="-ansi") +# env.Append(CFLAGS="-iso") if env['LIBLO']: env.Append(CCFLAGS="-DHAVE_LIBLO") @@ -690,10 +756,44 @@ if env['LIBLO']: def prep_libcheck(topenv, libinfo): if topenv['DIST_TARGET'] == 'panther' or topenv['DIST_TARGET'] == 'tiger': - libinfo.Append(CCFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib") + # + # rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default. + # All libraries needed should be built against this location + if topenv['GTKOSX']: + libinfo.Append(CPPPATH="/opt/gtk/include", LIBPATH="/opt/gtk/lib") + libinfo.Append(CXXFLAGS="-I/opt/gtk/include", LINKFLAGS="-L/opt/gtk/lib") + libinfo.Append(CPPPATH="/opt/local/include", LIBPATH="/opt/local/lib") + libinfo.Append(CXXFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib") prep_libcheck(env, env) + +libraries['vamp'] = LibraryInfo (LIBS='vampsdk', + LIBPATH='#libs/vamp-sdk', + CPPPATH='#libs/vamp-sdk/vamp') + +env['RUBBERBAND'] = False + +#conf = Configure (env) +# +#if conf.CheckHeader ('fftw3.h'): +# env['RUBBERBAND'] = True +# libraries['rubberband'] = LibraryInfo (LIBS='rubberband', +# LIBPATH='#libs/rubberband', +# CPPPATH='#libs/rubberband', +# CCFLAGS='-DUSE_RUBBERBAND') +#else: +# print "" +# print "-------------------------------------------------------------------------" +# print "You do not have the FFTW single-precision development package installed." +# print "This prevents Ardour from using the Rubberband library for timestretching" +# print "and pitchshifting. It will fall back on SoundTouch for timestretch, and " +# print "pitchshifting will not be available." +# print "-------------------------------------------------------------------------" +# print "" +# +#conf.Finish() + # # Check for libusb @@ -706,6 +806,12 @@ if conf.CheckLib ('usb', 'usb_interrupt_write'): else: have_libusb = False +# check for linux/input.h while we're at it for powermate +if conf.CheckHeader('linux/input.h'): + have_linux_input = True +else: + have_linux_input = False + libraries['usb'] = conf.Finish () # @@ -713,10 +819,21 @@ libraries['usb'] = conf.Finish () libraries['flac'] = LibraryInfo () prep_libcheck(env, libraries['flac']) -libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") +libraries['flac'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib") + +# +# june 1st 2007: look for a function that is in FLAC 1.1.2 and not in later versions +# since the version of libsndfile we have internally does not support +# the new API that libFLAC has adopted +# conf = Configure (libraries['flac']) -conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX') +if conf.CheckLib ('FLAC', 'FLAC__seekable_stream_decoder_init', language='CXX'): + conf.env.Append(CCFLAGS='-DHAVE_FLAC') + use_flac = True +else: + use_flac = False + libraries['flac'] = conf.Finish () # or if that fails... @@ -726,7 +843,7 @@ libraries['flac'] = conf.Finish () libraries['boost'] = LibraryInfo () prep_libcheck(env, libraries['boost']) -libraries['boost'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") +libraries['boost'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib") conf = Configure (libraries['boost']) if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False: print "Boost header files do not appear to be installed." @@ -771,15 +888,34 @@ libraries['dmalloc'] = conf.Finish () # conf = Configure(env) + +# ALSA, for engine dialog +libraries['asound'] = LibraryInfo () if conf.CheckCHeader('alsa/asoundlib.h'): + libraries['asound'] = LibraryInfo (LIBS='asound') + +if conf.CheckCHeader('jack/midiport.h'): + libraries['sysmidi'] = LibraryInfo (LIBS='jack') + env['SYSMIDI'] = 'JACK MIDI' + subst_dict['%MIDITAG%'] = "control" + subst_dict['%MIDITYPE%'] = "jack" + print "Using JACK MIDI" +elif conf.CheckCHeader('alsa/asoundlib.h'): libraries['sysmidi'] = LibraryInfo (LIBS='asound') env['SYSMIDI'] = 'ALSA Sequencer' subst_dict['%MIDITAG%'] = "seq" subst_dict['%MIDITYPE%'] = "alsa/sequencer" + print "Using ALSA MIDI" elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'): # this line is needed because scons can't handle -framework in ParseConfig() yet. - libraries['sysmidi'] = LibraryInfo (LINKFLAGS= '-framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -bind_at_load') + if env['GTKOSX']: + # We need Carbon as well as the rest + libraries['sysmidi'] = LibraryInfo ( + LINKFLAGS = ' -framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -framework Carbon -bind_at_load' ) + else: + libraries['sysmidi'] = LibraryInfo ( + LINKFLAGS = ' -framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -bind_at_load' ) env['SYSMIDI'] = 'CoreMIDI' subst_dict['%MIDITAG%'] = "ardour" subst_dict['%MIDITYPE%'] = "coremidi" @@ -813,6 +949,10 @@ if env['SYSLIBS']: libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0') libraries['glibmm2'] = LibraryInfo() libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4') + libraries['cairo'] = LibraryInfo() + libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo') + libraries['cairomm'] = LibraryInfo() + libraries['cairomm'].ParseConfig('pkg-config --cflags --libs cairomm-1.0') libraries['gdkmm2'] = LibraryInfo() libraries['gdkmm2'].ParseConfig ('pkg-config --cflags --libs gdkmm-2.4') libraries['gtkmm2'] = LibraryInfo() @@ -830,16 +970,16 @@ if env['SYSLIBS']: libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', LIBPATH='#libs/libsndfile', - CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) + CPPPATH=['#libs/libsndfile/src']) # libraries['libglademm'] = LibraryInfo() # libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4') # libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') libraries['soundtouch'] = LibraryInfo() - libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') + #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') # Comment the previous line and uncomment this for Debian: - #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', @@ -854,6 +994,7 @@ if env['SYSLIBS']: 'libs/pbd', 'libs/midi++2', 'libs/ardour', + 'libs/vamp-sdk', # these are unconditionally included but have # tests internally to avoid compilation etc # if VST is not set @@ -873,18 +1014,27 @@ if env['SYSLIBS']: ] else: + libraries['cairo'] = LibraryInfo() + libraries['cairo'].ParseConfig('pkg-config --cflags --libs cairo') + + libraries['gtk2-unix-print'] = LibraryInfo() + libraries['gtk2-unix-print'].ParseConfig('pkg-config --cflags --libs gtk+-unix-print-2.0') + libraries['sigc2'] = LibraryInfo(LIBS='sigc++2', LIBPATH='#libs/sigc++2', CPPPATH='#libs/sigc++2') libraries['glibmm2'] = LibraryInfo(LIBS='glibmm2', LIBPATH='#libs/glibmm2', - CPPPATH='#libs/glibmm2') + CPPPATH='#libs/glibmm2/glib') libraries['pangomm'] = LibraryInfo(LIBS='pangomm', LIBPATH='#libs/gtkmm2/pango', CPPPATH='#libs/gtkmm2/pango') libraries['atkmm'] = LibraryInfo(LIBS='atkmm', LIBPATH='#libs/gtkmm2/atk', CPPPATH='#libs/gtkmm2/atk') + libraries['cairomm'] = LibraryInfo(LIBS='cairomm', + LIBPATH='#libs/cairomm', + CPPPATH='#libs/cairomm') libraries['gdkmm2'] = LibraryInfo(LIBS='gdkmm2', LIBPATH='#libs/gtkmm2/gdk', CPPPATH='#libs/gtkmm2/gdk') @@ -909,7 +1059,6 @@ else: CPPPATH='#libs/appleutility') coredirs = [ - 'libs/soundtouch', 'templates' ] @@ -919,6 +1068,7 @@ else: 'libs/pbd', 'libs/midi++2', 'libs/ardour', + 'libs/vamp-sdk', # these are unconditionally included but have # tests internally to avoid compilation etc # if VST is not set @@ -931,16 +1081,16 @@ else: ] gtk_subdirs = [ - 'libs/glibmm2', - 'libs/gtkmm2/pango', - 'libs/gtkmm2/atk', - 'libs/gtkmm2/gdk', - 'libs/gtkmm2/gtk', - 'libs/libgnomecanvasmm', -# 'libs/flowcanvas', + 'libs/glibmm2', + 'libs/gtkmm2/pango', + 'libs/gtkmm2/atk', + 'libs/gtkmm2/gdk', + 'libs/gtkmm2/gtk', + 'libs/libgnomecanvasmm', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks' + 'libs/clearlooks', + 'libs/cairomm' ] # @@ -950,32 +1100,42 @@ else: # its included in the tarball # -surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi', 'libs/surfaces/tranzport' ] +surface_subdirs = [ 'libs/surfaces/control_protocol', + 'libs/surfaces/generic_midi', + 'libs/surfaces/tranzport', + 'libs/surfaces/mackie', + 'libs/surfaces/powermate' + ] if env['SURFACES']: if have_libusb: - env['TRANZPORT'] = 'yes' - if os.access ('libs/surfaces/sony9pin', os.F_OK): - surface_subdirs += [ 'libs/surfaces/sony9pin' ] - -opts.Save('scache.conf', env) -Help(opts.GenerateHelpText(env)) + env['TRANZPORT'] = 1 + else: + env['TRANZPORT'] = 0 + print 'Disabled building Tranzport code because libusb could not be found' -if os.environ.has_key('PATH'): - env.Append(PATH = os.environ['PATH']) + if have_linux_input: + env['POWERMATE'] = 1 + else: + env['POWERMATE'] = 0 + print 'Disabled building Powermate code because linux/input.h could not be found' -if os.environ.has_key('PKG_CONFIG_PATH'): - env.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH']) + if os.access ('libs/surfaces/sony9pin', os.F_OK): + surface_subdirs += [ 'libs/surfaces/sony9pin' ] +else: + env['POWERMATE'] = 0 + env['TRANZPORT'] = 0 -if os.environ.has_key('CC'): - env['CC'] = os.environ['CC'] +# +# timestretch libraries +# -if os.environ.has_key('CXX'): - env['CXX'] = os.environ['CXX'] +timefx_subdirs = ['libs/soundtouch'] +#if env['RUBBERBAND']: +# timefx_subdirs += ['libs/rubberband'] -if os.environ.has_key('DISTCC_HOSTS'): - env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] - env['ENV']['HOME'] = os.environ['HOME'] +opts.Save('scache.conf', env) +Help(opts.GenerateHelpText(env)) final_prefix = '$PREFIX' @@ -1037,7 +1197,7 @@ env = conf.Finish() if env['NLS'] == 1: env.Append(CCFLAGS="-DENABLE_NLS") -Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict') +Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict use_flac') # # the configuration file may be system dependent @@ -1060,15 +1220,31 @@ if not conf.CheckFunc('posix_memalign'): env = conf.Finish() -rcbuild = env.SubstInFile ('ardour.rc','ardour.rc.in', SUBST_DICT = subst_dict) +# generate the per-user and system rc files from the same source + +sysrcbuild = env.SubstInFile ('ardour_system.rc','ardour.rc.in', SUBST_DICT = subst_dict) + +# add to the substitution dictionary + +subst_dict['%VERSION%'] = ardour_version[0:3] +subst_dict['%EXTRA_VERSION%'] = ardour_version[3:] +subst_dict['%REVISION_STRING%'] = '' +if os.path.exists('.svn'): + subst_dict['%REVISION_STRING%'] = '.' + fetch_svn_revision ('.') + 'svn' + +# specbuild = env.SubstInFile ('ardour.spec','ardour.spec.in', SUBST_DICT = subst_dict) the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision) +remove_ardour = env.Command ('frobnicatory_decoy2', [], + [ Delete ('$PREFIX/etc/ardour2'), + Delete ('$PREFIX/lib/ardour2'), + Delete ('$PREFIX/bin/ardour2')]) env.Alias('revision', the_revision) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc')) -env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.rc')) +env.Alias('uninstall', remove_ardour) -Default (rcbuild) +Default (sysrcbuild) # source tarball @@ -1078,7 +1254,6 @@ env.Distribute (env['DISTTREE'], [ 'SConstruct', 'svn_revision.h', 'COPYING', 'PACKAGER_README', 'README', 'ardour.rc.in', - 'ardour_system.rc', 'tools/config.guess', 'icons/icon/ardour_icon_mac_mask.png', 'icons/icon/ardour_icon_mac.png', @@ -1116,7 +1291,7 @@ env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE'])))) for subdir in coredirs: SConscript (subdir + '/SConscript') -for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: +for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]: for subdir in sublistdir: SConscript (subdir + '/SConscript')