Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: make it possible to generate a subset of target languages in pack.sh #1730

Merged
merged 33 commits into from
Mar 18, 2019
Merged
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c88a178
init docusauraus
Feb 7, 2019
fa0a274
Some style tweaks
Feb 7, 2019
5bf9e60
Different color, fill out footer, and get rid of icons
Feb 7, 2019
14ff9ee
Sheep it
Feb 7, 2019
f9641e6
Colors and links
Feb 7, 2019
50fb7ce
Split into service and framework reference, generate header files
Feb 7, 2019
6385f34
Add in a script to restore scroll position after page reload
Feb 7, 2019
7cf034c
Get rid of whitespace when the header is empty
Feb 7, 2019
d13cbfd
Rendering a table
Feb 7, 2019
2b3cd10
Saner section titles
Feb 7, 2019
8f616c9
Update code generation with simplified summary table.
RomainMuller Feb 7, 2019
112fc2c
Tweaking of the rendering
RomainMuller Feb 7, 2019
9855497
Add an API on ToC generation
rix0rrr Feb 8, 2019
2971df7
Fix ToC generation, add JavaDoc generation
rix0rrr Feb 8, 2019
6665d60
Also generate JavaDoc package links on the README page
rix0rrr Feb 8, 2019
84920be
Remove italics from topic headers on the left sidebar
rix0rrr Feb 8, 2019
abb1d9d
Make it possible to select targets while packing
Feb 13, 2019
991ab26
Add build scripts for TS
Feb 13, 2019
609d614
Some changed files
Feb 13, 2019
edbebb0
Reorg
Feb 15, 2019
f64f57b
Add first pass at .NET doc generation
Feb 15, 2019
db889fc
Rename templates
Feb 15, 2019
d04784f
Start integrating TypeScript build, fix .NET filterconfig
Feb 15, 2019
a6be908
Updating styles with more whitespace and make it more skimmable
Feb 18, 2019
2a8cfc0
Use Amazon Ember as font
Feb 18, 2019
d8b0a40
WIP
Feb 20, 2019
9e551c4
Many tiny doc tweaks
Feb 21, 2019
cb2a268
Move cdk-docs to ops repository
Feb 25, 2019
14f0b12
Undo changes to archiver
Feb 25, 2019
0ecc9db
Remove moved package from lerna.json
rix0rrr Feb 27, 2019
3ca7c0c
Merge remote-tracking branch 'origin/master' into samgood/docs
Mar 16, 2019
40c137c
Fix cdk-package for new version of yargs
Mar 16, 2019
640273f
Trigger build again
rix0rrr Mar 18, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ scopes=$(lerna ls 2>/dev/null | grep -v "(private)" | cut -d" " -f1 | xargs -n1

# Run the "cdk-package" script in all modules. For jsii modules, this invokes jsii-pacmak which generates and builds multi-language
# outputs. For non-jsii module, it will just run "npm pack" and place the output in dist/npm (which is similar to how pacmak outputs it).
lerna run ${scopes} --sort --stream package
lerna run ${scopes} --sort --stream package -- -- "$@"

# Collect dist/ from all modules into the root dist/
for dir in $(find packages -name dist | grep -v node_modules); do
Expand Down
52 changes: 26 additions & 26 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/@aws-cdk/aws-docdb/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ dist
.LAST_BUILD
.LAST_PACKAGE
.jsii


# Include .jsii
!.jsii
4 changes: 4 additions & 0 deletions packages/@aws-cdk/aws-opsworkscm/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,7 @@ dist
.LAST_BUILD
.LAST_PACKAGE
.jsii


# Include .jsii
!.jsii
15 changes: 14 additions & 1 deletion tools/cdk-build-tools/bin/cdk-package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ async function main() {
.env('CDK_PACKAGE')
.usage('Usage: cdk-package')
.option('verbose', { type: 'boolean', default: false, alias: 'v', desc: 'verbose output' })
.option('targets', { type: 'array', default: [], alias: 't', desc: 'Targets to pass to jsii-pacmak' })
.option('jsii-pacmak', {
type: 'string',
desc: 'Specify a different jsii-pacmak executable',
Expand All @@ -36,7 +37,11 @@ async function main() {
}

if (pkg.jsii) {
await shell([ args.jsiiPacmak, args.verbose ? '-vvv' : '-v', '-o', outdir ], timers);
const command = [args.jsiiPacmak,
args.verbose ? '-vvv' : '-v',
...flatMap(args.targets, (target: string) => ['-t', target]),
'-o', outdir ];
await shell(command, timers);
} else {
// just "npm pack" and deploy to "outdir"
const tarball = (await shell([ 'npm', 'pack' ], timers)).trim();
Expand All @@ -56,3 +61,11 @@ main().then(() => {
process.stderr.write(`Package failed. ${timers.display()}\n`);
process.exit(1);
});

function flatMap<T, U>(xs: T[], f: (x: T) => U[]): U[] {
const ret = new Array<U>();
for (const x of xs) {
ret.push(...f(x));
}
return ret;
}
2 changes: 1 addition & 1 deletion tools/cdk-build-tools/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.