Fix up tests now that operator= on ScopedConnection disconnects the old connection...

[ardour.git] / libs / gtkmm2ext / wscript

diff --git a/libs/gtkmm2ext/wscript b/libs/gtkmm2ext/wscript
index e90cef825ec768c83f6591ba4aaa7981b163b63e..1d386ce6ee051afa67e964ed1dbebac775e2c4a5 100644 (file)
--- a/libs/gtkmm2ext/wscript
+++ b/libs/gtkmm2ext/wscript
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import autowaf
+from waflib.extras import autowaf as autowaf
 import os
 
 # Version of this package (even if built as a child)
@@ -17,6 +17,7 @@ GTKMM2EXT_LIB_VERSION = '0.8.3'
 # Variables for 'waf dist'
 APPNAME = 'gtkmm2ext'
 VERSION = GTKMM2EXT_VERSION
+I18N_PACKAGE = 'gtkmm2ext3'
 
 gtkmm2ext_sources = [
         'actions.cc',
@@ -27,6 +28,9 @@ gtkmm2ext_sources = [
         'bindable_button.cc',
         'bindings.cc',
         'cairocell.cc',
+        'cairo_packer.cc',
+        'cairo_widget.cc',
+        'cell_renderer_color_selector.cc',
         'cell_renderer_pixbuf_multi.cc',
         'cell_renderer_pixbuf_toggle.cc',
         'choice.cc',
@@ -59,54 +63,67 @@ gtkmm2ext_sources = [
 ]
 
 # Mandatory variables
-srcdir = '.'
-blddir = 'build'
+top = '.'
+out = 'build'
 
 path_prefix = 'libs/gtkmm2ext/'
 
-def set_options(opt):
+def options(opt):
     autowaf.set_options(opt)
 
 def configure(conf):
+    conf.load('compiler_cxx')
     autowaf.build_version_files(path_prefix+'gtkmm2ext/version.h', path_prefix+'version.cc',
                     'libgtkmm2ext', MAJOR, MINOR, MICRO)
     autowaf.configure(conf)
-    conf.check_tool('compiler_cxx')
     autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM', atleast_version='2.8')
     autowaf.check_pkg(conf, 'gtk+-2.0', uselib_store='GTK', atleast_version='2.12.1')
 
 
 def build(bld):
-    obj = bld.new_task_gen(features = 'cc cxx cshlib')
+    obj = bld(features = 'c cxx cxxshlib cshlib')
     obj.source = gtkmm2ext_sources
-    obj.export_incdirs = ['.']
+    obj.export_includes = ['.']
     obj.includes     = ['.']
     obj.name         = 'libgtkmm2ext'
     obj.target       = 'gtkmm2ext'
     obj.uselib       = 'GTKMM GTK GTKOSX OSX GDK'
-    obj.uselib_local = 'libpbd'
+    obj.use          = 'libpbd'
     obj.vnum         = GTKMM2EXT_LIB_VERSION
     obj.install_path = os.path.join(bld.env['LIBDIR'], 'ardour3')
-    obj.cxxflags     = [
-                    '-DPACKAGE="libgtkmm2ext"',
-                    '-DLOCALEDIR="' + os.path.join(
-                            os.path.normpath(bld.env['DATADIRNAME']), 'locale') + '"']
-    if bld.env['GTKOSX']:
+    obj.defines     = [
+                    'PACKAGE="' + I18N_PACKAGE + '"',
+                    'LOCALEDIR="' + os.path.join(
+                            os.path.normpath(bld.env['DATADIR']), 'locale') + '"']
+    if bld.is_defined('GTKOSX'):
         obj.source += ['gtkapplication_quartz.mm']
     else:
         obj.source += ['gtkapplication_x11.c']
 
     # i18n
-    if bld.env['ENABLE_NLS']:
-        mo_files = glob.glob (os.path.join (bld.get_curdir(), 'po/*.mo'))
+    if bld.is_defined('ENABLE_NLS'):
+        mo_files = bld.path.ant_glob('po/*.mo')
         for mo in mo_files:
-            lang = os.path.basename (mo).replace ('.mo', '')
-            bld.install_as (os.path.join(bld.env['PREFIX'], 'share', 'locale',
-                                         lang, 'LC_MESSAGES', 'libgtkmm2ext.mo'),
-                            mo)
+            lang = os.path.basename(mo.srcpath()).replace('.mo', '')
+            bld.install_as(os.path.join(bld.env['PREFIX'], 'share', 'locale',
+                                        lang, 'LC_MESSAGES', I18N_PACKAGE + '.mo'),
+                           mo)
 
 def i18n(bld):
-    autowaf.build_i18n(bld, '.', 'libs/gtkmm2ext', APPNAME, gtkmm2ext_sources)
+    autowaf.build_i18n(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
+                       'Paul Davis')
+
+def i18n_pot(bld):
+    autowaf.build_i18n_pot(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
+                       'Paul Davis')
+
+def i18n_po(bld):
+    autowaf.build_i18n_po(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
+                       'Paul Davis')
+
+def i18n_mo(bld):
+    autowaf.build_i18n_mo(bld, top, 'libs/gtkmm2ext', I18N_PACKAGE, gtkmm2ext_sources,
+                       'Paul Davis')
 
 def shutdown():
     autowaf.shutdown()