Updates for waf 1.6.

Note: this revision breaks documentation installation.


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2719 a436a847-0d15-0410-975c-d299462d15a1

8 files changed, 82 insertions, 80 deletions

diff --git a/src/client/wscript b/src/client/wscript
index b1005c16..de135888 100644
--- a/src/client/wscript
+++ b/src/client/wscript
@@ -3,9 +3,9 @@ import autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/client', '*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/client', bld.path.ant_glob('*.hpp'))
 
-	obj = bld.new_task_gen('cxx', 'shlib')
+	obj = bld(features = 'cxx cxxshlib')
 	obj.source = '''
 		ClientStore.cpp
 		NodeModel.cpp
@@ -30,11 +30,11 @@ def build(bld):
 	if bld.env['HAVE_LIBLO'] == 1:
 		obj.source += ' OSCClientReceiver.cpp OSCEngineSender.cpp '
 
-	obj.includes     = ['.', '..', '../..', '../common']
-	obj.export_incdirs = ['.']
-	obj.name         = 'libingen_client'
-	obj.target       = 'ingen_client'
-	obj.install_path = '${LIBDIR}'
-	obj.uselib_local = 'libingen_shared'
+	obj.includes        = ['.', '..', '../..', '../common']
+	obj.export_includes = ['.']
+	obj.name            = 'libingen_client'
+	obj.target          = 'ingen_client'
+	obj.install_path    = '${LIBDIR}'
+	obj.use             = 'libingen_shared'
 	autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM SOUP XML2 SIGCPP LIBLO SOUP')
 
diff --git a/src/engine/wscript b/src/engine/wscript
index a37b69b3..70c1fe08 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -3,7 +3,7 @@ import autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/engine', '*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/engine', bld.path.ant_glob('*.hpp'))
 
 	core_source = '''
 		AudioBuffer.cpp
@@ -64,19 +64,19 @@ def build(bld):
 	if bld.env['HAVE_SLV2'] == 1:
 		core_source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
 
-	obj = bld.new_task_gen('cxx', 'shlib')
+	obj = bld(features = 'cxx cxxshlib')
 	obj.source = core_source
-	obj.export_incdirs = ['.']
-	obj.includes     = ['.', '..', '../..', '../common']
-	obj.name         = 'libingen_engine'
-	obj.target       = 'ingen_engine'
-	obj.install_path = '${LIBDIR}'
-	obj.uselib_local = 'libingen_shared'
+	obj.export_includes = ['.']
+	obj.includes        = ['.', '..', '../..', '../common']
+	obj.name            = 'libingen_engine'
+	obj.target          = 'ingen_engine'
+	obj.install_path    = '${LIBDIR}'
+	obj.use             = 'libingen_shared'
 	core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL REDLANDMM'
 	autowaf.use_lib(bld, obj, core_libs)
 
 	if bld.env['HAVE_SOUP'] == 1:
-		obj = bld.new_task_gen('cxx', 'shlib')
+		obj = bld(features = 'cxx cxxshlib')
 		obj.source = '''
 			EventSource.cpp
 			QueuedEngineInterface.cpp
@@ -91,7 +91,7 @@ def build(bld):
 		autowaf.use_lib(bld, obj, core_libs + ' SOUP')
 
 	if bld.env['HAVE_LIBLO'] == 1:
-		obj = bld.new_task_gen('cxx', 'shlib')
+		obj = bld(features = 'cxx cxxshlib')
 		obj.source = '''
 			EventSource.cpp
 			QueuedEngineInterface.cpp
