Add tools.scons

Add tools.scons

.gitignore

@@ -21,6 +21,7 @@
 *.app
 
 # Build byproducts
+/bin
 /build
 /package.txt
 /package-description.txt

SConstruct

@@ -64,14 +64,19 @@ if env['PLATFORM'] == 'win32' or int(env.get('cross_mingw', 0)):
                               duplicate = 0)
     Default(hide_console)
 
+tools = SConscript('src/tools.scons', variant_dir = 'build', duplicate = 0)
+for tool in tools:
+    Default(tool)
+    Depends(tool, client)
 # Clean
-Clean(client, ['build', 'config.log'])
+Clean(client, ['bin', 'build', 'config.log'])
 
 # Dist
 docs = ['README.md', 'CHANGELOG.md', 'LICENSE']
 distfiles = docs + [client, 'images/fahlogo.png']
 if env['PLATFORM'] == 'posix':
     distfiles.append('install/lin/fah-client.service')
+distfiles += tools
 if hide_console is not None: distfiles.append(hide_console)
 tar = env.TarBZ2Dist('fah-client', distfiles)
 Alias('dist', tar)
@@ -130,6 +135,9 @@ if 'package' in COMMAND_LINE_TARGETS:
                      ['build/install/osx/launchd.plist',
                       'Library/LaunchDaemons/' +
                       'org.foldingathome.fahclient.plist', 0o644]]
+        for tool in tools:
+            pkg_files += [[str(tool[0]), 'usr/local/bin/', 0o755]]
+
         pkg_components = [
             {
                 # name is component pkg file name and name shown in installer

src/tools.scons

@@ -0,0 +1,19 @@
+Import('*')
+
+tools_scons = Glob('all-*.scons')
+
+if env['PLATFORM'] == 'win32' or int(env.get('cross_mingw', 0)):
+  tools_scons += Glob('win-*.scons')
+elif env['PLATFORM'] == 'darwin':
+  tools_scons += Glob('osx-*.scons')
+else:
+  tools_scons += Glob('lin-*.scons')
+
+Export('env')
+
+tools = []
+for tscons in tools_scons:
+  tool = SConscript(tscons, variant_dir = '#/build', duplicate = 0)
+  if tool: tools += [tool]
+
+Return('tools')