@@ -373,9 +373,34 @@ task("lint").flags = {
373
373
" --f[iles]=<regex>" : "pattern to match files to lint" ,
374
374
} ;
375
375
376
+ const buildCancellationToken = ( ) => buildProject ( "src/cancellationToken" ) ;
377
+ const cleanCancellationToken = ( ) => cleanProject ( "src/cancellationToken" ) ;
378
+ cleanTasks . push ( cleanCancellationToken ) ;
379
+
380
+ const buildTypingsInstaller = ( ) => buildProject ( "src/typingsInstaller" ) ;
381
+ const cleanTypingsInstaller = ( ) => cleanProject ( "src/typingsInstaller" ) ;
382
+ cleanTasks . push ( cleanTypingsInstaller ) ;
383
+
384
+ const buildWatchGuard = ( ) => buildProject ( "src/watchGuard" ) ;
385
+ const cleanWatchGuard = ( ) => cleanProject ( "src/watchGuard" ) ;
386
+ cleanTasks . push ( cleanWatchGuard ) ;
387
+
388
+ const generateTypesMap = ( ) => src ( "src/server/typesMap.json" )
389
+ . pipe ( newer ( "built/local/typesMap.json" ) )
390
+ . pipe ( transform ( contents => ( JSON . parse ( contents ) , contents ) ) ) // validates typesMap.json is valid JSON
391
+ . pipe ( dest ( "built/local" ) ) ;
392
+ task ( "generate-types-map" , generateTypesMap ) ;
393
+
394
+ const cleanTypesMap = ( ) => del ( "built/local/typesMap.json" ) ;
395
+ cleanTasks . push ( cleanTypesMap ) ;
396
+
397
+ const buildOtherOutputs = parallel ( buildCancellationToken , buildTypingsInstaller , buildWatchGuard , generateTypesMap ) ;
398
+ task ( "other-outputs" , series ( preBuild , buildOtherOutputs ) ) ;
399
+ task ( "other-outputs" ) . description = "Builds miscelaneous scripts and documents distributed with the LKG" ;
400
+
376
401
const buildFoldStart = async ( ) => { if ( fold . isTravis ( ) ) console . log ( fold . start ( "build" ) ) ; } ;
377
402
const buildFoldEnd = async ( ) => { if ( fold . isTravis ( ) ) console . log ( fold . end ( "build" ) ) ; } ;
378
- task ( "local" , series ( buildFoldStart , preBuild , parallel ( localize , buildTsc , buildServer , buildServices , buildLssl ) , buildFoldEnd ) ) ;
403
+ task ( "local" , series ( buildFoldStart , preBuild , parallel ( localize , buildTsc , buildServer , buildServices , buildLssl , buildOtherOutputs ) , buildFoldEnd ) ) ;
379
404
task ( "local" ) . description = "Builds the full compiler and services" ;
380
405
task ( "local" ) . flags = {
381
406
" --built" : "Compile using the built version of the compiler."
@@ -551,28 +576,6 @@ const buildReleaseTsc = () => buildProject("src/tsc/tsconfig.release.json");
551
576
const cleanReleaseTsc = ( ) => cleanProject ( "src/tsc/tsconfig.release.json" ) ;
552
577
cleanTasks . push ( cleanReleaseTsc ) ;
553
578
554
- const buildCancellationToken = ( ) => buildProject ( "src/cancellationToken" ) ;
555
- const cleanCancellationToken = ( ) => cleanProject ( "src/cancellationToken" ) ;
556
- cleanTasks . push ( cleanCancellationToken ) ;
557
-
558
- const buildTypingsInstaller = ( ) => buildProject ( "src/typingsInstaller" ) ;
559
- const cleanTypingsInstaller = ( ) => cleanProject ( "src/typingsInstaller" ) ;
560
- cleanTasks . push ( cleanTypingsInstaller ) ;
561
-
562
- const buildWatchGuard = ( ) => buildProject ( "src/watchGuard" ) ;
563
- const cleanWatchGuard = ( ) => cleanProject ( "src/watchGuard" ) ;
564
- cleanTasks . push ( cleanWatchGuard ) ;
565
-
566
- // TODO(rbuckton): This task isn't triggered by any other task. Is it still needed?
567
- const generateTypesMap = ( ) => src ( "src/server/typesMap.json" )
568
- . pipe ( newer ( "built/local/typesMap.json" ) )
569
- . pipe ( transform ( contents => ( JSON . parse ( contents ) , contents ) ) ) // validates typesMap.json is valid JSON
570
- . pipe ( dest ( "built/local" ) ) ;
571
- task ( "generate-types-map" , generateTypesMap ) ;
572
-
573
- const cleanTypesMap = ( ) => del ( "built/local/typesMap.json" ) ;
574
- cleanTasks . push ( cleanTypesMap ) ;
575
-
576
579
const cleanBuilt = ( ) => del ( "built" ) ;
577
580
578
581
const produceLKG = async ( ) => {
@@ -602,7 +605,7 @@ const produceLKG = async () => {
602
605
}
603
606
} ;
604
607
605
- task ( "LKG" , series ( lkgPreBuild , parallel ( localize , buildTsc , buildServer , buildServices , buildLssl , buildCancellationToken , buildTypingsInstaller , buildWatchGuard , buildReleaseTsc ) , produceLKG ) ) ;
608
+ task ( "LKG" , series ( lkgPreBuild , parallel ( localize , buildTsc , buildServer , buildServices , buildLssl , buildOtherOutputs , buildReleaseTsc ) , produceLKG ) ) ;
606
609
task ( "LKG" ) . description = "Makes a new LKG out of the built js files" ;
607
610
task ( "LKG" ) . flags = {
608
611
" --built" : "Compile using the built version of the compiler." ,
0 commit comments