Skip to content

Commit 2275a49

Browse files
committed
Fix lssl task
1 parent e9240a8 commit 2275a49

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

Gulpfile.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ gulp.task(tsserverLibraryFile, false, [servicesFile], (done) => {
450450
});
451451

452452
gulp.task("lssl", "Builds language service server library", [tsserverLibraryFile]);
453-
gulp.task("local", "Builds the full compiler and services", [builtLocalCompiler, servicesFile, serverFile, builtGeneratedDiagnosticMessagesJSON]);
453+
gulp.task("local", "Builds the full compiler and services", [builtLocalCompiler, servicesFile, serverFile, builtGeneratedDiagnosticMessagesJSON, tsserverLibraryFile]);
454454
gulp.task("tsc", "Builds only the compiler", [builtLocalCompiler]);
455455

456456

@@ -504,7 +504,7 @@ gulp.task("VerifyLKG", false, [], () => {
504504
return gulp.src(expectedFiles).pipe(gulp.dest(LKGDirectory));
505505
});
506506

507-
gulp.task("LKGInternal", false, ["lib", "local", "lssl"]);
507+
gulp.task("LKGInternal", false, ["lib", "local"]);
508508

509509
gulp.task("LKG", "Makes a new LKG out of the built js files", ["clean", "dontUseDebugMode"], () => {
510510
return runSequence("LKGInternal", "VerifyLKG");

Jakefile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ var tsserverLibraryDefinitionFile = path.join(builtLocalDirectory, "tsserverlibr
551551
compileFile(
552552
tsserverLibraryFile,
553553
languageServiceLibrarySources,
554-
[builtLocalDirectory, copyright].concat(languageServiceLibrarySources),
554+
[builtLocalDirectory, copyright, builtLocalCompiler].concat(languageServiceLibrarySources).concat(libraryTargets),
555555
/*prefixes*/ [copyright],
556556
/*useBuiltCompiler*/ true,
557557
{ noOutFile: false, generateDeclarations: true });
@@ -562,7 +562,7 @@ task("lssl", [tsserverLibraryFile, tsserverLibraryDefinitionFile]);
562562

563563
// Local target to build the compiler and services
564564
desc("Builds the full compiler and services");
565-
task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile, builtGeneratedDiagnosticMessagesJSON]);
565+
task("local", ["generate-diagnostics", "lib", tscFile, servicesFile, nodeDefinitionsFile, serverFile, builtGeneratedDiagnosticMessagesJSON, "lssl"]);
566566

567567
// Local target to build only tsc.js
568568
desc("Builds only the compiler");
@@ -617,7 +617,7 @@ task("generate-spec", [specMd]);
617617

618618
// Makes a new LKG. This target does not build anything, but errors if not all the outputs are present in the built/local directory
619619
desc("Makes a new LKG out of the built js files");
620-
task("LKG", ["clean", "release", "local", "lssl"].concat(libraryTargets), function() {
620+
task("LKG", ["clean", "release", "local"].concat(libraryTargets), function() {
621621
var expectedFiles = [tscFile, servicesFile, serverFile, nodePackageFile, nodeDefinitionsFile, standaloneDefinitionsFile, tsserverLibraryFile, tsserverLibraryDefinitionFile].concat(libraryTargets);
622622
var missingFiles = expectedFiles.filter(function (f) {
623623
return !fs.existsSync(f);

src/server/tsconfig.library.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"types": []
1111
},
1212
"files": [
13+
"../services/shims.ts",
14+
"../services/utilities.ts",
1315
"editorServices.ts",
1416
"protocol.d.ts",
1517
"session.ts"

0 commit comments

Comments
 (0)