X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=c60aece0be1b225c6797ef7370ff19babc081259;hb=8811175c992d8a2f23fe5dd9dbb3a3335e4f985c;hp=169742e7a86effe34a01d5027b36c1e7f96e07a1;hpb=e5462924682818a332f67604c447228b1bf88d43;p=ardour.git diff --git a/SConstruct b/SConstruct index 169742e7a8..c60aece0be 100644 --- a/SConstruct +++ b/SConstruct @@ -21,7 +21,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.5' +ardour_version = '2.8.3' subst_dict = { } @@ -32,7 +32,7 @@ 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') + 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 @@ -393,38 +396,16 @@ 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 #################### 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'] @@ -453,7 +434,7 @@ deps = \ 'lrdf' : '0.4.0', 'jack' : '0.109.0', 'libgnomecanvas-2.0' : '2.0', - 'aubio' : '0.3.2' + 'sndfile' : '1.0.18' } def DependenciesRequiredMessage(): @@ -504,18 +485,6 @@ libraries = { } libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') -#libraries['sndfile'] = LibraryInfo() -#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile') - -libraries['lrdf'] = LibraryInfo() -libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') - -libraries['raptor'] = LibraryInfo() -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'): @@ -566,22 +535,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 >= 0.6.0\"'): + if conf.CheckPKGVersion('slv2', '0.6.1'): 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.0)' 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') @@ -591,6 +560,18 @@ libraries['xml'].ParseConfig('pkg-config --cflags --libs libxml-2.0') libraries['xslt'] = LibraryInfo() libraries['xslt'].ParseConfig('pkg-config --cflags --libs libxslt') +libraries['lrdf'] = LibraryInfo() +libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') + +libraries['raptor'] = LibraryInfo() +libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') + +libraries['sndfile'] = LibraryInfo() +libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile') + +libraries['samplerate'] = LibraryInfo() +libraries['samplerate'].ParseConfig('pkg-config --cflags --libs samplerate') + libraries['glib2'] = LibraryInfo() libraries['glib2'].ParseConfig ('pkg-config --cflags --libs glib-2.0') libraries['glib2'].ParseConfig ('pkg-config --cflags --libs gobject-2.0') @@ -683,6 +664,12 @@ if env['DIST_TARGET'] == 'auto': print "detected DIST_TARGET = " + env['DIST_TARGET'] print "*******************************\n" +if env['DIST_TARGET'] != 'tiger' and env['DIST_TARGET'] != 'leopard': + # make sure this is all disabled for non-OS X builds + env['GTKOSX'] = 0 + env['COREAUDIO'] = 0 + env['AUDIOUNITS'] = 0 + env['AUSTATE'] = 0 if config[config_cpu] == 'powerpc' and env['DIST_TARGET'] != 'none': # @@ -706,8 +693,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' : @@ -731,6 +724,14 @@ elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_6 if ((env['DIST_TARGET'] == 'i686') or (env['DIST_TARGET'] == 'x86_64')) and build_host_supports_sse: opt_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"]) + + if (env['VST']): + # + # everything must be 32 bit for VST (we're not replicating Cakewalk's hack, yet ...) + # + opt_flags.extend(["-m32"]) + debug_flags.extend(["-m32"]) + # end of processor-specific section # optimization section @@ -742,19 +743,33 @@ if env['FPU_OPTIMIZATION']: elif env['DIST_TARGET'] == 'i686' or env['DIST_TARGET'] == 'x86_64': opt_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") debug_flags.append ("-DBUILD_SSE_OPTIMIZATIONS") - if env['DIST_TARGET'] == 'x86_64': + if env['DIST_TARGET'] == 'x86_64' and not env['VST']: opt_flags.append ("-DUSE_X86_64_ASM") debug_flags.append ("-DUSE_X86_64_ASM") if build_host_supports_sse != 1: - 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)" + print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be anerror, 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' +if env['DIST_LIBDIR'] == '': + if env['DIST_TARGET'] == 'x86_64': + env['LIBDIR']='lib64' + else: + env['LIBDIR']='lib' else: - env['LIBDIR']='lib' + env['LIBDIR'] = env['DIST_LIBDIR'] + +# +# no VST on x86_64 +# + +if env['DIST_TARGET'] == 'x86_64' and env['VST']: + print "\n\n==================================================" + print "You cannot use VST plugins with a 64 bit host. Please run scons with VST=0" + print "\nIt is theoretically possible to build a 32 bit host on a 64 bit system." + print "However, this is tricky and not recommended for beginners." + sys.exit (-1) # # a single way to test if we're on OS X @@ -839,15 +854,13 @@ 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']: - gtkroot = os.path.expanduser ("~"); - 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") - + 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) @@ -905,29 +918,23 @@ else: libraries['usb'] = conf.Finish () # -# Check for FLAC - -libraries['flac'] = LibraryInfo () -prep_libcheck(env, libraries['flac']) -libraries['flac'].Append(CPPPATH="/usr/local/include", LIBPATH="/usr/local/lib") +# Check for wiimote dependencies -# -# 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 -# +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() -conf = Configure (libraries['flac']) -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... -#libraries['flac'] = LibraryInfo (LIBS='FLAC') +# +# need a way to see if the installed version of libsndfile supports +# FLAC .... +# # boost (we don't link against boost, just use some header files) @@ -1022,6 +1029,11 @@ else: env = conf.Finish() +if env['GTKOSX']: + clearlooks_version = 'libs/clearlooks-newer' +else: + clearlooks_version = 'libs/clearlooks-older' + if env['SYSLIBS']: syslibdeps = \ @@ -1059,22 +1071,14 @@ if env['SYSLIBS']: 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['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', @@ -1086,7 +1090,6 @@ if env['SYSLIBS']: ] subdirs = [ - 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', 'libs/ardour', @@ -1107,7 +1110,7 @@ if env['SYSLIBS']: # 'libs/flowcanvas', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks' + clearlooks_version ] else: @@ -1120,6 +1123,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') @@ -1136,9 +1142,6 @@ 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['libglademm'] = LibraryInfo(LIBS='libglademm', # LIBPATH='#libs/libglademm', # CPPPATH='#libs/libglademm') @@ -1153,7 +1156,6 @@ else: subdirs = [ 'libs/sigc++2', - 'libs/libsndfile', 'libs/pbd', 'libs/midi++2', 'libs/ardour', @@ -1179,21 +1181,22 @@ else: 'libs/libgnomecanvasmm', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks' + 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 +# * 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' ] if env['SURFACES']: @@ -1286,7 +1289,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 @@ -1309,6 +1312,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) @@ -1341,7 +1359,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', @@ -1356,12 +1374,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 ]) @@ -1374,6 +1390,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 #