X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=7ad9dd84510f90c5c2fdf61e48bfb2ffbf6fea23;hb=103f22dc9a39704b12463cb6cb761149e36cd769;hp=0806ac4d26243960c4058f244ffb5c2a8b69ed31;hpb=f7c82c69113419a8db083f0095044af5ad4c872c;p=ardour.git diff --git a/SConstruct b/SConstruct index 0806ac4d26..7ad9dd8451 100644 --- a/SConstruct +++ b/SConstruct @@ -8,13 +8,15 @@ import glob import errno import time import platform +import string +import commands from sets import Set import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -version = '2.0alpha2' +ardour_version = '2.0beta12' subst_dict = { } @@ -24,19 +26,27 @@ subst_dict = { } opts = Options('scache.conf') opts.AddOptions( - ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), - 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), + ('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('DEBUG', 'Set to build with debugging information and no optimizations', 0), PathOption('DESTDIR', 'Set the intermediate install "prefix"', '/'), - BoolOption('DEVBUILD', 'Use shared libardour (developers only)', 0), + EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2), + BoolOption('DMALLOC', 'Compile and link using the dmalloc library', 0), + BoolOption('EXTRA_WARN', 'Compile with -Wextra, -ansi, and -pedantic. Might break compilation. For pedants', 0), + BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0), + BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), + BoolOption('LIBLO', 'Compile with support for liblo library', 1), BoolOption('NLS', 'Set to turn on i18n support', 1), 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('VERSIONED', 'Add version information to ardour/gtk executable name inside the build directory', 0), - EnumOption('DIST_TARGET', 'Build target for cross compiling packagers', 'auto', allowed_values=('auto', 'i386', 'i686', 'x86_64', 'powerpc', 'tiger', 'panther', 'none' ), ignorecase=2), - BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1), - BoolOption('FFT_ANALYSIS', 'Include FFT analysis window', 0) - ) + BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), + BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1) +) #---------------------------------------------------------------------- # a handy helper that provides a way to merge compile/link information @@ -46,90 +56,98 @@ opts.AddOptions( class LibraryInfo(Environment): def __init__(self,*args,**kw): Environment.__init__ (self,*args,**kw) - + def Merge (self,others): for other in others: self.Append (LIBS = other.get ('LIBS',[])) - self.Append (LIBPATH = other.get ('LIBPATH', [])) + self.Append (LIBPATH = other.get ('LIBPATH', [])) self.Append (CPPPATH = other.get('CPPPATH', [])) self.Append (LINKFLAGS = other.get('LINKFLAGS', [])) self.Replace(LIBPATH = list(Set(self.get('LIBPATH', [])))) self.Replace(CPPPATH = list(Set(self.get('CPPPATH',[])))) - #doing LINKFLAGS breaks -framework - #doing LIBS break link order dependency - + #doing LINKFLAGS breaks -framework + #doing LIBS break link order dependency + + def ENV_update(self, src_ENV): + for k in src_ENV.keys(): + if k in self['ENV'].keys() and k in [ 'PATH', 'LD_LIBRARY_PATH', + 'LIB', 'INCLUDE' ]: + self['ENV'][k]=SCons.Util.AppendPath(self['ENV'][k], src_ENV[k]) + else: + self['ENV'][k]=src_ENV[k] env = LibraryInfo (options = opts, CPPPATH = [ '.' ], - VERSION = version, - TARBALL='ardour-' + version + '.tar.bz2', + VERSION = ardour_version, + TARBALL='ardour-' + ardour_version + '.tar.bz2', DISTFILES = [ ], - DISTTREE = '#ardour-' + version, - DISTCHECKDIR = '#ardour-' + version + '/check' + DISTTREE = '#ardour-' + ardour_version, + DISTCHECKDIR = '#ardour-' + ardour_version + '/check' ) +env.ENV_update(os.environ) #---------------------------------------------------------------------- # Builders #---------------------------------------------------------------------- # Handy subst-in-file builder -# +# def do_subst_in_file(targetfile, sourcefile, dict): - """Replace all instances of the keys of dict with their values. - For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'}, - then all instances of %VERSION% in the file will be replaced with 1.2345 etc. - """ - try: - f = open(sourcefile, 'rb') - contents = f.read() - f.close() - except: - raise SCons.Errors.UserError, "Can't read source file %s"%sourcefile - for (k,v) in dict.items(): - contents = re.sub(k, v, contents) - try: - f = open(targetfile, 'wb') - f.write(contents) - f.close() - except: - raise SCons.Errors.UserError, "Can't write target file %s"%targetfile - return 0 # success - + """Replace all instances of the keys of dict with their values. + For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'}, + then all instances of %VERSION% in the file will be replaced with 1.2345 etc. + """ + try: + f = open(sourcefile, 'rb') + contents = f.read() + f.close() + except: + raise SCons.Errors.UserError, "Can't read source file %s"%sourcefile + for (k,v) in dict.items(): + contents = re.sub(k, v, contents) + try: + f = open(targetfile, 'wb') + f.write(contents) + f.close() + except: + raise SCons.Errors.UserError, "Can't write target file %s"%targetfile + return 0 # success + def subst_in_file(target, source, env): - if not env.has_key('SUBST_DICT'): - raise SCons.Errors.UserError, "SubstInFile requires SUBST_DICT to be set." - d = dict(env['SUBST_DICT']) # copy it - for (k,v) in d.items(): - if callable(v): - d[k] = env.subst(v()) - elif SCons.Util.is_String(v): - d[k]=env.subst(v) - else: - raise SCons.Errors.UserError, "SubstInFile: key %s: %s must be a string or callable"%(k, repr(v)) - for (t,s) in zip(target, source): - return do_subst_in_file(str(t), str(s), d) - + if not env.has_key('SUBST_DICT'): + raise SCons.Errors.UserError, "SubstInFile requires SUBST_DICT to be set." + d = dict(env['SUBST_DICT']) # copy it + for (k,v) in d.items(): + if callable(v): + d[k] = env.subst(v()) + elif SCons.Util.is_String(v): + d[k]=env.subst(v) + else: + raise SCons.Errors.UserError, "SubstInFile: key %s: %s must be a string or callable"%(k, repr(v)) + for (t,s) in zip(target, source): + return do_subst_in_file(str(t), str(s), d) + def subst_in_file_string(target, source, env): - """This is what gets printed on the console.""" - return '\n'.join(['Substituting vars from %s into %s'%(str(s), str(t)) - for (t,s) in zip(target, source)]) - + """This is what gets printed on the console.""" + return '\n'.join(['Substituting vars from %s into %s'%(str(s), str(t)) + for (t,s) in zip(target, source)]) + def subst_emitter(target, source, env): - """Add dependency from substituted SUBST_DICT to target. - Returns original target, source tuple unchanged. - """ - d = env['SUBST_DICT'].copy() # copy it - for (k,v) in d.items(): - if callable(v): - d[k] = env.subst(v()) - elif SCons.Util.is_String(v): - d[k]=env.subst(v) - Depends(target, SCons.Node.Python.Value(d)) - # Depends(target, source) # this doesn't help the install-sapphire-linux.sh problem - return target, source - + """Add dependency from substituted SUBST_DICT to target. + Returns original target, source tuple unchanged. + """ + d = env['SUBST_DICT'].copy() # copy it + for (k,v) in d.items(): + if callable(v): + d[k] = env.subst(v()) + elif SCons.Util.is_String(v): + d[k]=env.subst(v) + Depends(target, SCons.Node.Python.Value(d)) + # Depends(target, source) # this doesn't help the install-sapphire-linux.sh problem + return target, source + subst_action = Action (subst_in_file, subst_in_file_string) env['BUILDERS']['SubstInFile'] = Builder(action=subst_action, emitter=subst_emitter) @@ -137,31 +155,31 @@ env['BUILDERS']['SubstInFile'] = Builder(action=subst_action, emitter=subst_emit # internationalization # -# po_helper +# po_builder: builder function to copy po files to the parent directory while updating them # -# this is not a builder. we can't list the .po files as a target, -# because then scons -c will remove them (even Precious doesn't alter -# this). this function is called whenever a .mo file is being -# built, and will conditionally update the .po file if necessary. +# first source: .po file +# second source: .pot file # -def po_helper(po,pot): +def po_builder(target,source,env): + os.spawnvp (os.P_WAIT, 'cp', ['cp', str(source[0]), str(target[0])]) args = [ 'msgmerge', '--update', - po, - pot, + str(target[0]), + str(source[1]) ] - print 'Updating ' + po + print 'Updating ' + str(target[0]) return os.spawnvp (os.P_WAIT, 'msgmerge', args) +po_bld = Builder (action = po_builder) +env.Append(BUILDERS = {'PoBuild' : po_bld}) + # mo_builder: builder function for (binary) message catalogs (.mo) # # first source: .po file -# second source: .pot file # def mo_builder(target,source,env): - po_helper (source[0].get_path(), source[1].get_path()) args = [ 'msgfmt', '-c', '-o', @@ -179,15 +197,15 @@ env.Append(BUILDERS = {'MoBuild' : mo_bld}) # def pot_builder(target,source,env): - args = [ 'xgettext', + args = [ 'xgettext', '--keyword=_', '--keyword=N_', '--from-code=UTF-8', - '-o', target[0].get_path(), + '-o', target[0].get_path(), "--default-domain=" + env['PACKAGE'], '--copyright-holder="Paul Davis"' ] args += [ src.get_path() for src in source ] - + return os.spawnvp (os.P_WAIT, 'xgettext', args) pot_bld = Builder (action = pot_builder) @@ -200,57 +218,88 @@ env.Append(BUILDERS = {'PotBuild' : pot_bld}) def i18n (buildenv, sources, installenv): domain = buildenv['PACKAGE'] potfile = buildenv['POTFILE'] - + installenv.Alias ('potupdate', buildenv.PotBuild (potfile, sources)) - + p_oze = [ os.path.basename (po) for po in glob.glob ('po/*.po') ] languages = [ po.replace ('.po', '') for po in p_oze ] - m_oze = [ po.replace (".po", ".mo") for po in p_oze ] - for mo in m_oze[:]: - po = 'po/' + mo.replace (".mo", ".po") - installenv.Alias ('install', buildenv.MoBuild (mo, [ po, potfile ])) - - for lang in languages[:]: + for po_file in p_oze: + buildenv.PoBuild(po_file, ['po/'+po_file, potfile]) + mo_file = po_file.replace (".po", ".mo") + installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file)) + + for lang in languages: modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/')) moname = domain + '.mo' installenv.Alias('install', installenv.InstallAs (os.path.join (modir, moname), lang + '.mo')) + +def fetch_svn_revision (path): + cmd = "LANG= " + cmd += "svn info " + cmd += path + cmd += " | awk '/^Revision:/ { print $2}'" + return commands.getoutput (cmd) + +def create_stored_revision (target = None, source = None, env = None): + if os.path.exists('.svn'): + rev = fetch_svn_revision ('.'); + try: + text = "#ifndef __ardour_svn_revision_h__\n" + text += "#define __ardour_svn_revision_h__\n" + text += "static const char* ardour_svn_revision = \"" + rev + "\";\n"; + text += "#endif\n" + print '============> writing svn revision info to svn_revision.h\n' + o = file ('svn_revision.h', 'w') + o.write (text) + o.close () + except IOError: + print "Could not open svn_revision.h for writing\n" + sys.exit (-1) + else: + print "You cannot use \"scons revision\" on without using a checked out" + print "copy of the Ardour source code repository" + sys.exit (-1) + # # A generic builder for version.cc files -# +# # note: requires that DOMAIN, MAJOR, MINOR, MICRO are set in the construction environment # note: assumes one source files, the header that declares the version variables -# +# + def version_builder (target, source, env): - text = "int " + env['DOMAIN'] + "_major_version = " + str (env['MAJOR']) + ";\n" - text += "int " + env['DOMAIN'] + "_minor_version = " + str (env['MINOR']) + ";\n" - text += "int " + env['DOMAIN'] + "_micro_version = " + str (env['MICRO']) + ";\n" - - try: - o = file (target[0].get_path(), 'w') - o.write (text) - o.close () - except IOError: - print "Could not open", target[0].get_path(), " for writing\n" - sys.exit (-1) - - text = "#ifndef __" + env['DOMAIN'] + "_version_h__\n" - text += "#define __" + env['DOMAIN'] + "_version_h__\n" - text += "extern int " + env['DOMAIN'] + "_major_version;\n" - text += "extern int " + env['DOMAIN'] + "_minor_version;\n" - text += "extern int " + env['DOMAIN'] + "_micro_version;\n" - text += "#endif /* __" + env['DOMAIN'] + "_version_h__ */\n" - - try: - o = file (target[1].get_path(), 'w') - o.write (text) - o.close (); - except IOError: - print "Could not open", target[1].get_path(), " for writing\n" - sys.exit (-1) - - return None + + text = "int " + env['DOMAIN'] + "_major_version = " + str (env['MAJOR']) + ";\n" + text += "int " + env['DOMAIN'] + "_minor_version = " + str (env['MINOR']) + ";\n" + text += "int " + env['DOMAIN'] + "_micro_version = " + str (env['MICRO']) + ";\n" + + try: + o = file (target[0].get_path(), 'w') + o.write (text) + o.close () + except IOError: + print "Could not open", target[0].get_path(), " for writing\n" + sys.exit (-1) + + text = "#ifndef __" + env['DOMAIN'] + "_version_h__\n" + text += "#define __" + env['DOMAIN'] + "_version_h__\n" + text += "extern const char* " + env['DOMAIN'] + "_revision;\n" + text += "extern int " + env['DOMAIN'] + "_major_version;\n" + text += "extern int " + env['DOMAIN'] + "_minor_version;\n" + text += "extern int " + env['DOMAIN'] + "_micro_version;\n" + text += "#endif /* __" + env['DOMAIN'] + "_version_h__ */\n" + + try: + o = file (target[1].get_path(), 'w') + o.write (text) + o.close () + except IOError: + print "Could not open", target[1].get_path(), " for writing\n" + sys.exit (-1) + + return None version_bld = Builder (action = version_builder) env.Append (BUILDERS = {'VersionBuild' : version_bld}) @@ -264,37 +313,23 @@ env.Append (BUILDERS = {'VersionBuild' : version_bld}) # def versioned_builder(target,source,env): - # build ID is composed of a representation of the date of the last CVS transaction - # for this (SConscript) file + w, r = os.popen2( "LANG= svn info | awk '/^Revision:/ { print $2}'") - try: - o = file (source[0].get_dir().get_path() + '/CVS/Entries', "r") - except IOError: - print "Could not CVS/Entries for reading" + last_revision = r.readline().strip() + w.close() + r.close() + if last_revision == "": + print "No SVN info found - versioned executable cannot be built" return -1 - - last_date = "" - lines = o.readlines() - for line in lines: - if line[0:12] == '/SConscript/': - parts = line.split ("/") - last_date = parts[3] - break - o.close () - - if last_date == "": - print "No SConscript CVS update info found - versioned executable cannot be built" - return -1 - - tag = time.strftime ('%Y%M%d%H%m', time.strptime (last_date)) - print "The current build ID is " + tag - - tagged_executable = source[0].get_path() + '-' + tag - + + print "The current build ID is " + last_revision + + tagged_executable = source[0].get_path() + '-' + last_revision + if os.path.exists (tagged_executable): print "Replacing existing executable with the same build tag." os.unlink (tagged_executable) - + return os.link (source[0].get_path(), tagged_executable) verbuild = Builder (action = versioned_builder) @@ -306,13 +341,13 @@ env.Append (BUILDERS = {'VersionedExecutable' : verbuild}) def distcopy (target, source, env): treedir = str (target[0]) - + try: os.mkdir (treedir) except OSError, (errnum, strerror): if errnum != errno.EEXIST: print 'mkdir ', treedir, ':', strerror - + cmd = 'tar cf - ' # # we don't know what characters might be in the file names @@ -324,7 +359,7 @@ def distcopy (target, source, env): p = os.popen (cmd) return p.close () -def tarballer (target, source, env): +def tarballer (target, source, env): cmd = 'tar -jcf ' + str (target[0]) + ' ' + str(source[0]) + " --exclude '*~'" print 'running ', cmd, ' ... ' p = os.popen (cmd) @@ -342,6 +377,72 @@ tarball_bld = Builder (action = tarballer, env.Append (BUILDERS = {'Distribute' : dist_bld}) env.Append (BUILDERS = {'Tarball' : tarball_bld}) +# +# Make sure they know what they are doing +# + +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); + else: + print "OK, VST support will be enabled" + + +####################### +# Dependency Checking # +####################### + +deps = \ +{ + 'glib-2.0' : '2.10.1', + 'gthread-2.0' : '2.10.1', + 'gtk+-2.0' : '2.8.1', + 'libxml-2.0' : '2.6.0', + 'samplerate' : '0.1.0', + 'raptor' : '1.4.2', + 'lrdf' : '0.4.0', + 'jack' : '0.101.1', + 'libgnomecanvas-2.0' : '2.0' +} + +def DependenciesRequiredMessage(): + print 'You do not have the necessary dependencies required to build ardour' + 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 + +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 + +conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, + 'CheckPKGVersion' : CheckPKGVersion }) + +# I think a more recent version is needed on win32 +min_pkg_config_version = '0.8.0' + +if not conf.CheckPKGConfig(min_pkg_config_version): + print 'pkg-config >= %s not found.' % min_pkg_config_version + Exit(1) + +for pkg, version in deps.iteritems(): + if not conf.CheckPKGVersion( pkg, version ): + print '%s >= %s not found.' %(pkg, version) + DependenciesRequiredMessage() + Exit(1) + +env = conf.Finish() + # ---------------------------------------------------------------------- # Construction environment setup # ---------------------------------------------------------------------- @@ -350,8 +451,8 @@ libraries = { } libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') -libraries['sndfile'] = LibraryInfo() -libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile') +#libraries['sndfile'] = LibraryInfo() +#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile') libraries['lrdf'] = LibraryInfo() libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') @@ -362,9 +463,16 @@ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') libraries['samplerate'] = LibraryInfo() libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate') -if env['FFT_ANALYSIS']: +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(); libraries['jack'] = LibraryInfo() libraries['jack'].ParseConfig('pkg-config --cflags --libs jack') @@ -372,10 +480,14 @@ libraries['jack'].ParseConfig('pkg-config --cflags --libs jack') libraries['xml'] = LibraryInfo() libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0') +libraries['xslt'] = LibraryInfo() +libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt') + libraries['glib2'] = LibraryInfo() libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gmodule-2.0') +libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gthread-2.0') libraries['gtk2'] = LibraryInfo() libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0') @@ -386,187 +498,44 @@ libraries['pango'].ParseConfig ('pkg-config --cflags --libs pango') libraries['libgnomecanvas2'] = LibraryInfo() libraries['libgnomecanvas2'].ParseConfig ('pkg-config --cflags --libs libgnomecanvas-2.0') -libraries['glade2'] = LibraryInfo() -libraries['glade2'].ParseConfig ('pkg-config --cflags --libs libglade-2.0') +#libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') + +# The Ardour Control Protocol Library -libraries['usb'] = LibraryInfo (LIBS='usb') +libraries['ardour_cp'] = LibraryInfo (LIBS='ardour_cp', LIBPATH='#libs/surfaces/control_protocol', + CPPPATH='#libs/surfaces/control_protocol') -#libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas') +# The Ardour backend/engine libraries['ardour'] = LibraryInfo (LIBS='ardour', LIBPATH='#libs/ardour', CPPPATH='#libs/ardour') libraries['midi++2'] = LibraryInfo (LIBS='midi++', LIBPATH='#libs/midi++2', CPPPATH='#libs/midi++2') -libraries['pbd3'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd3', CPPPATH='#libs/pbd3') +libraries['pbd'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd') libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext') -#libraries['cassowary'] = LibraryInfo(LIBS='cassowary', LIBPATH='#libs/cassowary', CPPPATH='#libs/cassowary') - -libraries['fst'] = LibraryInfo() -if env['VST']: - libraries['fst'].ParseConfig('pkg-config --cflags --libs libfst') - -# -# Audio/MIDI library (needed for MIDI, since audio is all handled via JACK) -# - -conf = Configure(env) - -if conf.CheckCHeader('alsa/asoundlib.h'): - libraries['sysmidi'] = LibraryInfo (LIBS='asound') - env['SYSMIDI'] = 'ALSA Sequencer' - subst_dict['%MIDITAG%'] = "seq" - subst_dict['%MIDITYPE%'] = "alsa/sequencer" -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') - env['SYSMIDI'] = 'CoreMIDI' - subst_dict['%MIDITAG%'] = "ardour" - subst_dict['%MIDITYPE%'] = "coremidi" - -env = conf.Finish() - -if env['SYSLIBS']: - - libraries['sigc2'] = LibraryInfo() - libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0') - libraries['glibmm2'] = LibraryInfo() - libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4') - libraries['gdkmm2'] = LibraryInfo() - libraries['gdkmm2'].ParseConfig ('pkg-config --cflags --libs gdkmm-2.4') - libraries['gtkmm2'] = LibraryInfo() - libraries['gtkmm2'].ParseConfig ('pkg-config --cflags --libs gtkmm-2.4') - libraries['atkmm'] = LibraryInfo() - libraries['atkmm'].ParseConfig ('pkg-config --cflags --libs atkmm-1.6') - libraries['pangomm'] = LibraryInfo() - libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4') - libraries['libgnomecanvasmm'] = LibraryInfo() - libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6') - 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') - - coredirs = [ - 'templates' - ] - - subdirs = [ - 'libs/pbd3', - 'libs/midi++2', - 'libs/ardour' - ] - - gtk_subdirs = [ -# 'libs/flowcanvas', - 'libs/gtkmm2ext', - 'gtk2_ardour' - ] - -else: - 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') - 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['gdkmm2'] = LibraryInfo(LIBS='gdkmm2', - LIBPATH='#libs/gtkmm2/gdk', - CPPPATH='#libs/gtkmm2/gdk') - libraries['gtkmm2'] = LibraryInfo(LIBS='gtkmm2', - LIBPATH="#libs/gtkmm2/gtk", - CPPPATH='#libs/gtkmm2/gtk/') - libraries['libgnomecanvasmm'] = LibraryInfo(LIBS='libgnomecanvasmm', - LIBPATH='#libs/libgnomecanvasmm', - CPPPATH='#libs/libgnomecanvasmm') - - libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', - LIBPATH='#libs/soundtouch', - CPPPATH=['#libs', '#libs/soundtouch']) - libraries['libglademm'] = LibraryInfo(LIBS='libglademm', - LIBPATH='#libs/libglademm', - CPPPATH='#libs/libglademm') - - coredirs = [ - 'libs/soundtouch', - 'templates' - ] - - subdirs = [ -# 'libs/cassowary', - 'libs/sigc++2', - 'libs/pbd3', - 'libs/midi++2', - 'libs/ardour' - ] - - gtk_subdirs = [ - 'libs/glibmm2', - 'libs/gtkmm2/pango', - 'libs/gtkmm2/atk', - 'libs/gtkmm2/gdk', - 'libs/gtkmm2/gtk', - 'libs/libglademm', - 'libs/libgnomecanvasmm', -# 'libs/flowcanvas', - 'libs/gtkmm2ext', - 'gtk2_ardour' - ] - -opts.Save('scache.conf', env) -Help(opts.GenerateHelpText(env)) - -if os.environ.has_key('PATH'): - env.Append(PATH = os.environ['PATH']) - -if os.environ.has_key('PKG_CONFIG_PATH'): - env.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH']) - -if os.environ.has_key('CC'): - env['CC'] = os.environ['CC'] - -if os.environ.has_key('CXX'): - env['CXX'] = os.environ['CXX'] - -if os.environ.has_key('DISTCC_HOSTS'): - env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] - env['ENV']['HOME'] = os.environ['HOME'] - -final_prefix = '$PREFIX' -install_prefix = '$DESTDIR/$PREFIX' - -if env['PREFIX'] == '/usr': - final_config_prefix = '/etc' -else: - final_config_prefix = env['PREFIX'] + '/etc' - -config_prefix = '$DESTDIR' + final_config_prefix # SCons should really do this for us conf = Configure (env) -have_cxx = conf.TryAction (Action (env['CXX'] + ' --version')) +have_cxx = conf.TryAction (Action (str(env['CXX']) + ' --version')) if have_cxx[0] != 1: print "This system has no functional C++ compiler. You cannot build Ardour from source without one." - exit (1) + sys.exit (1) else: print "Congratulations, you have a functioning C++ compiler." - + env = conf.Finish() + # # Compiler flags and other system-dependent stuff # 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 @@ -610,39 +579,42 @@ if config[config_cpu] == 'powerpc' and env['DIST_TARGET'] != 'none': # if env['DIST_TARGET'] == 'panther' or env['DIST_TARGET'] == 'tiger': if config[config_arch] == 'apple': - opt_flags.extend ([ "-mcpu=7450", "-faltivec"]) + ## opt_flags.extend ([ "-mcpu=7450", "-faltivec"]) + # to support g3s but still have some optimization for above + opt_flags.extend ([ "-mcpu=G3", "-mtune=7450"]) else: - opt_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) + opt_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"]) else: opt_flags.extend([ "-mcpu=750", "-mmultiple" ]) opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"]) + opt_flags.extend (["-Os"]) elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and env['DIST_TARGET'] != 'none': - + build_host_supports_sse = 0 debug_flags.append ("-DARCH_X86") opt_flags.append ("-DARCH_X86") - + if config[config_kernel] == 'linux' : - - if env['DIST_TARGET'] != 'i386': - + + 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") if "sse" in x86_flags: build_host_supports_sse = 1 if "3dnow" in x86_flags: opt_flags.append ("-m3dnow") - + if config[config_cpu] == "i586": opt_flags.append ("-march=i586") elif config[config_cpu] == "i686": 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"]) @@ -664,8 +636,21 @@ if env['FPU_OPTIMIZATION']: print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)" # end optimization section +# handle x86/x86_64 libdir properly + +if env['DIST_TARGET'] == 'x86_64': + env['LIBDIR']='lib64' +else: + env['LIBDIR']='lib' + +# +# save off guessed arch element in an env +# +env.Append(CONFIG_ARCH=config[config_arch]) + + # -# ARCH="..." overrides all +# ARCH="..." overrides all # if env['ARCH'] != '': @@ -679,18 +664,351 @@ opt_flags[:0] = [ "-O3", "-fomit-frame-pointer", "-ffast-math", - "-fstrength-reduce" + "-fstrength-reduce", + "-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 +# env.Append(CCFLAGS="-Wall") +env.Append(CXXFLAGS="-Woverloaded-virtual") -if env['VST']: - env.Append(CCFLAGS="-DVST_SUPPORT") +if env['EXTRA_WARN']: + env.Append(CCFLAGS="-Wextra -pedantic -ansi") + env.Append(CXXFLAGS="-ansi") +# env.Append(CFLAGS="-iso") + +if env['LIBLO']: + env.Append(CCFLAGS="-DHAVE_LIBLO") + + +# +# fix scons nitpickiness on APPLE +# + + +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") + +prep_libcheck(env, env) + +# +# Check for libusb + +libraries['usb'] = LibraryInfo () +prep_libcheck(env, libraries['usb']) + +conf = Configure (libraries['usb']) +if conf.CheckLib ('usb', 'usb_interrupt_write'): + have_libusb = True +else: + have_libusb = False + +libraries['usb'] = conf.Finish () + +# +# Check for FLAC + +libraries['flac'] = LibraryInfo () +prep_libcheck(env, libraries['flac']) +libraries['flac'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib") + +conf = Configure (libraries['flac']) +conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX') +libraries['flac'] = conf.Finish () + +# or if that fails... +#libraries['flac'] = LibraryInfo (LIBS='FLAC') + +# boost (we don't link against boost, just use some header files) + +libraries['boost'] = LibraryInfo () +prep_libcheck(env, libraries['boost']) +libraries['boost'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/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." + sys.exit (1) + +libraries['boost'] = conf.Finish () + +# +# Check for liblo + +if env['LIBLO']: + libraries['lo'] = LibraryInfo () + prep_libcheck(env, libraries['lo']) + + conf = Configure (libraries['lo']) + if conf.CheckLib ('lo', 'lo_server_new') == False: + print "liblo does not appear to be installed." + sys.exit (1) + + libraries['lo'] = conf.Finish () + +# +# Check for dmalloc + +libraries['dmalloc'] = LibraryInfo () +prep_libcheck(env, libraries['dmalloc']) + +# +# look for the threaded version +# + +conf = Configure (libraries['dmalloc']) +if conf.CheckLib ('dmallocth', 'dmalloc_shutdown'): + have_libdmalloc = True +else: + have_libdmalloc = False + +libraries['dmalloc'] = conf.Finish () + +# +# Audio/MIDI library (needed for MIDI, since audio is all handled via JACK) +# + +conf = Configure(env) + +if conf.CheckCHeader('alsa/asoundlib.h'): + libraries['sysmidi'] = LibraryInfo (LIBS='asound') + env['SYSMIDI'] = 'ALSA Sequencer' + subst_dict['%MIDITAG%'] = "seq" + subst_dict['%MIDITYPE%'] = "alsa/sequencer" +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') + env['SYSMIDI'] = 'CoreMIDI' + subst_dict['%MIDITAG%'] = "ardour" + subst_dict['%MIDITYPE%'] = "coremidi" +else: + print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries." + sys.exit (1) + +env = conf.Finish() + +if env['SYSLIBS']: + + syslibdeps = \ + { + 'sigc++-2.0' : '2.0', + 'gtkmm-2.4' : '2.8', + 'libgnomecanvasmm-2.6' : '2.12.0' + } + + conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig, + 'CheckPKGVersion' : CheckPKGVersion }) + + for pkg, version in syslibdeps.iteritems(): + if not conf.CheckPKGVersion( pkg, version ): + print '%s >= %s not found.' %(pkg, version) + DependenciesRequiredMessage() + Exit(1) + + env = conf.Finish() + + libraries['sigc2'] = LibraryInfo() + libraries['sigc2'].ParseConfig('pkg-config --cflags --libs sigc++-2.0') + libraries['glibmm2'] = LibraryInfo() + libraries['glibmm2'].ParseConfig('pkg-config --cflags --libs glibmm-2.4') + libraries['gdkmm2'] = LibraryInfo() + libraries['gdkmm2'].ParseConfig ('pkg-config --cflags --libs gdkmm-2.4') + libraries['gtkmm2'] = LibraryInfo() + libraries['gtkmm2'].ParseConfig ('pkg-config --cflags --libs gtkmm-2.4') + libraries['atkmm'] = LibraryInfo() + libraries['atkmm'].ParseConfig ('pkg-config --cflags --libs atkmm-1.6') + libraries['pangomm'] = LibraryInfo() + libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4') + libraries['libgnomecanvasmm'] = LibraryInfo() + libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6') + +# +# cannot use system one for the time being +# + + libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', + LIBPATH='#libs/libsndfile', + 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') + # Comment the previous line and uncomment this for Debian: + #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') + + libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', + LIBPATH='#libs/appleutility', + CPPPATH='#libs/appleutility') + + coredirs = [ + 'templates' + ] + + subdirs = [ + 'libs/libsndfile', + 'libs/pbd', + 'libs/midi++2', + 'libs/ardour', + # these are unconditionally included but have + # tests internally to avoid compilation etc + # if VST is not set + 'libs/fst', + 'vst', + # this is unconditionally included but has + # tests internally to avoid compilation etc + # if COREAUDIO is not set + 'libs/appleutility' + ] + + gtk_subdirs = [ +# 'libs/flowcanvas', + 'libs/gtkmm2ext', + 'gtk2_ardour', + 'libs/clearlooks' + ] + +else: + 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') + 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['gdkmm2'] = LibraryInfo(LIBS='gdkmm2', + LIBPATH='#libs/gtkmm2/gdk', + CPPPATH='#libs/gtkmm2/gdk') + libraries['gtkmm2'] = LibraryInfo(LIBS='gtkmm2', + LIBPATH="#libs/gtkmm2/gtk", + CPPPATH='#libs/gtkmm2/gtk/') + libraries['libgnomecanvasmm'] = LibraryInfo(LIBS='libgnomecanvasmm', + LIBPATH='#libs/libgnomecanvasmm', + CPPPATH='#libs/libgnomecanvasmm') + + libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch', + LIBPATH='#libs/soundtouch', + CPPPATH=['#libs', '#libs/soundtouch']) + libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour', + LIBPATH='#libs/libsndfile', + CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src']) +# libraries['libglademm'] = LibraryInfo(LIBS='libglademm', +# LIBPATH='#libs/libglademm', +# CPPPATH='#libs/libglademm') + libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', + LIBPATH='#libs/appleutility', + CPPPATH='#libs/appleutility') + + coredirs = [ + 'libs/soundtouch', + 'templates' + ] + + subdirs = [ + 'libs/sigc++2', + 'libs/libsndfile', + 'libs/pbd', + 'libs/midi++2', + 'libs/ardour', + # these are unconditionally included but have + # tests internally to avoid compilation etc + # if VST is not set + 'libs/fst', + 'vst', + # this is unconditionally included but has + # tests internally to avoid compilation etc + # if COREAUDIO is not set + 'libs/appleutility' + ] + + gtk_subdirs = [ + 'libs/glibmm2', + 'libs/gtkmm2/pango', + 'libs/gtkmm2/atk', + 'libs/gtkmm2/gdk', + 'libs/gtkmm2/gtk', + 'libs/libgnomecanvasmm', +# 'libs/flowcanvas', + 'libs/gtkmm2ext', + 'gtk2_ardour', + 'libs/clearlooks' + ] + +# +# * always build the LGPL control protocol lib, since we link against it from libardour +# * ditto for generic MIDI +# * tranzport checks whether it should build internally, but we need here so that +# its included in the tarball +# + +surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi', 'libs/surfaces/tranzport', 'libs/surfaces/mackie' ] + +if env['SURFACES']: + if have_libusb: + env['TRANZPORT'] = 1 + else: + env['TRANZPORT'] = 0 + print 'Disabled building Tranzport code because libusb could not be found' + if os.access ('libs/surfaces/sony9pin', os.F_OK): + surface_subdirs += [ 'libs/surfaces/sony9pin' ] + +opts.Save('scache.conf', env) +Help(opts.GenerateHelpText(env)) + +if os.environ.has_key('PATH'): + env.Append(PATH = os.environ['PATH']) + +if os.environ.has_key('PKG_CONFIG_PATH'): + env.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH']) + +if os.environ.has_key('CC'): + env['CC'] = os.environ['CC'] + +if os.environ.has_key('CXX'): + env['CXX'] = os.environ['CXX'] + +if os.environ.has_key('DISTCC_HOSTS'): + env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] + env['ENV']['HOME'] = os.environ['HOME'] + +final_prefix = '$PREFIX' + +if env['DESTDIR'] : + install_prefix = '$DESTDIR/$PREFIX' +else: + install_prefix = env['PREFIX'] + +subst_dict['%INSTALL_PREFIX%'] = install_prefix; +subst_dict['%FINAL_PREFIX%'] = final_prefix; +subst_dict['%PREFIX%'] = final_prefix; + +if env['PREFIX'] == '/usr': + final_config_prefix = '/etc' +else: + final_config_prefix = env['PREFIX'] + '/etc' + +config_prefix = '$DESTDIR' + final_config_prefix # # everybody needs this @@ -698,31 +1016,43 @@ if env['VST']: env.Merge ([ libraries['core'] ]) + # -# i18n support +# i18n support # conf = Configure (env) - if env['NLS']: + nls_error = 'This system is not configured for internationalized applications. An english-only version will be built:' print 'Checking for internationalization support ...' have_gettext = conf.TryAction(Action('xgettext --version')) if have_gettext[0] != 1: - print 'This system is not configured for internationalized applications (no xgettext command). An english-only version will be built\n' + nls_error += ' No xgettext command.' env['NLS'] = 0 - - if conf.CheckCHeader('libintl.h') == None: - print 'This system is not configured for internationalized applications (no libintl.h). An english-only version will be built\n' + else: + print "Found xgettext" + + have_msgmerge = conf.TryAction(Action('msgmerge --version')) + if have_msgmerge[0] != 1: + nls_error += ' No msgmerge command.' env['NLS'] = 0 - - + else: + print "Found msgmerge" + + if not conf.CheckCHeader('libintl.h'): + nls_error += ' No libintl.h.' + env['NLS'] = 0 + + if env['NLS'] == 0: + print nls_error + else: + print "International version will be built." 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 version subst_dict') +Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict') # # the configuration file may be system dependent @@ -746,7 +1076,17 @@ if not conf.CheckFunc('posix_memalign'): env = conf.Finish() rcbuild = env.SubstInFile ('ardour.rc','ardour.rc.in', SUBST_DICT = subst_dict) +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) + +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')) @@ -756,17 +1096,22 @@ Default (rcbuild) Precious (env['DISTTREE']) -# -# note the special "cleanfirst" source name. this triggers removal -# of the existing disttree -# - env.Distribute (env['DISTTREE'], - [ 'SConstruct', + [ 'SConstruct', 'svn_revision.h', 'COPYING', 'PACKAGER_README', 'README', 'ardour.rc.in', 'ardour_system.rc', - 'tools/config.guess' + 'tools/config.guess', + 'icons/icon/ardour_icon_mac_mask.png', + 'icons/icon/ardour_icon_mac.png', + 'icons/icon/ardour_icon_tango_16px_blue.png', + 'icons/icon/ardour_icon_tango_16px_red.png', + 'icons/icon/ardour_icon_tango_22px_blue.png', + 'icons/icon/ardour_icon_tango_22px_red.png', + 'icons/icon/ardour_icon_tango_32px_blue.png', + 'icons/icon/ardour_icon_tango_32px_red.png', + 'icons/icon/ardour_icon_tango_48px_blue.png', + 'icons/icon/ardour_icon_tango_48px_red.png' ] + glob.glob ('DOCUMENTATION/AUTHORS*') + glob.glob ('DOCUMENTATION/CONTRIBUTORS*') + @@ -775,25 +1120,27 @@ env.Distribute (env['DISTTREE'], glob.glob ('DOCUMENTATION/FAQ*') + glob.glob ('DOCUMENTATION/README*') ) - -srcdist = env.Tarball(env['TARBALL'], env['DISTTREE']) + +srcdist = env.Tarball(env['TARBALL'], [ env['DISTTREE'], the_revision ]) env.Alias ('srctar', srcdist) + # -# don't leave the distree around +# don't leave the distree around # + env.AddPreAction (env['DISTTREE'], Action ('rm -rf ' + str (File (env['DISTTREE'])))) env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE'])))) # # the subdirs -# +# for subdir in coredirs: SConscript (subdir + '/SConscript') -for sublistdir in [subdirs, gtk_subdirs]: - for subdir in sublistdir: - SConscript (subdir + '/SConscript') +for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: + for subdir in sublistdir: + SConscript (subdir + '/SConscript') # cleanup env.Clean ('scrub', [ 'scache.conf', '.sconf_temp', '.sconsign.dblite', 'config.log'])