plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #86 from nodegui/feature/fix-automoc

Browse Source 
now automoc runs with qode qt env
This commit is contained in:
Atul R 2019-09-06 00:37:49 +02:00 committed by GitHub
commit b537f763eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/automoc.js
View File

@ -1,6 +1,7 @@
const path = require("path");
const fs = require("fs");
const childProcess = require("child_process");
const { qtHome } = require("@nodegui/qode");
const ROOT_DIR = path.resolve(__dirname, "../");
const MOC_AUTOGEN_DIR = path.resolve(ROOT_DIR, "src/cpp/autogen");
@ -50,13 +51,22 @@ const main = () => {
eachHeaderPath,
includeFilePath
);
console.log(command);
childProcess.exec(command, {}, error => {
if (error) {
console.error(`exec error: ${error}`);
return;
const mocPath = path.resolve(process.env.QT_INSTALL_DIR || qtHome, "bin");
childProcess.exec(
command,
{
env: {
...process.env,
PATH: `${mocPath}${path.delimiter}${process.env.PATH}`
}
},
error => {
if (error) {
console.error(`exec error: ${error}`);
return;
}
}
});
);
return outfilePath;
});
generateMocGypiFile(outFiles);