From 9b0bbf926bff6bd5ddaad3de2150578bbc1d2b49 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@microsoft.com>
Date: Thu, 9 Apr 2015 14:15:07 -0700
Subject: [PATCH] Remove step to build typeScript_internal.d.ts

---
 Jakefile | 74 +++++++++++---------------------------------------------
 1 file changed, 14 insertions(+), 60 deletions(-)

diff --git a/Jakefile b/Jakefile
index 2efd973a021..4d4d6bff19f 100644
--- a/Jakefile
+++ b/Jakefile
@@ -105,24 +105,6 @@ var serverSources = [
     return path.join(serverDirectory, f);
 });
 
-var definitionsRoots = [
-    "compiler/types.d.ts",
-    "compiler/scanner.d.ts",
-    "compiler/parser.d.ts",
-    "compiler/checker.d.ts",
-    "compiler/program.d.ts",
-    "compiler/commandLineParser.d.ts",
-    "services/services.d.ts",
-];
-
-var internalDefinitionsRoots = [
-    "compiler/core.d.ts",
-    "compiler/sys.d.ts",
-    "compiler/utilities.d.ts",
-    "compiler/commandLineParser.d.ts",
-    "services/utilities.d.ts",
-];
-
 var harnessSources = [
     "harness.ts",
     "sourceMapRecorder.ts",
@@ -354,60 +336,32 @@ var tscFile = path.join(builtLocalDirectory, compilerFilename);
 compileFile(tscFile, compilerSources, [builtLocalDirectory, copyright].concat(compilerSources), [copyright], /*useBuiltCompiler:*/ false);
 
 var servicesFile = path.join(builtLocalDirectory, "typescriptServices.js");
+var standaloneDefinitionsFile = path.join(builtLocalDirectory, "typescriptServices.d.ts");
 var nodePackageFile = path.join(builtLocalDirectory, "typescript.js");
+var nodeDefinitionsFile = path.join(builtLocalDirectory, "typescript.d.ts");
+
 compileFile(servicesFile, servicesSources,[builtLocalDirectory, copyright].concat(servicesSources),
             /*prefixes*/ [copyright],
             /*useBuiltCompiler*/ true,
             /*noOutFile*/ false,
-            /*generateDeclarations*/ false,
+            /*generateDeclarations*/ true,
             /*outDir*/ undefined,
             /*preserveConstEnums*/ true,
-            /*keepComments*/ false,
+            /*keepComments*/ true,
             /*noResolve*/ false,
-            /*stripInternal*/ false,
+            /*stripInternal*/ true,
             /*callback*/ function () { 
                 jake.cpR(servicesFile, nodePackageFile, {silent: true});
+
+                prependFile(copyright, standaloneDefinitionsFile);
+
+                // Create the node definition file by replacing 'ts' module with '"typescript"' as a module.
+                jake.cpR(standaloneDefinitionsFile, nodeDefinitionsFile, {silent: true});
+                var definitionFileContents = fs.readFileSync(nodeDefinitionsFile).toString();
+                definitionFileContents = definitionFileContents.replace(/declare module ts/g, 'declare module "typescript"');
+                fs.writeFileSync(nodeDefinitionsFile, definitionFileContents);
             });
 
-var nodeDefinitionsFile = path.join(builtLocalDirectory, "typescript.d.ts");
-var standaloneDefinitionsFile = path.join(builtLocalDirectory, "typescriptServices.d.ts");
-var internalNodeDefinitionsFile = path.join(builtLocalDirectory, "typescript_internal.d.ts");
-var internalStandaloneDefinitionsFile = path.join(builtLocalDirectory, "typescriptServices_internal.d.ts");
-var tempDirPath = path.join(builtLocalDirectory, "temptempdir");
-compileFile(nodeDefinitionsFile, servicesSources,[builtLocalDirectory, copyright].concat(servicesSources),
-            /*prefixes*/ undefined,
-            /*useBuiltCompiler*/ true,
-            /*noOutFile*/ true,
-            /*generateDeclarations*/ true,
-            /*outDir*/ tempDirPath,
-            /*preserveConstEnums*/ true,
-            /*keepComments*/ true,
-            /*noResolve*/ true,
-            /*stripInternal*/ true,
-            /*callback*/ function () {
-                function makeDefinitionFiles(definitionsRoots, standaloneDefinitionsFile, nodeDefinitionsFile) {
-                    // Create the standalone definition file
-                    concatenateFiles(standaloneDefinitionsFile, definitionsRoots.map(function (f) {
-                        return path.join(tempDirPath, f);
-                    }));
-                    prependFile(copyright, standaloneDefinitionsFile);
-
-                    // Create the node definition file by replacing 'ts' module with '"typescript"' as a module.
-                    jake.cpR(standaloneDefinitionsFile, nodeDefinitionsFile, {silent: true});
-                    var definitionFileContents = fs.readFileSync(nodeDefinitionsFile).toString();
-                    definitionFileContents = definitionFileContents.replace(/declare module ts/g, 'declare module "typescript"');
-                    fs.writeFileSync(nodeDefinitionsFile, definitionFileContents);
-                }
-
-                // Create the public definition files
-                makeDefinitionFiles(definitionsRoots, standaloneDefinitionsFile, nodeDefinitionsFile);
-                
-                // Create the internal definition files
-                makeDefinitionFiles(internalDefinitionsRoots, internalStandaloneDefinitionsFile, internalNodeDefinitionsFile);
-
-                // Delete the temp dir
-                jake.rmRf(tempDirPath, {silent: true});
-           });
 
 var serverFile = path.join(builtLocalDirectory, "tsserver.js");
 compileFile(serverFile, serverSources,[builtLocalDirectory, copyright].concat(serverSources), /*prefixes*/ [copyright], /*useBuiltCompiler*/ true);