Subject | Hash | Author | Date (UTC) |
---|---|---|---|
just include source | 9d18479598ad88e5bae0d0a8e8bfe0009b47d5cf | Ubuntu | 2020-03-29 05:19:00 |
assert | 6ba991dbb9b5606355f73c71fca85d80bd169bf9 | Ubuntu | 2020-03-29 04:59:45 |
cleanup | f5cbde963e841bf63f51cc28ec389b6580345ed3 | Ubuntu | 2020-03-29 04:42:07 |
deepmerge | aee7de1ccef07d1162231fad345a1dc1513452fb | Ubuntu | 2020-03-29 04:39:34 |
init | e6d74419d4aaaa415732b596065b2f5cd67d66ef | Ubuntu | 2020-03-28 22:44:10 |
File | Lines added | Lines deleted |
---|---|---|
asserter/def.json | 2 | 6 |
asserter/package.json | 2 | 2 |
index.js | 10 | 1 |
File asserter/def.json changed (mode: 100644) (index efa50db..3d4280b) | |||
2 | 2 | "sources": | "sources": |
3 | 3 | [ | [ |
4 | 4 | "src/archiver.cpp", | "src/archiver.cpp", |
5 | "src/archiver.h", | ||
6 | "src/asserter.cpp", | ||
7 | "src/asserter.h", | ||
8 | "src/asserter.hxx", | ||
9 | "src/test.h" | ||
5 | "src/asserter.cpp" | ||
10 | 6 | ] | ] |
11 | } | ||
7 | } |
File asserter/package.json changed (mode: 100644) (index ef870de..dae1d60) | |||
1 | 1 | { | { |
2 | 2 | "scripts": { | "scripts": { |
3 | 3 | "test": "tape test/test.js" | "test": "tape test/test.js" |
4 | }, | ||
4 | }, | ||
5 | 5 | "dependencies": { | "dependencies": { |
6 | 6 | "expector": "*", | "expector": "*", |
7 | 7 | "tape": "*" | "tape": "*" |
8 | 8 | } | } |
9 | } | ||
9 | } |
File index.js changed (mode: 100755) (index f482bc0..3bdf9de) | |||
... | ... | const shell = require( 'shelljs' ), | |
7 | 7 | [,,defPath, ... otherArgs] = process.argv; | [,,defPath, ... otherArgs] = process.argv; |
8 | 8 | ||
9 | 9 | readDef(defPath) | readDef(defPath) |
10 | .then( obj => console.log(obj.sources.join(' '))); | ||
10 | .then(obj => { | ||
11 | readDef('./asserter/def.json') | ||
12 | .then(obj2 => { | ||
13 | let result = deepmerge(obj, obj2).sources.join(' '); | ||
14 | result += ` -isystem ${path.dirname(defPath)}`; | ||
15 | console.log(result); | ||
16 | }); | ||
17 | }); | ||
18 | |||
11 | 19 | /* | /* |
12 | 20 | const def = JSON.parse(fs.readFileSync(defPath, 'utf8')); | const def = JSON.parse(fs.readFileSync(defPath, 'utf8')); |
13 | 21 | ||
... | ... | command += def.sources.join(' '); | |
16 | 24 | command += otherArgs.join( ' ' ); | command += otherArgs.join( ' ' ); |
17 | 25 | console.log( command ); | console.log( command ); |
18 | 26 | */ | */ |
27 | |||
19 | 28 | function readDef(defFile) { | function readDef(defFile) { |
20 | 29 | return new Promise((resolve, reject) => { | return new Promise((resolve, reject) => { |
21 | 30 | const base = path.dirname(defFile); | const base = path.dirname(defFile); |