@@ -29,7 +29,8 @@ var thirdParty = "ThirdPartyNoticeText.txt";
2929var nodeModulesPathPrefix = path . resolve ( "./node_modules/.bin/" ) + path . delimiter ;
3030if ( process . env . path !== undefined ) {
3131 process . env . path = nodeModulesPathPrefix + process . env . path ;
32- } else if ( process . env . PATH !== undefined ) {
32+ }
33+ else if ( process . env . PATH !== undefined ) {
3334 process . env . PATH = nodeModulesPathPrefix + process . env . PATH ;
3435}
3536
@@ -312,13 +313,15 @@ function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts
312313 if ( useDebugMode ) {
313314 if ( opts . inlineSourceMap ) {
314315 options += " --inlineSourceMap --inlineSources" ;
315- } else {
316+ }
317+ else {
316318 options += " -sourcemap" ;
317319 if ( ! opts . noMapRoot ) {
318320 options += " -mapRoot file:///" + path . resolve ( path . dirname ( outFile ) ) ;
319321 }
320322 }
321- } else {
323+ }
324+ else {
322325 options += " --newLine LF" ;
323326 }
324327
@@ -748,7 +751,8 @@ function exec(cmd, completeHandler, errorHandler) {
748751 ex . addListener ( "error" , function ( e , status ) {
749752 if ( errorHandler ) {
750753 errorHandler ( e , status ) ;
751- } else {
754+ }
755+ else {
752756 fail ( "Process exited with code " + status ) ;
753757 }
754758 } ) ;
@@ -1006,21 +1010,32 @@ task("baseline-accept", function () {
10061010
10071011function acceptBaseline ( sourceFolder , targetFolder ) {
10081012 console . log ( 'Accept baselines from ' + sourceFolder + ' to ' + targetFolder ) ;
1009- var files = fs . readdirSync ( sourceFolder ) ;
10101013 var deleteEnding = '.delete' ;
1011- for ( var i in files ) {
1012- var filename = files [ i ] ;
1013- var fullLocalPath = path . join ( sourceFolder , filename ) ;
1014- if ( fs . statSync ( fullLocalPath ) . isFile ( ) ) {
1015- if ( filename . substr ( filename . length - deleteEnding . length ) === deleteEnding ) {
1016- filename = filename . substr ( 0 , filename . length - deleteEnding . length ) ;
1017- fs . unlinkSync ( path . join ( targetFolder , filename ) ) ;
1018- } else {
1019- var target = path . join ( targetFolder , filename ) ;
1020- if ( fs . existsSync ( target ) ) {
1021- fs . unlinkSync ( target ) ;
1014+
1015+ acceptBaselineFolder ( sourceFolder , targetFolder ) ;
1016+
1017+ function acceptBaselineFolder ( sourceFolder , targetFolder ) {
1018+ var files = fs . readdirSync ( sourceFolder ) ;
1019+
1020+ for ( var i in files ) {
1021+ var filename = files [ i ] ;
1022+ var fullLocalPath = path . join ( sourceFolder , filename ) ;
1023+ var stat = fs . statSync ( fullLocalPath ) ;
1024+ if ( stat . isFile ( ) ) {
1025+ if ( filename . substr ( filename . length - deleteEnding . length ) === deleteEnding ) {
1026+ filename = filename . substr ( 0 , filename . length - deleteEnding . length ) ;
1027+ fs . unlinkSync ( path . join ( targetFolder , filename ) ) ;
1028+ }
1029+ else {
1030+ var target = path . join ( targetFolder , filename ) ;
1031+ if ( fs . existsSync ( target ) ) {
1032+ fs . unlinkSync ( target ) ;
1033+ }
1034+ fs . renameSync ( path . join ( sourceFolder , filename ) , target ) ;
10221035 }
1023- fs . renameSync ( path . join ( sourceFolder , filename ) , target ) ;
1036+ }
1037+ else if ( stat . isDirectory ( ) ) {
1038+ acceptBaselineFolder ( fullLocalPath , path . join ( targetFolder , filename ) ) ;
10241039 }
10251040 }
10261041 }
0 commit comments