X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=49eb08a4599b835d00c7f0b71228edb39699d859;hb=d91e94ea2f99d9ba38c0c52605164ae2fdb524b9;hp=6839618cc4967b0bab4708094e7282c701d158ac;hpb=4a0f94395d130a55107249a74f1adf4b758afd76;p=ardour.git diff --git a/SConstruct b/SConstruct index 6839618cc4..49eb08a459 100644 --- a/SConstruct +++ b/SConstruct @@ -1,6 +1,11 @@ # -*- python -*- +# +# and there we have it, or do we? +# + import os +import os.path import sys import re import shutil @@ -16,7 +21,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.2' +ardour_version = '2.6.1' subst_dict = { } @@ -27,17 +32,19 @@ subst_dict = { } opts = Options('scache.conf') opts.AddOptions( ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''), + ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'), 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('OLDFONTS', 'Old school font sizes', 0), BoolOption('DEBUG', 'Set to build with debugging information and no optimizations', 0), + BoolOption('STL_DEBUG', 'Set to build with Standard Template Library Debugging', 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', 'leopard', '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('FFT_ANALYSIS', 'Include FFT analysis window', 1), + BoolOption('FREESOUND', 'Include Freesound database lookup', 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), @@ -49,7 +56,10 @@ opts.AddOptions( BoolOption('VST', 'Compile with support for VST', 0), BoolOption('LV2', 'Compile with support for LV2 (if slv2 is available)', 1), BoolOption('GPROFILE', 'Compile with support for gprofile (Developers only)', 0), - BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1) + BoolOption('FREEDESKTOP', 'Install MIME type, icons and .desktop file as per the freedesktop.org spec (requires xdg-utils and shared-mime-info). "scons uninstall" removes associations in desktop database', 0), + BoolOption('TRANZPORT', 'Compile with support for Frontier Designs (if libusb is available)', 1), + BoolOption('AUBIO', "Use Paul Brossier's aubio library for feature detection (if available)", 1) + ) #---------------------------------------------------------------------- @@ -252,21 +262,21 @@ 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') + text = "#include \n" + text += "namespace ARDOUR {\n"; + text += "extern const char* svn_revision = \"" + rev + "\";\n"; + text += "}\n"; + print '============> writing svn revision info to libs/ardour/svn_revision.cc\n' + o = file ('libs/ardour/svn_revision.cc', 'w') o.write (text) o.close () except IOError: - print "Could not open svn_revision.h for writing\n" + print "Could not open libs/ardour/svn_revision.cc 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) + if not os.path.exists('libs/ardour/ardour/svn_revision.h'): + print "This release of ardour is missing libs/ardour/ardour/svn_revision.h. Blame the packager." + sys.exit (-1) # # A generic builder for version.cc files @@ -441,8 +451,8 @@ deps = \ 'samplerate' : '0.1.0', 'raptor' : '1.4.2', 'lrdf' : '0.4.0', - 'jack' : '0.101.1', - 'libgnomecanvas-2.0' : '2.0' + 'jack' : '0.109.0', + 'libgnomecanvas-2.0' : '2.0', } def DependenciesRequiredMessage(): @@ -515,6 +525,13 @@ if conf.CheckPKGExists ('fftw3'): libraries['fftw3'] = LibraryInfo() libraries['fftw3'].ParseConfig('pkg-config --cflags --libs fftw3') +if conf.CheckPKGExists ('aubio'): + libraries['aubio'] = LibraryInfo() + libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio') + env['AUBIO'] = 1 +else: + env['AUBIO'] = 0 + env = conf.Finish () if env['FFT_ANALYSIS']: @@ -525,22 +542,37 @@ if env['FFT_ANALYSIS']: 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') + print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed') sys.exit (1) conf.Finish() +if env['FREESOUND']: + # + # Check for curl header as well as the library + # + + libraries['curl'] = LibraryInfo() + + conf = Configure(libraries['curl']) + + if conf.CheckHeader ('curl/curl.h') == False: + print ('Ardour cannot be compiled without the curl headers, which do not seem to be installed') + sys.exit (1) + else: + libraries['curl'].ParseConfig('pkg-config --cflags --libs libcurl') + conf.Finish() +else: + print 'FREESOUND support is not enabled. Build with \'scons FREESOUND=1\' to enable.' + if env['LV2']: - conf = env.Configure(custom_tests = { 'CheckPKGExists' : CheckPKGExists }) + conf = env.Configure(custom_tests = { 'CheckPKGVersion' : CheckPKGVersion}) - if conf.CheckPKGExists ('\"slv2 >= 0.6.0\"'): + if conf.CheckPKGVersion('slv2', '0.6.0'): libraries['slv2'] = LibraryInfo() libraries['slv2'].ParseConfig('pkg-config --cflags --libs slv2') env.Append (CCFLAGS="-DHAVE_LV2") else: - print 'Building Ardour with LV2 support requires SLV2 >= 0.6.0' - print 'WARNING: SLV2 not found, or too old. Ardour will be built without LV2 support.' - print 'Until the 2.3 release, Ardour requires SLV2 out of SVN.' - print 'Testing would be very much appreciated! svn co http://svn.drobilla.net/lad/slv2' + print 'LV2 support is not enabled (SLV2 not found or older than 0.6.0)' env['LV2'] = 0 conf.Finish() else: @@ -561,6 +593,9 @@ 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['freetype2'] = LibraryInfo() +libraries['freetype2'].ParseConfig ('pkg-config --cflags --libs freetype2') + libraries['gtk2'] = LibraryInfo() libraries['gtk2'].ParseConfig ('pkg-config --cflags --libs gtk+-2.0') @@ -667,8 +702,9 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6 build_host_supports_sse = 0 - debug_flags.append ("-DARCH_X86") - opt_flags.append ("-DARCH_X86") + if (re.search ("i[0-9]86", config[config_cpu]) != None): + debug_flags.append ("-DARCH_X86") + opt_flags.append ("-DARCH_X86") if config[config_kernel] == 'linux' : @@ -726,6 +762,13 @@ if env['DIST_TARGET'] in ['panther', 'tiger', 'leopard' ]: # force tiger or later, to avoid issues on PPC which defaults # back to 10.1 if we don't tell it otherwise. env.Append (CCFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040") + + if env['DIST_TARGET'] == 'leopard': + # need this to really build against the 10.4 SDK when building on leopard + # ideally this would be configurable, but lets just do that later when we need it + env.Append(CCFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk") + env.Append(LINKFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk") + else: env['IS_OSX'] = 0 @@ -761,10 +804,14 @@ else: env.Append(CCFLAGS=" ".join (opt_flags)) env.Append(LINKFLAGS=" ".join (opt_flags)) +if env['STL_DEBUG'] == 1: + env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG") + if env['UNIVERSAL'] == 1: env.Append(CCFLAGS="-arch i386 -arch ppc") env.Append(LINKFLAGS="-arch i386 -arch ppc") + # # warnings flags # @@ -791,11 +838,13 @@ def prep_libcheck(topenv, libinfo): # # rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default. # All libraries needed should be built against this location + # However.. now jhbuild installs to ~/gtk/inst by default.. changed to accomodate this 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") + GTKROOT = os.path.expanduser ('~/gtk/inst') + libinfo.Append(CPPPATH= GTKROOT + "/include", LIBPATH= GTKROOT + "/lib") + libinfo.Append(CXXFLAGS="-I" + GTKROOT + "/include", LINKFLAGS="-L" + GTKROOT + "/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) @@ -885,7 +934,7 @@ prep_libcheck(env, libraries['boost']) 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." + print "Boost header files do not appear to be installed. You also might be running a buggy version of scons. Try scons 0.97 if you can." sys.exit (1) libraries['boost'] = conf.Finish () @@ -922,6 +971,26 @@ else: libraries['dmalloc'] = conf.Finish () +# +# ensure FREEDESKTOP target is doable.. +# + +conf = env.Configure () +if env['FREEDESKTOP']: + have_update_mime_database = conf.TryAction (Action ('update-mime-database -v')) + if have_update_mime_database[0] != 1: + print "Warning. You have no update-mime-database command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 + have_gtk_update_icon_cache = conf.TryAction (Action ('gtk-update-icon-cache -?')) + if have_gtk_update_icon_cache[0] != 1: + print "Warning. You have no gtk-update-icon-cache command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 + have_update_desktop_database = conf.TryAction (Action ('update-desktop-database -?')) + if have_update_desktop_database[0] != 1: + print "Warning. You have no update-desktop-database command in your PATH. FREEDESKTOP is now disabled." + env['FREEDESKTOP'] = 0 +env = conf.Finish() + # # Audio/MIDI library (needed for MIDI, since audio is all handled via JACK) # @@ -1001,16 +1070,17 @@ if env['SYSLIBS']: # 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['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') + # Comment the previous line and uncomment this for old versions of Debian: + #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', CPPPATH='#libs/appleutility') coredirs = [ - 'templates' + 'templates', + 'manual' ] subdirs = [ @@ -1075,7 +1145,8 @@ else: CPPPATH='#libs/appleutility') coredirs = [ - 'templates' + 'templates', + 'manual' ] subdirs = [ @@ -1254,7 +1325,8 @@ 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')]) + Delete ('$PREFIX/bin/ardour2'), + Delete ('$PREFIX/share/ardour2')]) env.Alias('revision', the_revision) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc')) @@ -1267,7 +1339,7 @@ Default (sysrcbuild) Precious (env['DISTTREE']) env.Distribute (env['DISTTREE'], - [ 'SConstruct', 'svn_revision.h', + [ 'SConstruct', 'COPYING', 'PACKAGER_README', 'README', 'ardour.rc.in', 'tools/config.guess', @@ -1300,6 +1372,12 @@ env.Alias ('srctar', srcdist) env.AddPreAction (env['DISTTREE'], Action ('rm -rf ' + str (File (env['DISTTREE'])))) env.AddPostAction (srcdist, Action ('rm -rf ' + str (File (env['DISTTREE'])))) +# +# Update revision info before going into subdirs +# + +create_stored_revision() + # # the subdirs #