Skip to content

Commit 6d678b7

Browse files
author
Yui T
committed
Merge branch 'master' into addTestsForRestAndDefault
2 parents ec5c115 + 8dd81ea commit 6d678b7

148 files changed

Lines changed: 31656 additions & 23491 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: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ var servicesSources = [
5858
"checker.ts",
5959
"emitter.ts",
6060
"program.ts",
61+
"commandLineParser.ts",
6162
"diagnosticInformationMap.generated.ts"
6263
].map(function (f) {
6364
return path.join(compilerDirectory, f);
@@ -102,6 +103,7 @@ var internalDefinitionsRoots = [
102103
"compiler/core.d.ts",
103104
"compiler/sys.d.ts",
104105
"compiler/utilities.d.ts",
106+
"compiler/commandLineParser.d.ts",
105107
"services/utilities.d.ts",
106108
];
107109

@@ -192,7 +194,7 @@ var compilerFilename = "tsc.js";
192194
* @param keepComments: false to compile using --removeComments
193195
* @param callback: a function to execute after the compilation process ends
194196
*/
195-
function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, keepComments, noResolve, callback) {
197+
function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOutFile, generateDeclarations, outDir, preserveConstEnums, keepComments, noResolve, callback) {
196198
file(outFile, prereqs, function() {
197199
var dir = useBuiltCompiler ? builtLocalDirectory : LKGDirectory;
198200
var options = "--module commonjs -noImplicitAny";
@@ -205,7 +207,7 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, noOu
205207
options += " --declaration";
206208
}
207209

208-
if (useDebugMode) {
210+
if (useDebugMode || preserveConstEnums) {
209211
options += " --preserveConstEnums";
210212
}
211213

@@ -321,7 +323,15 @@ var tscFile = path.join(builtLocalDirectory, compilerFilename);
321323
compileFile(tscFile, compilerSources, [builtLocalDirectory, copyright].concat(compilerSources), [copyright], /*useBuiltCompiler:*/ false);
322324

323325
var servicesFile = path.join(builtLocalDirectory, "typescriptServices.js");
324-
compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].concat(servicesSources), [copyright], /*useBuiltCompiler*/ true);
326+
compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].concat(servicesSources),
327+
/*prefixes*/ [copyright],
328+
/*useBuiltCompiler*/ true,
329+
/*noOutFile*/ false,
330+
/*generateDeclarations*/ false,
331+
/*outDir*/ undefined,
332+
/*preserveConstEnums*/ true,
333+
/*keepComments*/ false,
334+
/*noResolve*/ false);
325335

326336
var nodeDefinitionsFile = path.join(builtLocalDirectory, "typescript.d.ts");
327337
var standaloneDefinitionsFile = path.join(builtLocalDirectory, "typescriptServices.d.ts");
@@ -334,6 +344,7 @@ compileFile(nodeDefinitionsFile, servicesSources,[builtLocalDirectory, copyright
334344
/*noOutFile*/ true,
335345
/*generateDeclarations*/ true,
336346
/*outDir*/ tempDirPath,
347+
/*preserveConstEnums*/ true,
337348
/*keepComments*/ true,
338349
/*noResolve*/ true,
339350
/*callback*/ function () {

bin/tsc.js

Lines changed: 12023 additions & 11113 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)