Changeset 904702d for waflib/Tools/compiler_d.py

Timestamp:

Mar 14, 2015, 6:06:10 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

6d7acc8

Parents:

5525507

Message:

waf, waflib: update to 1.8.7

File:

• waflib/Tools/compiler_d.py (modified) (2 diffs)

waflib/Tools/compiler_d.py

@@ -3 +3 @@
 # WARNING! Do not edit! http://waf.googlecode.com/git/docs/wafbook/single.html#_obtaining_the_waf_file
 
-import os,sys,imp,types
+import os,sys,imp,types,re
 from waflib import Utils,Configure,Options,Logs
+d_compiler={'default':['gdc','dmd','ldc2']}
+def default_compilers():
+        build_platform=Utils.unversioned_sys_platform()
+        possible_compiler_list=d_compiler.get(build_platform,d_compiler['default'])
+        return' '.join(possible_compiler_list)
 def configure(conf):
-        for compiler in conf.options.dcheck.split(','):
+        try:test_for_compiler=conf.options.check_d_compiler or default_compilers()
+        except AttributeError:conf.fatal("Add options(opt): opt.load('compiler_d')")
+        for compiler in re.split('[ ,]+',test_for_compiler):
                 conf.env.stash()
-                conf.start_msg('Checking for %r (d compiler)'%compiler)
+                conf.start_msg('Checking for %r (D compiler)'%compiler)
                 try:
                         conf.load(compiler)
@@ -22 +29 @@
                         conf.end_msg(False)
         else:
-                conf.fatal('no suitable d compiler was found')
+                conf.fatal('could not configure a D compiler!')
 def options(opt):
-        d_compiler_opts=opt.add_option_group('D Compiler Options')
-        d_compiler_opts.add_option('--check-d-compiler',default='gdc,dmd,ldc2',action='store',help='check for the compiler [Default:gdc,dmd,ldc2]',dest='dcheck')
-        for d_compiler in['gdc','dmd','ldc2']:
-                opt.load('%s'%d_compiler)
+        test_for_compiler=default_compilers()
+        d_compiler_opts=opt.add_option_group('Configuration options')
+        d_compiler_opts.add_option('--check-d-compiler',default=None,help='list of D compilers to try [%s]'%test_for_compiler,dest='check_d_compiler')
+        for x in test_for_compiler.split():
+                opt.load('%s'%x)