From 46141f52137bcdc7c3fa5a551b8d1abc9cec4846 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 27 Oct 2015 13:20:12 -0700 Subject: [PATCH 1/2] Copy generated diagnostic messages json from src/compiler to built/local --- Jakefile.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jakefile.js b/Jakefile.js index 23720a2e7c2..7444f72a2dc 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -320,6 +320,8 @@ var processDiagnosticMessagesJs = path.join(scriptsDirectory, "processDiagnostic var processDiagnosticMessagesTs = path.join(scriptsDirectory, "processDiagnosticMessages.ts"); var diagnosticMessagesJson = path.join(compilerDirectory, "diagnosticMessages.json"); var diagnosticInfoMapTs = path.join(compilerDirectory, "diagnosticInformationMap.generated.ts"); +var generatedDiagnosticMessagesJSON = path.join(compilerDirectory, "diagnosticMessages.generated.json"); +var builtGeneratedDiagnosticMessagesJSON = path.join(builtLocalDirectory, "diagnosticMessages.generated.json"); file(processDiagnosticMessagesTs); @@ -343,6 +345,7 @@ file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], process.stderr.write(error); }); ex.addListener("cmdEnd", function() { + jake.cpR(generatedDiagnosticMessagesJSON, builtGeneratedDiagnosticMessagesJSON) complete(); }); ex.run(); From a5c9a2d263ec902e0c4952221005c6f63b74c118 Mon Sep 17 00:00:00 2001 From: Yui T Date: Tue, 27 Oct 2015 14:16:05 -0700 Subject: [PATCH 2/2] Include the built into local task --- Jakefile.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Jakefile.js b/Jakefile.js index 7444f72a2dc..9156fe4109d 100644 --- a/Jakefile.js +++ b/Jakefile.js @@ -345,12 +345,17 @@ file(diagnosticInfoMapTs, [processDiagnosticMessagesJs, diagnosticMessagesJson], process.stderr.write(error); }); ex.addListener("cmdEnd", function() { - jake.cpR(generatedDiagnosticMessagesJSON, builtGeneratedDiagnosticMessagesJSON) complete(); }); ex.run(); }, {async: true}); +file(builtGeneratedDiagnosticMessagesJSON,[generatedDiagnosticMessagesJSON], function() { + if (fs.existsSync(builtLocalDirectory)) { + jake.cpR(generatedDiagnosticMessagesJSON, builtGeneratedDiagnosticMessagesJSON); + } +}, {async: true}); + desc("Generates a diagnostic file in TypeScript based on an input JSON file"); task("generate-diagnostics", [diagnosticInfoMapTs]); @@ -479,7 +484,7 @@ task("lssl", [lsslFile]); // Local target to build the compiler and services desc("Builds the full compiler and services"); -task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile]); +task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile, builtGeneratedDiagnosticMessagesJSON]); // Local target to build only tsc.js desc("Builds only the compiler");