Merge pull request #3543 from ncave/build

Move build/Build project to src/Fable.Build

build.bat

@@ -1,4 +1,4 @@
 @echo off
 
 dotnet tool restore
-dotnet run --project build/Build.fsproj -- %*
+dotnet run --project src/Fable.Build/Fable.Build.fsproj -- %*

build.sh

@@ -1,4 +1,4 @@
 #!/bin/sh -x
 
 dotnet tool restore
-dotnet run --project build/Build.fsproj -- $@
+dotnet run --project src/Fable.Build/Fable.Build.fsproj -- $@

package.json

@@ -7,9 +7,9 @@
     "rollup": "rollup",
     "terser": "terser",
     "tslint": "tslint",
-    "build": "dotnet run --project build/Build.fsproj",
-    "publish": "dotnet run --project build/Build.fsproj publish",
-    "test": "dotnet run --project build/Build.fsproj test",
+    "build": "dotnet run --project src/Fable.Build/Fable.Build.fsproj",
+    "publish": "dotnet run --project src/Fable.Build/Fable.Build.fsproj publish",
+    "test": "dotnet run --project src/Fable.Build/Fable.Build.fsproj test",
     "build-compiler-js": "dotnet fable src/fable-compiler-js/src/fable-compiler-js.fsproj -o build/fable-compiler-js/out",
     "postbuild-compiler-js": "rollup build/fable-compiler-js/out/app.js --file src/fable-compiler-js/dist/app.js --format umd --name Fable",
     "minify-compiler-js": "terser src/fable-compiler-js/dist/app.js -o src/fable-compiler-js/dist/app.min.js --mangle --compress",

build/FcsRepo.fs → src/Fable.Build/FcsRepo.fs

@@ -6,7 +6,7 @@ open Build.Utils
 [<Literal>]
 let FCS_REPO = "https://github.com/ncave/fsharp"
 
-let FCS_REPO_LOCAL = Path.Resolve("../fsharp_fable")
+let FCS_REPO_LOCAL = Path.Resolve("../../../fsharp_fable")
 
 [<Literal>]
 let FCS_REPO_FABLE_BRANCH = "fable"

build/SimpleExec.Extensions.fs → src/Fable.Build/SimpleExec.Extensions.fs

@@ -14,7 +14,7 @@ type Command with
             ?echoPrefix
         ) =
         let localFableDir =
-            __SOURCE_DIRECTORY__ </> ".." </> "src" </> "Fable.Cli"
+            __SOURCE_DIRECTORY__ </> ".." </> "Fable.Cli"
 
         let args =
             CmdLine.concat [
@@ -45,7 +45,7 @@ type Command with
             ?echoPrefix
         ) =
         let localFableDir =
-            __SOURCE_DIRECTORY__ </> ".." </> "src" </> "Fable.Cli"
+            __SOURCE_DIRECTORY__ </> ".." </> "Fable.Cli"
 
         let argsBuilder = defaultArg argsBuilder id
 
@@ -74,7 +74,7 @@ type Command with
             ?echoPrefix
         ) =
         let localFableDir =
-            __SOURCE_DIRECTORY__ </> ".." </> "src" </> "Fable.Cli"
+            __SOURCE_DIRECTORY__ </> ".." </> "Fable.Cli"
 
         let argsBuilder =
             CmdLine.empty
@@ -101,7 +101,7 @@ type Command with
             ?echoPrefix
         ) =
         let localFableDir =
-            __SOURCE_DIRECTORY__ </> ".." </> "src" </> "Fable.Cli"
+            __SOURCE_DIRECTORY__ </> ".." </> "Fable.Cli"
 
         let argsBuilder =
             CmdLine.empty
@@ -130,7 +130,7 @@ type Command with
             ?echoPrefix
         ) =
         let localFableDir =
-            __SOURCE_DIRECTORY__ </> ".." </> "src" </> "Fable.Cli"
+            __SOURCE_DIRECTORY__ </> ".." </> "Fable.Cli"
 
         let args =
             CmdLine.concat [

build/Utils.fs → src/Fable.Build/Utils.fs

@@ -15,7 +15,7 @@ type Path =
     /// Resolve a path relative to the repository root
     /// </summary>
     static member Resolve([<ParamArray>] segments: string array) : string =
-        let paths = Array.concat [ [| __SOURCE_DIRECTORY__; ".." |]; segments ]
+        let paths = Array.concat [ [| __SOURCE_DIRECTORY__; ".."; ".." |]; segments ]
 
         // Use GetFullPath to clean the path
         Path.GetFullPath(Path.Combine(paths))
@@ -39,7 +39,7 @@ type Cmd =
         let argsBuilder = defaultArg argsBuilder id
         // Use absolute path so we can invoke the command from anywhere
         let localFableDir =
-            __SOURCE_DIRECTORY__ </> ".." </> "src" </> "Fable.Cli"
+            __SOURCE_DIRECTORY__ </> ".." </> "Fable.Cli"
 
         let watchMode = defaultArg watchMode false