jackdbus executable buildable using waf

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2397 0c269be4-1314-0410-8aa9-9f06e86f4224

1 files changed, 14 insertions, 10 deletions

diff --git a/wscript b/wscript
index 2e2dadd6..48fcb83c 100644
--- a/wscript
+++ b/wscript
@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 import Params
+import commands
 
 VERSION='1.9.0'
 APPNAME='jack'
@@ -10,29 +11,33 @@ APPNAME='jack'
 srcdir = '.'
 blddir = 'build'
 
+def fetch_svn_revision(path):
+    cmd = "LANG= "
+    cmd += "svnversion "
+    cmd += path
+    return commands.getoutput(cmd)
+
 def set_options(opt):
     # options provided by the modules
     opt.tool_options('compiler_cxx')
     opt.tool_options('compiler_cc')
 
-    #opt.add_option('--dbus', action='store_true', default=False, help='Compile D-Bus JACK')
-
 def configure(conf):
     conf.check_tool('compiler_cxx')
     conf.check_tool('compiler_cc')
 
-    #if Params.g_options['dbus']:
-    #    conf.sub_config('linux/dbus')
+    conf.sub_config('linux/dbus')
 
     conf.env['LIB_PTHREAD'] = ['pthread']
     conf.env['LIB_DL'] = ['dl']
     conf.env['LIB_RT'] = ['rt']
 
-    conf.define('ADDON_DIR', '/blabla')
+    conf.define('ADDON_DIR', conf.env['PREFIX'] + '/lib/jack')
     conf.define('JACK_LOCATION', conf.env['PREFIX'] + '/bin')
     conf.define('SOCKET_RPC_FIFO_SEMA', 1)
     conf.define('__SMP__', 1)
     conf.define('USE_POSIX_SHM', 1)
+    conf.define('JACK_SVNREVISION', fetch_svn_revision('.'))
     conf.write_config_header('config.h')
 
     #print Params.g_options
@@ -40,8 +45,7 @@ def configure(conf):
 
 def build(bld):
     # process subfolders from here
-    bld.add_subdirs([
-        'common',
-        'linux',
-#        'linux/dbus',
-        ])
+    bld.add_subdirs('common')
+    bld.add_subdirs('linux')
+
+    bld.add_subdirs('linux/dbus')