@@ -99,32 +99,32 @@ def build(bld):
 			OSCEngineReceiver.cpp
 			ingen_osc.cpp
 		'''
-		obj.export_incdirs = ['.']
-		obj.includes     = ['.', '..', '../..', '../common', '../engine']
-		obj.name         = 'libingen_osc'
-		obj.target       = 'ingen_osc'
-		obj.install_path = '${LIBDIR}'
+		obj.export_includes = ['.']
+		obj.includes        = ['.', '..', '../..', '../common', '../engine']
+		obj.name            = 'libingen_osc'
+		obj.target          = 'ingen_osc'
+		obj.install_path    = '${LIBDIR}'
 		autowaf.use_lib(bld, obj, core_libs + ' LIBLO')
 
 	if bld.env['HAVE_JACK'] == 1:
-		obj = bld.new_task_gen('cxx', 'shlib')
+		obj = bld(features = 'cxx cxxshlib')
 		obj.source = 'JackDriver.cpp ingen_jack.cpp'
-		obj.export_incdirs = ['.']
-		obj.includes     = ['.', '..', '../..', '../common', '../engine']
-		obj.name         = 'libingen_jack'
-		obj.target       = 'ingen_jack'
-		obj.install_path = '${LIBDIR}'
-		obj.uselib_local = 'libingen_engine'
+		obj.export_includes = ['.']
+		obj.includes        = ['.', '..', '../..', '../common', '../engine']
+		obj.name            = 'libingen_jack'
+		obj.target          = 'ingen_jack'
+		obj.install_path    = '${LIBDIR}'
+		obj.use             = 'libingen_engine'
 		autowaf.use_lib(bld, obj, core_libs + ' JACK')
 
 	# Ingen LV2 wrapper
-	obj = bld.new_task_gen('cxx', 'shlib')
+	obj = bld(features = 'cxx cxxshlib')
 	obj.source = ' ingen_lv2.cpp '
-	obj.export_incdirs = ['.']
-	obj.includes     = ['.', '..', '../..', '../common']
-	obj.name         = 'libingen_lv2'
-	obj.target       = 'ingen_lv2'
-	obj.install_path = '${LIBDIR}'
-	obj.uselib_local = 'libingen_shared libingen_module'
-	obj.add_objects  = 'libingen_engine'
+	obj.export_includes = ['.']
+	obj.includes	    = ['.', '..', '../..', '../common']
+	obj.name	    = 'libingen_lv2'
+	obj.target	    = 'ingen_lv2'
+	obj.install_path    = '${LIBDIR}'
+	obj.use             = 'libingen_shared libingen_module'
+	obj.add_objects	    = 'libingen_engine'
 	autowaf.use_lib(bld, obj, core_libs)
diff --git a/src/gui/wscript b/src/gui/wscript
index fb9be2f8..9cccf0bc 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -3,9 +3,9 @@ import autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/gui', '*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/gui', bld.path.ant_glob('*.hpp')
 
-	obj = bld.new_task_gen('cxx', 'shlib')
+	obj = bld(features = 'cxx cxxshlib')
 	obj.source = '''
 		App.cpp
 		BreadCrumbs.cpp
@@ -44,12 +44,12 @@ def build(bld):
 	if bld.env['HAVE_CURL'] != 0:
 		obj.source += 'UploadPatchWindow.cpp'
 
