Skip to content

Commit cd308e7

Browse files
CyrusNajmabadiCyrusNajmabadi
committed
Merge branch 'master' into sourceFileUpdate
Conflicts: src/compiler/checker.ts src/compiler/diagnosticInformationMap.generated.ts src/compiler/parser.ts tests/baselines/reference/FunctionDeclaration5_es6.errors.txt tests/baselines/reference/VariableDeclaration2_es6.errors.txt tests/baselines/reference/VariableDeclaration4_es6.errors.txt tests/baselines/reference/anonymousModules.errors.txt tests/baselines/reference/callSignaturesWithParameterInitializers2.errors.txt tests/baselines/reference/conflictMarkerTrivia1.errors.txt tests/baselines/reference/dottedModuleName.errors.txt tests/baselines/reference/innerModExport1.errors.txt tests/baselines/reference/innerModExport2.errors.txt tests/baselines/reference/parserAccessors10.errors.txt tests/baselines/reference/parserComputedPropertyName5.errors.txt tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction1.errors.txt tests/baselines/reference/parserErrantEqualsGreaterThanAfterFunction2.errors.txt tests/baselines/reference/parserModifierOnStatementInBlock2.errors.txt tests/baselines/reference/parserSkippedTokens16.errors.txt tests/baselines/reference/privateIndexer2.errors.txt
2 parents 908d4f6 + 1776734 commit cd308e7

371 files changed

Lines changed: 3616 additions & 3192 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Jakefile‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ var definitionsRoots = [
9595
"services/services.d.ts",
9696
];
9797

98+
var internalDefinitionsRoots = [
99+
"compiler/core.d.ts",
100+
"compiler/sys.d.ts",
101+
"compiler/utilities.d.ts",
102+
"services/utilities.d.ts",
103+
];
104+
98105
var harnessSources = [
99106
"harness.ts",
100107
"sourceMapRecorder.ts",
@@ -315,6 +322,8 @@ compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].conca
315322

316323
var nodeDefinitionsFile = path.join(builtLocalDirectory, "typescript.d.ts");
317324
var standaloneDefinitionsFile = path.join(builtLocalDirectory, "typescriptServices.d.ts");
325+
var internalNodeDefinitionsFile = path.join(builtLocalDirectory, "typescript_internal.d.ts");
326+
var internalStandaloneDefinitionsFile = path.join(builtLocalDirectory, "typescriptServices_internal.d.ts");
318327
var tempDirPath = path.join(builtLocalDirectory, "temptempdir");
319328
compileFile(nodeDefinitionsFile, servicesSources,[builtLocalDirectory, copyright].concat(servicesSources),
320329
/*prefixes*/ undefined,
@@ -325,16 +334,25 @@ compileFile(nodeDefinitionsFile, servicesSources,[builtLocalDirectory, copyright
325334
/*keepComments*/ true,
326335
/*noResolve*/ true,
327336
/*callback*/ function () {
328-
concatenateFiles(standaloneDefinitionsFile, definitionsRoots.map(function (f) {
329-
return path.join(tempDirPath, f);
330-
}));
331-
prependFile(copyright, standaloneDefinitionsFile);
337+
function makeDefinitionFiles(definitionsRoots, standaloneDefinitionsFile, nodeDefinitionsFile) {
338+
// Create the standalone definition file
339+
concatenateFiles(standaloneDefinitionsFile, definitionsRoots.map(function (f) {
340+
return path.join(tempDirPath, f);
341+
}));
342+
prependFile(copyright, standaloneDefinitionsFile);
343+
344+
// Create the node definition file by replacing 'ts' module with '"typescript"' as a module.
345+
jake.cpR(standaloneDefinitionsFile, nodeDefinitionsFile, {silent: true});
346+
var definitionFileContents = fs.readFileSync(nodeDefinitionsFile).toString();
347+
definitionFileContents = definitionFileContents.replace(/declare module ts/g, 'declare module "typescript"');
348+
fs.writeFileSync(nodeDefinitionsFile, definitionFileContents);
349+
}
332350

333-
// Create the node definition file by replacing 'ts' module with '"typescript"' as a module.
334-
jake.cpR(standaloneDefinitionsFile, nodeDefinitionsFile, {silent: true});
335-
var definitionFileContents = fs.readFileSync(nodeDefinitionsFile).toString();
336-
definitionFileContents = definitionFileContents.replace(/declare module ts/g, 'declare module "typescript"');
337-
fs.writeFileSync(nodeDefinitionsFile, definitionFileContents);
351+
// Create the public definition files
352+
makeDefinitionFiles(definitionsRoots, standaloneDefinitionsFile, nodeDefinitionsFile);
353+
354+
// Create the internal definition files
355+
makeDefinitionFiles(internalDefinitionsRoots, internalStandaloneDefinitionsFile, internalNodeDefinitionsFile);
338356

339357
// Delete the temp dir
340358
jake.rmRf(tempDirPath, {silent: true});
@@ -393,7 +411,7 @@ task("generate-spec", [specMd])
393411
// Makes a new LKG. This target does not build anything, but errors if not all the outputs are present in the built/local directory
394412
desc("Makes a new LKG out of the built js files");
395413
task("LKG", ["clean", "release", "local"].concat(libraryTargets), function() {
396-
var expectedFiles = [tscFile, servicesFile, nodeDefinitionsFile, standaloneDefinitionsFile].concat(libraryTargets);
414+
var expectedFiles = [tscFile, servicesFile, nodeDefinitionsFile, standaloneDefinitionsFile, internalNodeDefinitionsFile, internalStandaloneDefinitionsFile].concat(libraryTargets);
397415
var missingFiles = expectedFiles.filter(function (f) {
398416
return !fs.existsSync(f);
399417
});
@@ -447,14 +465,10 @@ function exec(cmd, completeHandler) {
447465
complete();
448466
});
449467
ex.addListener("error", function(e, status) {
450-
console.error("Process exited with code " + status);
451-
complete();
468+
fail("Process exited with code " + status);
452469
})
453-
try{
454-
ex.run();
455-
} catch(e) {
456-
console.log('Exception: ' + e)
457-
}
470+
471+
ex.run();
458472
}
459473

460474
function cleanTestDirs() {

0 commit comments

Comments
 (0)