diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-19 19:33:10 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-05-19 19:45:08 +0200 |
commit | db6d4dbe277469b5b39413ca51b9067559566b28 (patch) | |
tree | f00d8cc4aa039f793890e9cd4b737cb3ba666aeb /share/qbs/modules/typescript | |
parent | 6234ecb4b393d4d55a1c4e28bb41e573dfa50242 (diff) |
fix build directories of the TypeScript module
Change-Id: I3a3a8d7de4be83a1704769856fa2d0a1223df4b3
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'share/qbs/modules/typescript')
-rw-r--r-- | share/qbs/modules/typescript/TypeScriptModule.qbs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/share/qbs/modules/typescript/TypeScriptModule.qbs b/share/qbs/modules/typescript/TypeScriptModule.qbs index 531e5c30b..ad1395a04 100644 --- a/share/qbs/modules/typescript/TypeScriptModule.qbs +++ b/share/qbs/modules/typescript/TypeScriptModule.qbs @@ -179,7 +179,6 @@ Module { var args = []; var primaryOutput = outputs.compiled_typescript[0]; - var outDir = FileInfo.joinPaths(product.buildDirectory, product.destinationDirectory); if (ModUtils.moduleProperty(product, "warningLevel") === "pedantic") { args.push("--noImplicitAny"); @@ -220,7 +219,7 @@ Module { } args.push("--outDir"); - args.push(outDir); + args.push(product.buildDirectory); if (ModUtils.moduleProperty(product, "singleFile")) { args.push("--out"); @@ -244,13 +243,12 @@ Module { ? FileInfo.fileName(primaryOutput.filePath) : inputs.typescript.map(function(obj) { return FileInfo.fileName(obj.filePath) }).join(", ")); cmd.highlight = "compiler"; - cmd.workingDirectory = outDir; cmds.push(cmd); // Move all the compiled TypeScript files to the proper intermediate directory cmd = new JavaScriptCommand(); cmd.silent = true; - cmd.outDir = outDir; + cmd.outDir = product.buildDirectory; cmd.sourceCode = function() { for (i = 0; i < outputs.compiled_typescript.length; ++i) { var fp = outputs.compiled_typescript[i].filePath; |