-	obj.export_incdirs = ['.']
-	obj.includes       = ['.', '..', '../..', '../common', '../client', '../module']
-	obj.name           = 'libingen_gui'
-	obj.target         = 'ingen_gui'
-	obj.install_path   = '${LIBDIR}'
-	obj.uselib_local   = 'libingen_shared libingen_module libingen_client libingen_serialisation'
+	obj.export_includes = ['.']
+	obj.includes        = ['.', '..', '../..', '../common', '../client', '../module']
+	obj.name            = 'libingen_gui'
+	obj.target          = 'ingen_gui'
+	obj.install_path    = '${LIBDIR}'
+	obj.use             = 'libingen_shared libingen_module libingen_client libingen_serialisation'
 	autowaf.use_lib(bld, obj, '''
 		CURL
 		FLOWCANVAS
diff --git a/src/ingen/wscript b/src/ingen/wscript
index 839b789b..df7627ab 100644
--- a/src/ingen/wscript
+++ b/src/ingen/wscript
@@ -2,12 +2,12 @@
 import autowaf
 
 def build(bld):
-	obj = bld.new_task_gen(features='cxx cc cprogram')
+	obj = bld(features = 'c cxx cxxprogram')
 	obj.target       = 'ingen'
 	obj.source       = 'main.cpp'
 	obj.includes     = ['..', '../..', '../common']
 	obj.defines      = 'VERSION="' + bld.env['INGEN_VERSION'] + '"'
-	obj.uselib_local = 'libingen_module libingen_shared'
+	obj.use          = 'libingen_module libingen_shared'
 	obj.install_path = '${BINDIR}'
 	autowaf.use_lib(bld, obj, 'GTHREAD GLIBMM REDLANDMM RAUL LV2CORE SLV2 INGEN LIBLO SOUP')
 
diff --git a/src/module/wscript b/src/module/wscript
index 8553618f..85446284 100644
--- a/src/module/wscript
+++ b/src/module/wscript
@@ -3,19 +3,19 @@ import autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/module', '*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/module', bld.path.ant_glob('*.hpp'))
 
-	obj = bld.new_task_gen('cxx', 'shlib')
+	obj = bld(features = 'cxx cxxshlib')
 	obj.source = '''
 		World.cpp
 		ingen_module.cpp
 	'''
-	obj.export_incdirs = ['.']
-	obj.includes     = ['.', '..', '../..', '../common']
-	obj.name         = 'libingen_module'
-	obj.target       = 'ingen_module'
-	obj.vnum         = '0.0.0'
-	obj.uselib_local = 'libingen_shared'
-	obj.install_path = '${LIBDIR}'
+	obj.export_includes = ['.']
+	obj.includes	    = ['.', '..', '../..', '../common']
+	obj.name	    = 'libingen_module'
+	obj.target	    = 'ingen_module'
+	obj.vnum	    = '0.0.0'
+	obj.use             = 'libingen_shared'
+	obj.install_path    = '${LIBDIR}'
 	autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM')
 
diff --git a/src/serialisation/wscript b/src/serialisation/wscript
index 92f5ef3d..4d2fe690 100644
--- a/src/serialisation/wscript
+++ b/src/serialisation/wscript
@@ -3,19 +3,19 @@ import autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/serialisation', '*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/serialisation', bld.path.ant_glob('*.hpp'))
 
-	obj = bld.new_task_gen('cxx', 'shlib')
+	obj = bld(features = 'cxx cxxshlib')
 	obj.source = '''
 		Parser.cpp
 		Serialiser.cpp
 		serialisation.cpp
 	'''
-	obj.export_incdirs = ['.']
-	obj.includes     = ['.', '..', '../..', '../common']
-	obj.name         = 'libingen_serialisation'
-	obj.target       = 'ingen_serialisation'
-	obj.install_path = '${LIBDIR}'
-	obj.uselib_local = 'libingen_shared'
+	obj.export_includes = ['.']
+	obj.includes        = ['.', '..', '../..', '../common']
+	obj.name            = 'libingen_serialisation'
+	obj.target          = 'ingen_serialisation'
+	obj.install_path    = '${LIBDIR}'
+	obj.use             = 'libingen_shared'
 	autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM')
 
diff --git a/src/shared/wscript b/src/shared/wscript
index ebef1119..05de5854 100644
--- a/src/shared/wscript
+++ b/src/shared/wscript
@@ -3,9 +3,9 @@ import autowaf
 
 def build(bld):
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/shared', '*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/shared', bld.path.ant_glob('*.hpp'))
 
-	obj = bld.new_task_gen('cxx', 'shlib')
+	obj = bld(features = 'cxx cxxshlib')
 	obj.source = '''
 		Builder.cpp
 		ClashAvoider.cpp
@@ -22,11 +22,11 @@ def build(bld):
 	if bld.env['HAVE_SOUP'] == 1:
 		autowaf.use_lib(bld, obj, 'SOUP')
 		obj.source += ' HTTPSender.cpp '
-	obj.export_incdirs = ['.']
-	obj.includes     = ['.', '..', '../..', '../common']
-	obj.name         = 'libingen_shared'
-	obj.target       = 'ingen_shared'
-	obj.vnum         = '0.0.0'
-	obj.install_path = '${LIBDIR}'
+	obj.export_includes = ['.']
+	obj.includes        = ['.', '..', '../..', '../common']
+	obj.name            = 'libingen_shared'
+	obj.target          = 'ingen_shared'
+	obj.vnum            = '0.0.0'
+	obj.install_path    = '${LIBDIR}'
 	autowaf.use_lib(bld, obj, 'GLIBMM LV2CORE SLV2 RAUL REDLANDMM LIBLO')
 
diff --git a/wscript b/wscript
index 6de41108..bd9768cc 100644
--- a/wscript
+++ b/wscript
@@ -11,10 +11,10 @@ APPNAME = 'ingen'
 VERSION = INGEN_VERSION
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
-def set_options(opt):
+def options(opt):
 	autowaf.set_options(opt)
 	opt.add_option('--data-dir', type='string', dest='datadir',
 		       help="Ingen data install directory [Default: PREFIX/share/ingen]")
@@ -84,6 +84,7 @@ def configure(conf):
 	build_gui = conf.env['HAVE_GLADEMM'] == 1 and conf.env['HAVE_FLOWCANVAS'] == 1
 
 	conf.define('INGEN_VERSION', INGEN_VERSION)
+	conf.env['INGEN_VERSION'] = INGEN_VERSION
 	conf.define('BUILD_INGEN_GUI', int(build_gui))
 	conf.define('HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1))
 	if conf.env['BUNDLE']:
@@ -101,7 +102,7 @@ def configure(conf):
 	if Options.options.liblo_bundles:
 		conf.define('LIBLO_BUNDLES', 1)
 
-	conf.write_config_header('ingen-config.h')
+	conf.write_config_header('ingen-config.h', remove=False)
 
 	autowaf.display_msg(conf, "Jack", str(conf.env['HAVE_JACK'] == 1))
 	autowaf.display_msg(conf, "OSC", str(conf.env['HAVE_LIBLO'] == 1))
@@ -117,7 +118,8 @@ def build(bld):
 	opts.moduledir = opts.moduledir or bld.env['PREFIX'] + 'lib/ingen'
 	
 	# Headers
-	bld.install_files('${INCLUDEDIR}/ingen/interface', 'src/common/interface/*.hpp')
+	bld.install_files('${INCLUDEDIR}/ingen/interface',
+			  bld.path.ant_glob('src/common/interface/*.hpp'))
 
 	# Modules
 	bld.add_subdirs('src/engine')
@@ -133,8 +135,8 @@ def build(bld):
 	bld.add_subdirs('src/ingen')
 
 	# Documentation
-	autowaf.build_dox(bld, 'INGEN', INGEN_VERSION, srcdir, blddir)
-	bld.install_files('${HTMLDIR}', blddir + '/default/doc/html/*')
+	autowaf.build_dox(bld, 'INGEN', INGEN_VERSION, top, out)
+	#bld.install_files('${HTMLDIR}', bld.path.ant_glob(out + '/default/doc/html/*'))
 
 	# Icons
 	icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48']