From 9061e58dffbeaf3f72cee1c6ca6d8fc0b98b1ea5 Mon Sep 17 00:00:00 2001 From: Mohamed Hegazy Date: Fri, 25 Jul 2014 12:32:24 -0700 Subject: [PATCH] Change services output file name to typescriptservices.js --- Jakefile | 2 +- src/harness/harness.ts | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Jakefile b/Jakefile index 7a8ee59d532..f8d7f15e7a6 100644 --- a/Jakefile +++ b/Jakefile @@ -233,7 +233,7 @@ task("generate-diagnostics", [diagnosticInfoMapTs]) var tcFile = path.join(builtLocalDirectory, "tc.js"); compileFile(tcFile, compilerSources, [builtLocalDirectory, copyright].concat(compilerSources), [copyright], /*useBuiltCompiler:*/ false); -var tcServicesFile = path.join(builtLocalDirectory, "services.js"); +var tcServicesFile = path.join(builtLocalDirectory, "typescriptservices.js"); compileFile(tcServicesFile, servicesSources, [builtLocalDirectory, copyright].concat(servicesSources), [copyright], /*useBuiltCompiler:*/ true); // Local target to build the compiler and services diff --git a/src/harness/harness.ts b/src/harness/harness.ts index 4611b90e80e..f90d096f536 100644 --- a/src/harness/harness.ts +++ b/src/harness/harness.ts @@ -429,25 +429,21 @@ module Harness { module Harness { - var typescriptServiceFileName = "typescriptServices.js"; - // Services files are exported because we need to eval them at global scope in order for them to be available everywhere - export var typescriptServiceFile: string; - - var tcServicesFilename = "services.js"; + var tcServicesFilename = "typescriptServices.js"; export var libFolder: string; switch (Utils.getExecutionEnvironment()) { case Utils.ExecutionEnvironment.CScript: libFolder = Path.filePath(global['WScript'].ScriptFullName); - tcServicesFilename = "built/local/services.js"; + tcServicesFilename = "built/local/typescriptServices.js"; break; case Utils.ExecutionEnvironment.Node: libFolder = (__dirname + '/'); - tcServicesFilename = "built/local/services.js"; + tcServicesFilename = "built/local/typescriptServices.js"; break; case Utils.ExecutionEnvironment.Browser: libFolder = "bin/"; - tcServicesFilename = "built/local/services.js"; + tcServicesFilename = "built/local/typescriptServices.js"; break; default: throw new Error('Unknown context');