Skip to content

Commit a0c532a

Browse files
committed
Move the whole project to scripts for easier running and testing. Add tests in the build script.
1 parent b371cda commit a0c532a

File tree

11 files changed

+33
-199
lines changed

11 files changed

+33
-199
lines changed

App.config

Lines changed: 0 additions & 14 deletions
This file was deleted.

AssemblyInfo.fs

Lines changed: 0 additions & 41 deletions
This file was deleted.

Generator.fsproj

Lines changed: 0 additions & 88 deletions
This file was deleted.

Generator.sln

Lines changed: 0 additions & 22 deletions
This file was deleted.

JS.fs renamed to JS.fsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module JS
1+
#load "Shared.fsx"
22

33
open System
44
open System.IO
@@ -691,6 +691,7 @@ let EmitTheWholeThing flavor (target: TextWriter) =
691691

692692
fprintf target "%s" content
693693
target.Flush()
694+
target.Close()
694695

695696
let EmitDomWeb () =
696697
EmitTheWholeThing Flavor.Web GlobalVars.jsWebOutput

Program.fs

Lines changed: 0 additions & 10 deletions
This file was deleted.

Shared.fs renamed to Shared.fsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
module Shared
1+
#r @"packages\FSharp.Data\lib\net40\FSharp.Data.dll"
2+
#r "System.Xml.Linq.dll"
23

34
open FSharp.Data
45
open System.IO

TS.fs renamed to TS.fsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module TS
1+
#load "Shared.fsx"
22

33
open System
44
open System.Text.RegularExpressions
@@ -578,6 +578,7 @@ let EmitTheWholeThing flavor (target:TextWriter) =
578578

579579
fprintf target "%s" (Pt.getResult())
580580
target.Flush()
581+
target.Close()
581582

582583
let EmitDomWeb () =
583584
EmitTheWholeThing Flavor.All GlobalVars.tsWebOutput

build.cmd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,3 @@ if not exist paket.lock (
2222

2323
@echo "Building..."
2424
packages\FAKE\tools\FAKE.exe %* --fsiargs build.fsx
25-
26-
.\bin\Generator.exe

build.fsx

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,36 @@
11
#r "packages/FAKE/tools/FakeLib.dll"
2-
open Fake
2+
#load "Shared.fsx"
3+
#load "TS.fsx"
4+
#load "JS.fsx"
35

4-
let buildDir = "./bin"
6+
open Fake
7+
open TS
8+
open JS
9+
open System.IO
510

6-
Target "Clean" (fun _ ->
7-
CleanDir buildDir
11+
Target "Run" (fun _ ->
12+
JS.EmitDomWeb()
13+
JS.EmitDomWin()
14+
JS.EmitDomWorker()
15+
// For typescript only generate for Dom
16+
TS.EmitDomWeb()
17+
TS.EmitDomWorker()
818
)
919

10-
Target "Build" (fun _ ->
11-
!! "Generator.fsproj"
12-
|> MSBuildRelease buildDir "Build"
13-
|> Log "Build output: "
14-
)
20+
let testFile file =
21+
let baseline = "./baselines/" + file
22+
let newFile = "./generated/" + file
23+
if FilesAreEqual (FileInfo baseline) (FileInfo newFile) then
24+
tracefn "Test passed: %s." newFile
25+
else
26+
traceError (sprintf "Test failed: %s is different from baseline file." newFile)
1527

16-
Target "DoneBuilding" (fun _ ->
17-
trace "Done building."
28+
Target "Test" (fun _ ->
29+
Directory.GetFiles("./baselines")
30+
|> Array.map Path.GetFileName
31+
|> Array.iter testFile
1832
)
1933

20-
"Clean"
21-
==> "Build"
22-
==> "DoneBuilding"
34+
"Run" ==> "Test"
2335

24-
RunTargetOrDefault "DoneBuilding"
36+
RunTargetOrDefault "Test"

packages.config

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)