X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=615cd9014dde7f70760b920cc37899e3a94bed51;hb=54d9f2f2d83af1f0f44579fe2ebf090e68259938;hp=9f2c40e82a583c4d5e45bc893556a900d1b1a88d;hpb=636f2184a57ad9d8fa63d1130093a30fbbd6aa66;p=ardour.git diff --git a/SConstruct b/SConstruct index 9f2c40e82a..615cd9014d 100644 --- a/SConstruct +++ b/SConstruct @@ -5,6 +5,7 @@ # import os +import os.path import sys import re import shutil @@ -31,11 +32,10 @@ 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'), + ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4> 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) + elif os.path.exists('.git'): + rev = fetch_git_revision ('.'); + elif os.path.exists('libs/ardour/svn_revision.cc'): + print "Using packaged svn revision" + return 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) + + try: + 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 libs/ardour/svn_revision.cc for writing\n" + sys.exit (-1) # # A generic builder for version.cc files @@ -391,28 +417,6 @@ 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']: - 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: - 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 #################### @@ -420,9 +424,11 @@ else: def pushEnvironment(context): if os.environ.has_key('PATH'): context.Append(PATH = os.environ['PATH']) + context['ENV']['PATH'] = os.environ['PATH'] if os.environ.has_key('PKG_CONFIG_PATH'): context.Append(PKG_CONFIG_PATH = os.environ['PKG_CONFIG_PATH']) + context['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH'] if os.environ.has_key('CC'): context['CC'] = os.environ['CC'] @@ -444,13 +450,17 @@ deps = \ { 'glib-2.0' : '2.10.1', 'gthread-2.0' : '2.10.1', - 'gtk+-2.0' : '2.8.1', + 'gtk+-2.0' : '2.12.1', 'libxml-2.0' : '2.6.0', 'samplerate' : '0.1.0', 'raptor' : '1.4.2', 'lrdf' : '0.4.0', 'jack' : '0.109.0', - 'libgnomecanvas-2.0' : '2.0' + 'libgnomecanvas-2.0' : '2.0', + 'aubio' : '0.3.2', + 'ogg' : '1.1.2', + 'flac' : '1.2.1', + 'sndfile' : '1.0.18' } def DependenciesRequiredMessage(): @@ -501,8 +511,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') @@ -523,19 +533,25 @@ 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']: - # - # Check for fftw3 header as well as the library - # +# +# Check for fftw3 header as well as the library +# - conf = Configure(libraries['fftw3']) +conf = Configure(libraries['fftw3']) - if conf.CheckHeader ('fftw3.h') == False: - print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed') - sys.exit (1) - conf.Finish() +if conf.CheckHeader ('fftw3.h') == False: + print ('Ardour cannot be compiled without the FFTW3 headers, which do not seem to be installed') + sys.exit (1) +conf.Finish() if env['FREESOUND']: # @@ -556,22 +572,22 @@ 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'): + if conf.CheckPKGVersion('slv2', '0.6.4'): 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.4 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.4 (svn))' env['LV2'] = 0 conf.Finish() else: print 'LV2 support is not enabled. Build with \'scons LV2=1\' to enable.' +if not env['WIIMOTE']: + print 'WIIMOTE not enabled. Build with \'scons WIIMOTE=1\' to enable support.' + libraries['jack'] = LibraryInfo() libraries['jack'].ParseConfig('pkg-config --cflags --libs jack') @@ -581,6 +597,9 @@ libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0') libraries['xslt'] = LibraryInfo() libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt') +libraries['uuid'] = LibraryInfo() +libraries['uuid'].ParseConfig('pkg-config --cflags --libs uuid') + libraries['glib2'] = LibraryInfo() libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0') @@ -611,9 +630,11 @@ libraries['ardour_cp'] = LibraryInfo (LIBS='ardour_cp', LIBPATH='#libs/surfaces/ # 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['pbd'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd') +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['smf'] = LibraryInfo (LIBS='smf', LIBPATH='#libs/evoral/src/libsmf', CPPPATH='#libs/evoral/src/libsmf/') +libraries['evoral'] = LibraryInfo (LIBS='evoral', LIBPATH='#libs/evoral', CPPPATH='#libs/evoral') +libraries['pbd'] = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd') libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext') @@ -637,9 +658,9 @@ env = conf.Finish() opt_flags = [] if env['GPROFILE'] == 1: - debug_flags = [ '-g', '-pg' ] + debug_flags = [ '-O0', '-g', '-pg' ] else: - debug_flags = [ '-g' ] + debug_flags = [ '-O0', '-g' ] # guess at the platform, used to define compiler flags @@ -699,8 +720,14 @@ 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") + # + # ARCH_X86 means anything in the x86 family from i386 to x86_64 + # USE_X86_64_ASM is used to distingush 32 and 64 bit assembler + # + + if (re.search ("(i[0-9]86|x86_64)", config[config_cpu]) != None): + debug_flags.append ("-DARCH_X86") + opt_flags.append ("-DARCH_X86") if config[config_kernel] == 'linux' : @@ -758,6 +785,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 @@ -813,10 +847,6 @@ if env['EXTRA_WARN']: env.Append(CXXFLAGS="-ansi") # env.Append(CFLAGS="-iso") -if env['LIBLO']: - env.Append(CCFLAGS="-DHAVE_LIBLO") - - # # fix scons nitpickiness on APPLE # @@ -825,16 +855,17 @@ if env['LIBLO']: def prep_libcheck(topenv, libinfo): if topenv['IS_OSX']: # - # rationale: GTK-Quartz uses jhbuild and installs to /opt/gtk by default. - # All libraries needed should be built against this location + # rationale: GTK-Quartz uses jhbuild and installs to ~/gtk/inst 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") + GTKROOT = os.path.expanduser ('~/gtk/inst') + libinfo.Append(CPPPATH= GTKROOT + "/include", LIBPATH= GTKROOT + "/lib") + libinfo.Append(CXXFLAGS="-I" + GTKROOT + "/include", LINKFLAGS="-L" + GTKROOT + "/lib") -prep_libcheck(env, env) + +prep_libcheck(env, env) # # these are part of the Ardour source tree because they are C++ @@ -849,25 +880,25 @@ libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk', 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() +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 @@ -889,6 +920,20 @@ else: libraries['usb'] = conf.Finish () +# +# Check for wiimote dependencies + +if env['WIIMOTE']: + wiimoteConf = env.Configure ( ) + if not wiimoteConf.CheckHeader('cwiid.h'): + print 'WIIMOTE configured but you are missing libcwiid!' + sys.exit(1) + if not wiimoteConf.CheckHeader('bluetooth/bluetooth.h'): + print 'WIIMOTE configured but you are missing the libbluetooth headers which you need to compile wiimote support!' + sys.exit(1) + wiimoteConf.Finish() + + # # Check for FLAC @@ -921,7 +966,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 () @@ -929,16 +974,17 @@ libraries['boost'] = conf.Finish () # # Check for liblo -if env['LIBLO']: - libraries['lo'] = LibraryInfo () - prep_libcheck(env, libraries['lo']) +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 () +conf = Configure (libraries['lo']) +if conf.CheckLib ('lo', 'lo_server_new') == False: + print "liblo does not appear to be installed." + env['HAVE_LIBLO'] = False +else: + env['HAVE_LIBLO'] = True + +libraries['lo'] = conf.Finish () # # Check for dmalloc @@ -988,16 +1034,18 @@ conf = Configure(env) libraries['asound'] = LibraryInfo () if conf.CheckCHeader('alsa/asoundlib.h'): - libraries['asound'] = LibraryInfo (LIBS='asound') + libraries['asound'].ParseConfig('pkg-config --cflags --libs alsa') if conf.CheckCHeader('jack/midiport.h'): libraries['sysmidi'] = LibraryInfo (LIBS='jack') env['SYSMIDI'] = 'JACK MIDI' subst_dict['%MIDITAG%'] = "control" subst_dict['%MIDITYPE%'] = "jack" + env.Append(CCFLAGS=" -DWITH_JACK_MIDI") print "Using JACK MIDI" elif conf.CheckCHeader('alsa/asoundlib.h'): - libraries['sysmidi'] = LibraryInfo (LIBS='asound') + libraries['sysmidi'] = LibraryInfo () + libraries['sysmidi'].ParseConfig('pkg-config --cflags --libs alsa') env['SYSMIDI'] = 'ALSA Sequencer' subst_dict['%MIDITAG%'] = "seq" subst_dict['%MIDITYPE%'] = "alsa/sequencer" @@ -1020,6 +1068,11 @@ else: env = conf.Finish() +if env['GTKOSX']: + clearlooks_version = 'libs/clearlooks-newer' +else: + clearlooks_version = 'libs/clearlooks-older' + if env['SYSLIBS']: syslibdeps = \ @@ -1058,36 +1111,35 @@ if env['SYSLIBS']: 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['taglib'] = LibraryInfo() + libraries['taglib'].ParseConfig ('pkg-config --cflags --libs taglib') # 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['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0') + # Comment the previous line and uncomment this for some versions of Debian: + #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', LIBPATH='#libs/appleutility', CPPPATH='#libs/appleutility') + libraries['sndfile'] = LibraryInfo() + libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile') + coredirs = [ - 'templates' + 'templates', + 'manual' ] subdirs = [ - 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', + 'libs/evoral/src/libsmf', + 'libs/evoral', 'libs/ardour', 'libs/vamp-sdk', 'libs/vamp-plugins/', @@ -1106,7 +1158,7 @@ if env['SYSLIBS']: # 'libs/flowcanvas', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks' + clearlooks_version ] else: @@ -1125,6 +1177,9 @@ else: libraries['pangomm'] = LibraryInfo(LIBS='pangomm', LIBPATH='#libs/gtkmm2/pango', CPPPATH='#libs/gtkmm2/pango') + libraries['cairomm'] = LibraryInfo(LIBS='cairomm', + LIBPATH='#libs/cairomm', + CPPPATH='#libs/cairomm') libraries['atkmm'] = LibraryInfo(LIBS='atkmm', LIBPATH='#libs/gtkmm2/atk', CPPPATH='#libs/gtkmm2/atk') @@ -1144,9 +1199,9 @@ else: 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['taglib'] = LibraryInfo(LIBS='libtaglib', + LIBPATH='#libs/taglib', + CPPPATH=['#libs/taglib', '#libs/taglib/taglib']) # libraries['libglademm'] = LibraryInfo(LIBS='libglademm', # LIBPATH='#libs/libglademm', # CPPPATH='#libs/libglademm') @@ -1155,14 +1210,17 @@ else: CPPPATH='#libs/appleutility') coredirs = [ - 'templates' + 'templates', + 'manual' ] subdirs = [ 'libs/sigc++2', - 'libs/libsndfile', + 'libs/taglib', 'libs/pbd', 'libs/midi++2', + 'libs/evoral/src/libsmf', + 'libs/evoral', 'libs/ardour', 'libs/vamp-sdk', 'libs/vamp-plugins/', @@ -1186,22 +1244,24 @@ else: 'libs/libgnomecanvasmm', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks', - 'libs/cairomm' + 'libs/cairomm', + clearlooks_version ] # # * 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 +# * ditto for generic MIDI and OSC +# * tranzport & wiimote check whether they should build internally, but we need them here +# so that they are included in the tarball # surface_subdirs = [ 'libs/surfaces/control_protocol', 'libs/surfaces/generic_midi', 'libs/surfaces/tranzport', 'libs/surfaces/mackie', - 'libs/surfaces/powermate' + 'libs/surfaces/powermate', + 'libs/surfaces/wiimote', + 'libs/surfaces/osc' ] if env['SURFACES']: @@ -1228,8 +1288,8 @@ else: # timefx_subdirs = ['libs/soundtouch'] -#if env['RUBBERBAND']: -# timefx_subdirs += ['libs/rubberband'] +if env['RUBBERBAND']: + timefx_subdirs += ['libs/rubberband'] opts.Save('scache.conf', env) Help(opts.GenerateHelpText(env)) @@ -1294,7 +1354,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 use_flac') +Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n ardour_version subst_dict') # # the configuration file may be system dependent @@ -1317,6 +1377,21 @@ if not conf.CheckFunc('posix_memalign'): env = conf.Finish() +# Which GTK tooltips API + +gtktestenv = env.Clone () +gtktestenv.Merge ([ + libraries['gtk2'] + ]) + +conf = gtktestenv.Configure () + +if conf.CheckFunc('gtk_widget_set_tooltip_text'): + env.Append (CXXFLAGS='-DGTK_NEW_TOOLTIP_API') + +conf.Finish () + + # 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) @@ -1349,7 +1424,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', @@ -1364,12 +1439,10 @@ env.Distribute (env['DISTTREE'], 'icons/icon/ardour_icon_tango_48px_blue.png', 'icons/icon/ardour_icon_tango_48px_red.png' ] + - glob.glob ('DOCUMENTATION/AUTHORS*') + - glob.glob ('DOCUMENTATION/CONTRIBUTORS*') + - glob.glob ('DOCUMENTATION/TRANSLATORS*') + - glob.glob ('DOCUMENTATION/BUILD*') + - glob.glob ('DOCUMENTATION/FAQ*') + - glob.glob ('DOCUMENTATION/README*') + glob.glob ('ardour.1*') + + glob.glob ('libs/clearlooks-newer/*.c') + + glob.glob ('libs/clearlooks-newer/*.h') + + glob.glob ('libs/clearlooks-newer/SConscript') ) srcdist = env.Tarball(env['TARBALL'], [ env['DISTTREE'], the_revision ]) @@ -1382,6 +1455,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 #