X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=SConstruct;h=a26d583dbabf438b26d3ce47125ca87f9a59abf8;hb=7a9a032301856743abf343ac091f7a989572fd6e;hp=3f901297b6678e8d3d93f566d3f54745091f2a2c;hpb=388b5556787bb3802caf2a3f67f547e80d16dd14;p=ardour.git diff --git a/SConstruct b/SConstruct index 3f901297b6..a26d583dba 100644 --- a/SConstruct +++ b/SConstruct @@ -21,7 +21,7 @@ import SCons.Node.FS SConsignFile() EnsureSConsVersion(0, 96) -ardour_version = '2.5' +ardour_version = '2.7.1' 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,28 +394,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 #################### @@ -422,9 +401,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'] @@ -453,7 +434,6 @@ deps = \ 'lrdf' : '0.4.0', 'jack' : '0.109.0', 'libgnomecanvas-2.0' : '2.0', - 'aubio' : '0.3.2' } def DependenciesRequiredMessage(): @@ -566,22 +546,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') @@ -706,8 +686,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 +717,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,7 +736,7 @@ 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: @@ -765,6 +759,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 @@ -832,15 +833,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) @@ -897,6 +896,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 @@ -1015,6 +1028,11 @@ else: env = conf.Finish() +if env['GTKOSX']: + clearlooks_version = 'libs/clearlooks-newer' +else: + clearlooks_version = 'libs/clearlooks-older' + if env['SYSLIBS']: syslibdeps = \ @@ -1065,9 +1083,9 @@ 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', @@ -1100,7 +1118,7 @@ if env['SYSLIBS']: # 'libs/flowcanvas', 'libs/gtkmm2ext', 'gtk2_ardour', - 'libs/clearlooks' + clearlooks_version ] else: @@ -1113,6 +1131,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') @@ -1172,21 +1193,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']: @@ -1302,6 +1324,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) @@ -1334,7 +1371,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', @@ -1349,12 +1386,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 ]) @@ -1367,6 +1402,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 #