From 8aa2605f2e0494bf986bc9a2b90f2edfd8f0aa63 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Thu, 14 Feb 2019 12:15:17 +0100 Subject: [PATCH 1/2] fix(jsii-pacmack): default to target directory mode Always generate to `$root/dist/TARGET`, even when only generating one target. This behavior works better for selectively building targets in a larger build that expects certain naming conventions. --- packages/jsii-pacmak/bin/jsii-pacmak.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jsii-pacmak/bin/jsii-pacmak.ts b/packages/jsii-pacmak/bin/jsii-pacmak.ts index 3fa1a07658..dfcb913018 100644 --- a/packages/jsii-pacmak/bin/jsii-pacmak.ts +++ b/packages/jsii-pacmak/bin/jsii-pacmak.ts @@ -51,7 +51,7 @@ import { VERSION_DESC } from '../lib/version'; .option('force-subdirectory', { type: 'boolean', desc: 'force generation into a target-named subdirectory, even in single-target mode', - default: false + default: true, }) .option('recurse', { alias: 'R', From 435d997d3032bd014d36460922be4c788ac89250 Mon Sep 17 00:00:00 2001 From: Rico Huijbers Date: Thu, 14 Feb 2019 12:18:11 +0100 Subject: [PATCH 2/2] Generate dotnet to dist/dotnet dir, instead of dist/dotnet/dotnet --- packages/jsii-pacmak/lib/targets/dotnet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jsii-pacmak/lib/targets/dotnet.ts b/packages/jsii-pacmak/lib/targets/dotnet.ts index 09790004f1..863028d2d6 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet.ts @@ -61,7 +61,7 @@ export default class Dotnet extends Target { await this.copyFiles( path.join(sourceDir, packageId, 'bin', 'Release'), - path.join(outDir, this.targetName)); + outDir); await fs.remove(path.join(outDir, 'netstandard2.0')); }