diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-10-09 15:03:19 -0400 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2014-10-09 15:03:19 -0400 |
| commit | f2f3fcf2010aba49bcdd49a5959264b5811b9a23 (patch) | |
| tree | c37d6c5a733fb94135c632f9cd8f823cada83006 /SConstruct | |
| parent | f3cbd6873f95c15122656bc63340955c4385d2bb (diff) | |
| download | mongo-f2f3fcf2010aba49bcdd49a5959264b5811b9a23.tar.gz | |
Minor Windows SConstruct & Build fixes
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index 418b44bbb7c..b2df6ccc3f6 100644 --- a/SConstruct +++ b/SConstruct @@ -67,13 +67,11 @@ def GenerateWiredTigerH(target, source, env): '@uintmax_t_decl@': "", '@uintptr_t_decl@': "", '@off_t_decl@' : 'typedef int64_t wt_off_t;', - '@wiredtiger_includes_decl@': - """ -#include <sys/types.h> + '@wiredtiger_includes_decl@': + """#include <sys/types.h> #include <stdarg.h> #include <stdint.h> -#include <stdio.h>" - """ +#include <stdio.h>""" } wt = open("src/include/wiredtiger.in") @@ -91,8 +89,11 @@ def GenerateWiredTigerH(target, source, env): # # WiredTiger library # -filelist = open("dist/filelist_win") -wtsources = filelist.readlines() +filelist = open(r"dist\filelist.win") +wtsources = [line.strip() + for line in filelist + if not line.startswith("#") and len(line) > 1] +filelist.close() if useZlib: wtsources.append("ext/compressors/zlib/zlib_compress.c") @@ -100,8 +101,6 @@ if useZlib: if useSnappy: wtsources.append("ext/compressors/snappy/snappy_compress.c") -#wtsources.append("wiredtiger.h") - env.Command('wiredtiger.h', 'src/include/wiredtiger.in', GenerateWiredTigerH) wtlib = env.Library("wiredtiger", wtsources) |