iSharkFly-Docs/angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: make compiler_cli build again

Browse Source
This commit is contained in:
Tobias Bosch 2016-05-02 09:56:38 -07:00
parent 43527172ed
commit c386fc8379
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -50,7 +50,7 @@ do
UMDES5PATH=${DESTDIR}/${PACKAGE}.umd.js UMDES5PATH=${DESTDIR}/${PACKAGE}.umd.js
echo "====== COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig.json =====" echo "====== COMPILING: \$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es5.json ====="
$(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es5.json $(npm bin)/ng2tc -p ${SRCDIR}/tsconfig-es5.json
cp ${SRCDIR}/package.json ${DESTDIR}/ cp ${SRCDIR}/package.json ${DESTDIR}/

7
gulpfile.js
View File

@ -1053,8 +1053,7 @@ gulp.task('!test.typings',
gulp.task('test.typings', ['build.js.cjs'], gulp.task('test.typings', ['build.js.cjs'],
function(done) { runSequence('!test.typings', sequenceComplete(done)); }); function(done) { runSequence('!test.typings', sequenceComplete(done)); });
gulp.task('!build.compiler_cli', ['build.js.cjs'], gulp.task('!build.compiler_cli', function(done) { runTsc('tools/compiler_cli/src', done); });
function(done) { runTsc('tools/compiler_cli/src', done); });
gulp.task('!clean.compiler_cli', function(done) { gulp.task('!clean.compiler_cli', function(done) {
fse.remove(path.join('dist', 'tools', 'compiler_cli', 'test'), fse.remove(path.join('dist', 'tools', 'compiler_cli', 'test'),
@ -1066,7 +1065,7 @@ gulp.task('!clean.compiler_cli', function(done) {
gulp.task('!test.compiler_cli.codegen', function(done) { gulp.task('!test.compiler_cli.codegen', function(done) {
try { try {
require('./dist/js/cjs/compiler_cli/main') require('./dist/tools/compiler_cli/main')
.main("tools/compiler_cli/test") .main("tools/compiler_cli/test")
.then(done) .then(done)
.catch(function(rej) { done(new Error(rej)); }); .catch(function(rej) { done(new Error(rej)); });
@ -1076,7 +1075,7 @@ gulp.task('!test.compiler_cli.codegen', function(done) {
}); });
gulp.task('!test.compiler_cli.unit', gulp.task('!test.compiler_cli.unit',
function(done) { runJasmineTests(['dist/js/cjs/compiler_cli/**/*_spec.js'], done) }); function(done) { runJasmineTests(['dist/tools/compiler_cli/**/*_spec.js'], done) });
// This task overwrites our careful tsickle-lowered Decorators with normal .js emit. // This task overwrites our careful tsickle-lowered Decorators with normal .js emit.
// So it should only be run after asserting on the .js file content. // So it should only be run after asserting on the .js file content.

3
tools/compiler_cli/src/tsconfig.json
View File

@ -9,12 +9,13 @@
"paths": { "paths": {
"@angular/*": ["dist/all/@angular/*"], "@angular/*": ["dist/all/@angular/*"],
"@angular/core": ["dist/all/@angular/core/"], "@angular/core": ["dist/all/@angular/core/"],
"@angular/compiler": ["dist/all/@angular/compiler/"],
"ts-metadata-collector": ["dist/tools/metadata"] "ts-metadata-collector": ["dist/tools/metadata"]
}, },
"experimentalDecorators": true, "experimentalDecorators": true,
"rootDir": ".", "rootDir": ".",
// Write to a directory that has the node_modules symlink in a parent // Write to a directory that has the node_modules symlink in a parent
"outDir": "../../../dist/js/cjs/compiler_cli", "outDir": "../../../dist/tools/compiler_cli",
"declaration": true "declaration": true
}, },
"exclude": ["test"] "exclude": ["test"]

1
tools/compiler_cli/test/tsconfig.json
View File

@ -23,6 +23,7 @@
"paths": { "paths": {
"@angular/*": ["dist/all/@angular/*"], "@angular/*": ["dist/all/@angular/*"],
"@angular/core": ["dist/all/@angular/core/"], "@angular/core": ["dist/all/@angular/core/"],
"@angular/compiler": ["dist/all/@angular/compiler/"],
"rxjs/*": ["node_modules/rxjs/*"], "rxjs/*": ["node_modules/rxjs/*"],
"ts-metadata-collector": ["dist/tools/metadata"] "ts-metadata-collector": ["dist/tools/metadata"]
} }