diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-11-24 04:24:28 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-11-24 04:24:28 (GMT) |
| commit | fc60ff1efacc509366655bb1f30850ce03ebcf82 (patch) | |
| tree | 81f40820b220e49eff9118ce2b81287050e4d074 /SCons/Tool | |
| parent | b0e1719980d51435d31f8c09d4b587d0bede2616 (diff) | |
| parent | cb5fd47fc19798eb7ff6d2358b24cf734a1fb2fc (diff) | |
| download | SCons-fc60ff1efacc509366655bb1f30850ce03ebcf82.zip SCons-fc60ff1efacc509366655bb1f30850ce03ebcf82.tar.gz SCons-fc60ff1efacc509366655bb1f30850ce03ebcf82.tar.bz2 | |
Change variable from COMPILATIONDB_USE_PATH_FILTER to COMPILATIONDB_PATH_FILTER
Diffstat (limited to 'SCons/Tool')
| -rw-r--r-- | SCons/Tool/compilation_db.py | 4 | ||||
| -rw-r--r-- | SCons/Tool/compilation_db.xml | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/SCons/Tool/compilation_db.py b/SCons/Tool/compilation_db.py index 52442de..d20d171 100644 --- a/SCons/Tool/compilation_db.py +++ b/SCons/Tool/compilation_db.py @@ -135,7 +135,7 @@ def write_compilation_db(target, source, env): entries = [] use_abspath = env['COMPILATIONDB_USE_ABSPATH'] in [True, 1, 'True', 'true'] - use_path_filter = env.subst('$COMPILATIONDB_USE_PATH_FILTER') + use_path_filter = env.subst('$COMPILATIONDB_PATH_FILTER') for s in __COMPILATION_DB_ENTRIES: entry = s.read() @@ -248,7 +248,7 @@ def generate(env, **kwargs): ) env['COMPILATIONDB_USE_ABSPATH'] = False - env['COMPILATIONDB_USE_PATH_FILTER'] = '' + env['COMPILATIONDB_PATH_FILTER'] = '' def exists(env): diff --git a/SCons/Tool/compilation_db.xml b/SCons/Tool/compilation_db.xml index fbbdffa..40a104e 100644 --- a/SCons/Tool/compilation_db.xml +++ b/SCons/Tool/compilation_db.xml @@ -38,7 +38,7 @@ See its __doc__ string for a discussion of the format. <item>__COMPILATIONDB_ENV</item> --> <item>COMPILATIONDB_USE_ABSPATH</item> - <item>COMPILATIONDB_USE_PATH_FILTER</item> + <item>COMPILATIONDB_PATH_FILTER</item> </sets> </tool> @@ -96,15 +96,17 @@ env.CompilationDatabase('my_output.json') </summary> </cvar> - <cvar name="COMPILATIONDB_USE_PATH_FILTER"> + <cvar name="COMPILATIONDB_PATH_FILTER"> <summary> <para> This is a string which instructs &b-link-CompilationDatabase; to only include entries where the <literal>output</literal> member - matches the pattern in the filter string using fnmatch. + matches the pattern in the filter string using fnmatch, which + uses glob style wildcards. + </para> <para> - The default value is an empty string '', which means no entries will be filtered. + The default value is an empty string '', which disables filtering. </para> </summary> </cvar> |