Split example-clients and tools, as done for jack1

Signed-off-by: falkTX <falktx@falktx.com>

example-clients/wscript

@@ -2,35 +2,21 @@
 # encoding: utf-8
 
 example_programs = {
-    'jack_freewheel' : 'freewheel.c',
-    'jack_connect' : 'connect.c',
-    'jack_lsp' : 'lsp.c',
+    'jack_cpu_load' : 'cpu_load.c',
+    'jack_latent_client' : 'latent_client.c',
     'jack_metro' : 'metro.c',
+    'jack_midi_latency_test' : 'midi_latency_test.c',
     'jack_midiseq' : 'midiseq.c',
     'jack_midisine' : 'midisine.c',
+    'jack_net_master' : 'netmaster.c',
+    'jack_net_slave' : 'netslave.c',
+    'jack_server_control' : 'server_control.cpp',
     'jack_showtime' : 'showtime.c',
+    'jack_simdtests' : 'simdtests.cpp',
     'jack_simple_client' : 'simple_client.c',
-    'jack_zombie' : 'zombie.c',
-    'jack_load' : 'ipload.c',
-    'jack_unload' : 'ipunload.c',
-    'jack_alias' : 'alias.c',
-    'jack_bufsize' : 'bufsize.c',
-    'jack_wait' : 'wait.c',
-    'jack_samplerate' : 'samplerate.c',
-    'jack_evmon' : 'evmon.c',
-    'jack_monitor_client' : 'monitor_client.c',
-    'jack_thru' : 'thru_client.c',
-    'jack_cpu_load' : 'cpu_load.c',
     'jack_simple_session_client' : 'simple_session_client.c',
-    'jack_session_notify' : 'session_notify.c',
-    'jack_server_control' : 'server_control.cpp',
-    'jack_net_slave' : 'netslave.c',
-    'jack_net_master' : 'netmaster.c',
-    'jack_latent_client' : 'latent_client.c',
-    'jack_midi_dump' : 'midi_dump.c',
-    'jack_midi_latency_test' : 'midi_latency_test.c',
-    'jack_simdtests' : 'simdtests.cpp',
-    'jack_property' : 'property.c',
+    'jack_thru' : 'thru_client.c',
+    'jack_zombie' : 'zombie.c',
     }
 
 example_libs = {
@@ -38,12 +24,8 @@ example_libs = {
     }
 
 def configure(conf):
-    conf.env['BUILD_EXAMPLE_CLIENT_TRANSPORT'] = conf.env['READLINE']
-
     conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.env['SNDFILE']
 
-    conf.env['BUILD_EXAMPLE_ALSA_IO'] = conf.env['SAMPLERATE'] and conf.env['BUILD_DRIVER_ALSA']
-
 def build(bld):
     if bld.env['IS_LINUX']:
         os_incdir = ['../linux', '../posix']
@@ -83,19 +65,6 @@ def build(bld):
 
         prog.target = example_program
 
-    if bld.env['BUILD_EXAMPLE_CLIENT_TRANSPORT']:
-        prog = bld(features = 'c cprogram')
-        prog.includes = os_incdir + ['../common/jack', '../common']
-        prog.source = 'transport.c'
-        prog.use = ['clientlib']
-        if bld.env['IS_LINUX']:
-            prog.use += ['RT', 'READLINE']
-        if bld.env['IS_MACOSX']:
-            prog.use += ['READLINE']
-        if bld.env['IS_WINDOWS']:
-            prog.use += ['READLINE']
-        prog.target = 'jack_transport'
-
     if bld.env['BUILD_EXAMPLE_CLIENT_REC']:
         prog = bld(features = 'c cprogram')
         prog.includes = os_incdir + ['../common/jack', '../common']
@@ -111,30 +80,6 @@ def build(bld):
             prog.uselib = ['SNDFILE']
         prog.target = 'jack_rec'
 
-    if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']:
-        prog = bld(features = 'c cprogram')
-        prog.includes = os_incdir + ['.', '..', '../common/jack', '../common']
-        prog.source = ['netsource.c', '../common/netjack_packet.c']
-        prog.env.append_value('CFLAGS', '-DNO_JACK_ERROR')
-        prog.use = ['CELT', 'SAMPLERATE', 'OPUS', 'M', 'clientlib']
-        prog.target = 'jack_netsource'
-        prog.defines = ['HAVE_CONFIG_H']
-
-    if bld.env['IS_LINUX'] and bld.env['BUILD_EXAMPLE_ALSA_IO']:
-        prog = bld(features = 'c cprogram')
-        prog.includes = os_incdir + ['../common/jack', '../common']
-        prog.source = ['alsa_in.c', '../common/memops.c']
-        prog.env.append_value('CFLAGS', '-DNO_JACK_ERROR')
-        prog.use = ['clientlib', 'ALSA', 'SAMPLERATE', 'M']
-        prog.target = 'alsa_in'
-
-        prog = bld(features = 'c cprogram')
-        prog.includes = os_incdir + ['../common/jack', '../common']
-        prog.source = ['alsa_out.c', '../common/memops.c']
-        prog.env.append_value('CFLAGS', '-DNO_JACK_ERROR')
-        prog.use = ['clientlib', 'ALSA', 'SAMPLERATE', 'M']
-        prog.target = 'alsa_out'
-
     for example_lib, example_lib_source in list(example_libs.items()):
         lib = bld(features = 'c cshlib')
         if not bld.env['IS_WINDOWS']:
@@ -146,7 +91,3 @@ def build(bld):
             lib.env.append_value('LINKFLAGS', '-lm')
         lib.use = 'serverlib'
         lib.install_path = '${ADDON_DIR}/'
-
-    if not bld.env['IS_WINDOWS']:
-        bld.symlink_as('${PREFIX}/bin/jack_disconnect', 'jack_connect')
-        bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0o755)

