massive changes to waf build scripts so that nearly everything "should" be working now except for i18n (OSC is not quite right) ; some preliminary work on post-main-out handling, incomplete; a couple of fixes from -Wall and valgrind

git-svn-id: svn://localhost/ardour2/branches/3.0@5371 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 254 insertions, 7 deletions

diff --git a/wscript b/wscript
index 3ef5f0df2c..210573b7aa 100644
--- a/wscript
+++ b/wscript
@@ -3,6 +3,8 @@ import autowaf
 import Options
 import os
 import commands
+import re
+import string
 
 # Variables for 'waf dist'
 VERSION = '3.0pre0'
@@ -71,11 +73,232 @@ def create_stored_revision():
 		sys.exit(-1)
 
 
+def set_compiler_flags (conf,opt):
+	#
+	# Compiler flags and other system-dependent stuff
+	#
+
+	build_host_supports_sse = 0
+	optimization_flags = []
+	if opt.gprofile:
+		debug_flags = [ '-pg' ]
+	else:
+		debug_flags = [ ] # waf adds -O0 -g itself. thanks waf!
+
+	# guess at the platform, used to define compiler flags
+
+	config_guess = os.popen("tools/config.guess").read()[:-1]
+
+	config_cpu = 0
+	config_arch = 1
+	config_kernel = 2
+	config_os = 3
+	config = config_guess.split ("-")
+
+	print "system triple: " + config_guess
+
+	# Autodetect
+	if opt.dist_target == 'auto':
+		if config[config_arch] == 'apple':
+			# The [.] matches to the dot after the major version, "." would match any character
+			if re.search ("darwin[0-7][.]", config[config_kernel]) != None:
+				conf.define ('build_target', 'panther')
+			if re.search ("darwin8[.]", config[config_kernel]) != None:
+				conf.define ('build_target', 'tiger')
+			else:
+				conf.define ('build_target', 'leopard')
+		else:
+			if re.search ("x86_64", config[config_cpu]) != None:
+				conf.define ('build_target', 'x86_64')
+			elif re.search("i[0-5]86", config[config_cpu]) != None:
+				conf.define ('build_target', 'i386')
+			elif re.search("powerpc", config[config_cpu]) != None:
+				conf.define ('build_target', 'powerpc')
+			else:
+				conf.define ('build_target', 'i686')
+		print "\n*******************************"
+		print "detected DIST_TARGET = " + conf.env['build_target']
+		print "*******************************\n"
+	else:
+		conf.define ('build_target', opt.dist_target)
+
+	if config[config_cpu] == 'powerpc' and conf.env['build_target'] != 'none':
+		#
+		# Apple/PowerPC optimization options
+		#
+		# -mcpu=7450 does not reliably work with gcc 3.*
+		#
+		if opt.dist_target == 'panther' or opt.dist_target == 'tiger':
+			if config[config_arch] == 'apple':
+				# optimization_flags.extend ([ "-mcpu=7450", "-faltivec"])
+				# to support g3s but still have some optimization for above
+				optimization_flags.extend ([ "-mcpu=G3", "-mtune=7450"])
+			else:
+				optimization_flags.extend ([ "-mcpu=7400", "-maltivec", "-mabi=altivec"])
+		else:
+			optimization_flags.extend([ "-mcpu=750", "-mmultiple" ])
+		optimization_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"])
+		optimization_flags.extend (["-Os"])
+
+	elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and conf.env['build_target'] != 'none':
+    
+    
+		#
+		# 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")
+			optimization_flags.append ("-DARCH_X86")
+    
+		if config[config_kernel] == 'linux' :
+
+			#
+			# determine processor flags via /proc/cpuinfo
+			#
+        
+			if conf.env['build_target'] != 'i386':
+            
+				flag_line = os.popen ("cat /proc/cpuinfo | grep '^flags'").read()[:-1]
+				x86_flags = flag_line.split (": ")[1:][0].split ()
+            
+				if "mmx" in x86_flags:
+					optimization_flags.append ("-mmmx")
+				if "sse" in x86_flags:
+					build_host_supports_sse = 1
+				if "3dnow" in x86_flags:
+					optimization_flags.append ("-m3dnow")
+            
+		if config[config_cpu] == "i586":
+			optimization_flags.append ("-march=i586")
+		elif config[config_cpu] == "i686":
+			optimization_flags.append ("-march=i686")
+    
+		if ((conf.env['build_target'] == 'i686') or (conf.env['build_target'] == 'x86_64')) and build_host_supports_sse:
+			optimization_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
+			debug_flags.extend (["-msse", "-mfpmath=sse", "-DUSE_XMMINTRIN"])
+
+	# end of processor-specific section
+
+	# optimization section
+	if conf.env['FPU_OPTIMIZATION']:
+		if conf.env['build_target'] == 'tiger' or conf.env['build_target'] == 'leopard':
+			optimization_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
+			debug_flags.append ("-DBUILD_VECLIB_OPTIMIZATIONS");
+			libraries['core'].Append(LINKFLAGS= '-framework Accelerate')
+		elif conf.env['build_target'] == 'i686' or conf.env['build_target'] == 'x86_64':
+			optimization_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+			debug_flags.append ("-DBUILD_SSE_OPTIMIZATIONS")
+		if conf.env['build_target'] == 'x86_64':
+			optimization_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)"
+
+	# end optimization section
+			
+	#
+	# no VST on x86_64
+	#
+	    
+	if conf.env['build_target'] == 'x86_64' and opt.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
+	#
+
+	if conf.env['build_target'] in ['panther', 'tiger', 'leopard' ]:
+		conf.define ('IS_OSX', 1)
+		# force tiger or later, to avoid issues on PPC which defaults
+		# back to 10.1 if we don't tell it otherwise.
+		conf.env.append_value (CCFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
+
+		if conf.env['build_target'] == 'leopard':
+			# need this to force build against the 10.4 SDK when building on later versions of OS X
+			# ideally this would be configurable, but lets just do that later when we need it
+			conf.env.append_value(CCFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+			conf.env.append_value(LINKFLAGS="-mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk")
+
+	else:
+		conf.define ('IS_OSX', 0)
+
+	#
+	# save off guessed arch element in an env
+	#
+	conf.define ('CONFIG_ARCH', config[config_arch])
+
+	#
+	# ARCH="..." overrides all
+	#
+
+	if opt.arch != None:
+		optimization_flags = opt.arch.split()
+		
+	#
+	# prepend boiler plate optimization flags that work on all architectures
+	#
+
+	optimization_flags[:0] = [
+		"-O3",
+		"-fomit-frame-pointer",
+		"-ffast-math",
+		"-fstrength-reduce",
+		"-pipe"
+		]
+
+	if opt.debug:
+		conf.env.append_value('CCFLAGS', debug_flags)
+		conf.env.append_value('CXXFLAGS', debug_flags)
+		conf.env.append_value('LINKFLAGS', debug_flags)
+	else:
+		conf.env.append_value('CCFLAGS', optimization_flags)
+		conf.env.append_value('LINKFLAGS', optimization_flags)
+
+	if opt.stl_debug:
+		conf.env.append_value('CXXFLAGS', "-D_GLIBCXX_DEBUG")
+
+	if opt.universal:
+		conf.env.append_value('CCFLAGS', "-arch i386 -arch ppc")
+		conf.env.append_value('CXXFLAGS', "-arch i386 -arch ppc")
+		conf.env.append_value('LINKFLAGS', "-arch i386 -arch ppc")
+
+	#
+	# warnings flags
+	#
+
+	conf.env.append_value('CCFLAGS', "-Wall")
+	conf.env.append_value('CXXFLAGS', [ '-Wall', '-Woverloaded-virtual'])
+
+	if opt.extra_warn:
+		conf.env.append_value('CCFLAGS', [ '-Wextra', '-pedantic', '-ansi' ])
+		conf.env.append_value('CXXFLAGS', [ '-Wextra', '-pedantic', '-ansi' ])
+		#conf.env.append_value('CFLAGS', "-iso")
+
+
+	#
+	# more boilerplate
+	#
+
+	conf.env.append_value('CCFLAGS', [ '-D_LARGEFILE64_SOURCE', '-D_LARGEFILE_SOURCE' ])
+	conf.env.append_value('CXXFLAGS', [ '-D_LARGEFILE_SOURCE', '-D_LARGEFILE_SOURCE' ])
+	if opt.nls:
+		conf.env.append_value('CXXFLAGS', '-DENABLE_NLS')
+		conf.env.append_value('CCFLAGS', '-DENABLE_NLS')
+
+
+#----------------------------------------------------------------
+
 # Waf stages
 
 def set_options(opt):
 	autowaf.set_options(opt)
-	opt.add_option('--arch', type='string', dest='arch',
+	opt.add_option('--arch', type='string', action='store', dest='arch',
 			help='Architecture-specific compiler flags')
 	opt.add_option('--aubio', action='store_true', default=True, dest='aubio',
 			help="Use Paul Brossier's aubio library for feature detection (if available)")
@@ -83,23 +306,29 @@ def set_options(opt):
 			help='Compile with Apple\'s AudioUnit library (experimental)')
 	opt.add_option('--coreaudio', action='store_true', default=False, dest='coreaudio',
 			help='Compile with Apple\'s CoreAudio library')
+	opt.add_option('--dist-target', type='string', default='auto', dest='dist_target',
+			help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard]')
+	opt.add_option('--extra-warn', action='store_true', default=False, dest='extra_warn',
+			help='Build with even more compiler warning flags')
 	opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization',
 			help='Build runtime checked assembler code')
 	opt.add_option('--freedesktop', action='store_true', default=False, dest='freedesktop',
 			help='Install MIME type, icons and .desktop file as per freedesktop.org standards')
 	opt.add_option('--freesound', action='store_true', default=False, dest='freesound',
 			help='Include Freesound database lookup')
+	opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile',
+			help='Compile for use with gprofile')
 	opt.add_option('--gtkosx', action='store_true', default=False, dest='gtkosx',
 			help='Compile for use with GTK-OSX, not GTK-X11')
 	opt.add_option('--lv2', action='store_true', default=False, dest='lv2',
 			help='Compile with support for LV2 (if slv2 is available)')
 	opt.add_option('--nls', action='store_true', default=True, dest='nls',
 			help='Enable i18n (native language support)')
