FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-12-23 09:45:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1630 from shoover/playground

Browse Source 
playground/c: update bld methods. Use write_config_header for variants…
This commit is contained in:
ita1024 2015-10-03 08:31:36 +02:00
commit c9d68d9ff0
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
playground/c/wscript
View File

@ -26,13 +26,9 @@ def configure(conf):
conf.check_cc(fragment="""#include<stdio.h>\nint main(){fprintf(stderr, "mu"); printf("%d", 22);return 0;}\n""", execute=True, define_name='HAVE_MU') conf.check_cc(fragment="""#include<stdio.h>\nint main(){fprintf(stderr, "mu"); printf("%d", 22);return 0;}\n""", execute=True, define_name='HAVE_MU')
conf.write_config_header('config.h') conf.write_config_header('config.h')
# gotcha - the config.h must be written for each variant # gotcha - the config.h must be written for each variant
txt = conf.bldnode.search_node('config.h').read()
for x in lst: for x in lst:
node = conf.bldnode.make_node(x + '/config.h') conf.write_config_header(x + '/config.h')
node.parent.mkdir()
node.write(txt)
from waflib import Utils, Build from waflib import Utils, Build
class buildall_ctx(Build.BuildContext): class buildall_ctx(Build.BuildContext):
@ -50,7 +46,7 @@ def buildall(ctx):
class sub_build(Utils.threading.Thread): class sub_build(Utils.threading.Thread):
def run(self): def run(self):
bld = self.bld = self.cls(top_dir=ctx.top_dir, out_dir=ctx.out_dir) bld = self.bld = self.cls(top_dir=ctx.top_dir, out_dir=ctx.out_dir)
bld.load() bld.restore()
bld.siblings = threads bld.siblings = threads
bld.count = count bld.count = count
bld.line_lock = line_lock bld.line_lock = line_lock
@ -96,13 +92,13 @@ def cleanall(ctx):
for x in lst: for x in lst:
cls = type(Build.CleanContext)(x, (Build.CleanContext,), {'cmd': x, 'variant': x}) cls = type(Build.CleanContext)(x, (Build.CleanContext,), {'cmd': x, 'variant': x})
bld = cls(top_dir=ctx.top_dir, out_dir=ctx.out_dir) bld = cls(top_dir=ctx.top_dir, out_dir=ctx.out_dir)
bld.load() bld.restore()
bld.load_envs() bld.load_envs()
bld.recurse([bld.run_dir]) bld.recurse([bld.run_dir])
try: try:
bld.clean() bld.clean()
finally: finally:
bld.save() bld.store()
# produces dict/json compatible output # produces dict/json compatible output