tools/wscript

@@ -0,0 +1,90 @@
+#! /usr/bin/python3
+# encoding: utf-8
+
+example_tools = {
+    'jack_alias' : 'alias.c',
+    'jack_bufsize' : 'bufsize.c',
+    'jack_connect' : 'connect.c',
+    'jack_evmon' : 'evmon.c',
+    'jack_freewheel' : 'freewheel.c',
+    'jack_load' : 'ipload.c',
+    'jack_lsp' : 'lsp.c',
+    'jack_midi_dump' : 'midi_dump.c',
+    'jack_monitor_client' : 'monitor_client.c',
+    'jack_property' : 'property.c',
+    'jack_samplerate' : 'samplerate.c',
+    'jack_session_notify' : 'session_notify.c',
+    'jack_unload' : 'ipunload.c',
+    'jack_wait' : 'wait.c',
+    }
+
+def configure(conf):
+    conf.env['BUILD_EXAMPLE_ALSA_IO'] = conf.env['SAMPLERATE'] and conf.env['BUILD_DRIVER_ALSA']
+    conf.env['BUILD_EXAMPLE_CLIENT_TRANSPORT'] = conf.env['READLINE']
+
+def build(bld):
+    if bld.env['IS_LINUX']:
+        os_incdir = ['../linux', '../posix']
+    if bld.env['IS_MACOSX']:
+        os_incdir = ['../macosx', '../posix']
+    if bld.env['IS_SUN']:
+        os_incdir = ['../solaris', '../posix']
+    if bld.env['IS_WINDOWS']:
+        os_incdir = ['../windows']
+    for example_tool, example_tool_source in list(example_tools.items()):
+        if bld.env['IS_MACOSX']:
+            prog = bld(features='c cprogram', framework = ['Foundation'])
+        else:
+            prog = bld(features='c cprogram')
+        prog.includes = os_incdir + ['../common/jack', '../common']
+        prog.source = example_tool_source
+        prog.use = ['clientlib']
+        if bld.env['IS_LINUX']:
+            prog.use += ['RT', 'M']
+        if bld.env['IS_SUN']:
+            prog.use += ['M']
+        #prog.cflags = ['-Wno-deprecated-declarations', '-Wno-misleading-indentation']
+        #prog.cxxflags = ['-Wno-deprecated-declarations', '-Wno-misleading-indentation']
+
+        prog.target = example_tool
+
+    if bld.env['BUILD_EXAMPLE_CLIENT_TRANSPORT']:
+        prog = bld(features = 'c cprogram')
+        prog.includes = os_incdir + ['../common/jack', '../common']
+        prog.source = 'transport.c'
+        prog.use = ['clientlib']
+        if bld.env['IS_LINUX']:
+            prog.use += ['RT', 'READLINE']
+        if bld.env['IS_MACOSX']:
+            prog.use += ['READLINE']
+        if bld.env['IS_WINDOWS']:
+            prog.use += ['READLINE']
+        prog.target = 'jack_transport'
+
+    if bld.env['IS_LINUX'] or bld.env['IS_MACOSX']:
+        prog = bld(features = 'c cprogram')
+        prog.includes = os_incdir + ['.', '..', '../common/jack', '../common']
+        prog.source = ['netsource.c', '../common/netjack_packet.c']
+        prog.env.append_value('CFLAGS', '-DNO_JACK_ERROR')
+        prog.use = ['CELT', 'SAMPLERATE', 'OPUS', 'M', 'clientlib']
+        prog.target = 'jack_netsource'
+        prog.defines = ['HAVE_CONFIG_H']
+
+    if bld.env['IS_LINUX'] and bld.env['BUILD_EXAMPLE_ALSA_IO']:
+        prog = bld(features = 'c cprogram')
+        prog.includes = os_incdir + ['../common/jack', '../common']
+        prog.source = ['alsa_in.c', '../common/memops.c']
+        prog.env.append_value('CFLAGS', '-DNO_JACK_ERROR')
+        prog.use = ['clientlib', 'ALSA', 'SAMPLERATE', 'M']
+        prog.target = 'alsa_in'
+
+        prog = bld(features = 'c cprogram')
+        prog.includes = os_incdir + ['../common/jack', '../common']
+        prog.source = ['alsa_out.c', '../common/memops.c']
+        prog.env.append_value('CFLAGS', '-DNO_JACK_ERROR')
+        prog.use = ['clientlib', 'ALSA', 'SAMPLERATE', 'M']
+        prog.target = 'alsa_out'
+
+    if not bld.env['IS_WINDOWS']:
+        bld.symlink_as('${PREFIX}/bin/jack_disconnect', 'jack_connect')
+        bld.install_files('${PREFIX}/bin', 'jack_control', chmod=0o755)

wscript

@@ -289,6 +289,7 @@ def configure(conf):
 
 
     conf.recurse('example-clients')
+    conf.recurse('tools')
 
     # test for the availability of ucontext, and how it should be used
     for t in ['gp_regs', 'uc_regs', 'mc_gregs', 'gregs']:
@@ -804,6 +805,8 @@ def build(bld):
     build_drivers(bld)
 
     bld.recurse('example-clients')
+    bld.recurse('tools')
+
     if bld.env['IS_LINUX']:
         bld.recurse('man')
         bld.recurse('systemd')