-	opt.add_option('--surfaces', action='store_true', default=False, dest='surfaces',
-			help='Build support for control surfaces')
+	opt.add_option('--stl-debug', action='store_true', default=False, dest='stl_debug',
+			help='Build with debugging for the STL')
 	opt.add_option('--syslibs', action='store_true', default=True, dest='syslibs',
 			help='Use existing system versions of various libraries instead of internal ones')
-	opt.add_option('--tranzport', action='store_true', default=True, dest='tranzport',
+	opt.add_option('--tranzport', action='store_true', default=False, dest='tranzport',
 			help='Compile with support for Frontier Designs Tranzport (if libusb is available)')
 	opt.add_option('--universal', action='store_true', default=False, dest='universal',
 			help='Compile as universal binary (requires that external libraries are universal)')
@@ -129,6 +358,8 @@ def configure(conf):
 
 	# Fix utterly braindead FLAC include path to not smash assert.h
 	conf.env['CPPPATH_FLAC'] = []
+
+	set_compiler_flags (conf, Options.options)
 	
 	# Tell everyone that this is a waf build
 
@@ -138,27 +369,43 @@ def configure(conf):
 	autowaf.print_summary(conf)
 	opts = Options.options
 	autowaf.display_header('Ardour Configuration')
+	autowaf.display_msg(conf, 'Build Target', conf.env['build_target'])
 	autowaf.display_msg(conf, 'Architecture flags', opts.arch)
 	autowaf.display_msg(conf, 'Aubio', bool(conf.env['HAVE_AUBIO']))
 	autowaf.display_msg(conf, 'AudioUnits', opts.audiounits)
-	autowaf.display_msg(conf, 'CoreAudio', opts.coreaudio)
+	if opts.audiounits:
+		conf.define('AUDIOUNITS',1)
 	autowaf.display_msg(conf, 'FPU Optimization', opts.fpu_optimization)
+	if opts.fpu_optimization:
+		conf.define('FPU_OPTIMIZATION', 1)
 	autowaf.display_msg(conf, 'Freedesktop Files', opts.freedesktop)
 	autowaf.display_msg(conf, 'Freesound', opts.freesound)
+	if opts.freesound:
+		conf.define('FREESOUND',1)
 	autowaf.display_msg(conf, 'GtkOSX', opts.gtkosx)
+	if opts.gtkosx:
+		conf.define ('GTKOSX', 1)
 	autowaf.display_msg(conf, 'LV2 Support', bool(conf.env['HAVE_SLV2']))
 	autowaf.display_msg(conf, 'Rubberband', bool(conf.env['HAVE_RUBBERBAND']))
 	autowaf.display_msg(conf, 'Samplerate', bool(conf.env['HAVE_SAMPLERATE']))
 	autowaf.display_msg(conf, 'Soundtouch', bool(conf.env['HAVE_SOUNDTOUCH']))
 	autowaf.display_msg(conf, 'Translation', opts.nls)
-	autowaf.display_msg(conf, 'Surfaces', opts.surfaces)
 	autowaf.display_msg(conf, 'System Libraries', opts.syslibs)
 	autowaf.display_msg(conf, 'Tranzport', opts.tranzport)
+	if opts.tranzport:
+		conf.define('TRANZPORT', 1)
 	autowaf.display_msg(conf, 'Universal Binary', opts.universal)
-	autowaf.display_msg(conf, 'Versioned Binary', opts.versioned)
 	autowaf.display_msg(conf, 'VST Support', opts.vst)
+	if opts.vst:
+		conf.define('VST_SUPPORT', 1)
 	autowaf.display_msg(conf, 'Wiimote Support', opts.wiimote)
+	if opts.wiimote:
+		conf.define('WIIMOTE',1)
 	autowaf.display_msg(conf, 'Windows Key', opts.windows_key)
+	if opts.windows_key:
+		conf.define('WINDOWS_KEY', opts.windows_key)
+	autowaf.display_msg(conf, 'C Compiler flags', conf.env['CCFLAGS'])
+	autowaf.display_msg(conf, 'C++ Compiler flags', conf.env['CXXFLAGS'])
 
 def build(bld):
 	autowaf.set_recursive()