diff --git a/build.bat b/build.bat index 206327a3e3..1b446493e8 100644 --- a/build.bat +++ b/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 -- %* diff --git a/build.sh b/build.sh index 546c1de0e3..807a756d27 100755 --- a/build.sh +++ b/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 -- $@ diff --git a/package.json b/package.json index ae36886e8b..e7ed158e48 100644 --- a/package.json +++ b/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", diff --git a/build/Build.fsproj b/src/Fable.Build/Fable.Build.fsproj similarity index 100% rename from build/Build.fsproj rename to src/Fable.Build/Fable.Build.fsproj diff --git a/build/FableLibrary/Core.fs b/src/Fable.Build/FableLibrary/Core.fs similarity index 100% rename from build/FableLibrary/Core.fs rename to src/Fable.Build/FableLibrary/Core.fs diff --git a/build/FableLibrary/Dart.fs b/src/Fable.Build/FableLibrary/Dart.fs similarity index 100% rename from build/FableLibrary/Dart.fs rename to src/Fable.Build/FableLibrary/Dart.fs diff --git a/build/FableLibrary/JavaScript.fs b/src/Fable.Build/FableLibrary/JavaScript.fs similarity index 100% rename from build/FableLibrary/JavaScript.fs rename to src/Fable.Build/FableLibrary/JavaScript.fs diff --git a/build/FableLibrary/Python.fs b/src/Fable.Build/FableLibrary/Python.fs similarity index 100% rename from build/FableLibrary/Python.fs rename to src/Fable.Build/FableLibrary/Python.fs diff --git a/build/FableLibrary/Rust.fs b/src/Fable.Build/FableLibrary/Rust.fs similarity index 100% rename from build/FableLibrary/Rust.fs rename to src/Fable.Build/FableLibrary/Rust.fs diff --git a/build/FableLibrary/TypeScript.fs b/src/Fable.Build/FableLibrary/TypeScript.fs similarity index 100% rename from build/FableLibrary/TypeScript.fs rename to src/Fable.Build/FableLibrary/TypeScript.fs diff --git a/build/FcsRepo.fs b/src/Fable.Build/FcsRepo.fs similarity index 96% rename from build/FcsRepo.fs rename to src/Fable.Build/FcsRepo.fs index c9efdc5d81..0b9cd3f0ee 100644 --- a/build/FcsRepo.fs +++ b/src/Fable.Build/FcsRepo.fs @@ -6,7 +6,7 @@ open Build.Utils [] let FCS_REPO = "https://github.com/ncave/fsharp" -let FCS_REPO_LOCAL = Path.Resolve("../fsharp_fable") +let FCS_REPO_LOCAL = Path.Resolve("../../../fsharp_fable") [] let FCS_REPO_FABLE_BRANCH = "fable" diff --git a/build/GithubRelease.fs b/src/Fable.Build/GithubRelease.fs similarity index 100% rename from build/GithubRelease.fs rename to src/Fable.Build/GithubRelease.fs diff --git a/build/Main.fs b/src/Fable.Build/Main.fs similarity index 100% rename from build/Main.fs rename to src/Fable.Build/Main.fs diff --git a/build/Publish.fs b/src/Fable.Build/Publish.fs similarity index 100% rename from build/Publish.fs rename to src/Fable.Build/Publish.fs diff --git a/build/Quicktest/Core.fs b/src/Fable.Build/Quicktest/Core.fs similarity index 100% rename from build/Quicktest/Core.fs rename to src/Fable.Build/Quicktest/Core.fs diff --git a/build/Quicktest/Dart.fs b/src/Fable.Build/Quicktest/Dart.fs similarity index 100% rename from build/Quicktest/Dart.fs rename to src/Fable.Build/Quicktest/Dart.fs diff --git a/build/Quicktest/JavaScript.fs b/src/Fable.Build/Quicktest/JavaScript.fs similarity index 100% rename from build/Quicktest/JavaScript.fs rename to src/Fable.Build/Quicktest/JavaScript.fs diff --git a/build/Quicktest/Python.fs b/src/Fable.Build/Quicktest/Python.fs similarity index 100% rename from build/Quicktest/Python.fs rename to src/Fable.Build/Quicktest/Python.fs diff --git a/build/Quicktest/Rust.fs b/src/Fable.Build/Quicktest/Rust.fs similarity index 100% rename from build/Quicktest/Rust.fs rename to src/Fable.Build/Quicktest/Rust.fs diff --git a/build/Quicktest/TypeScript.fs b/src/Fable.Build/Quicktest/TypeScript.fs similarity index 100% rename from build/Quicktest/TypeScript.fs rename to src/Fable.Build/Quicktest/TypeScript.fs diff --git a/build/SimpleExec.Extensions.fs b/src/Fable.Build/SimpleExec.Extensions.fs similarity index 91% rename from build/SimpleExec.Extensions.fs rename to src/Fable.Build/SimpleExec.Extensions.fs index a7fe7ee6f4..df1f6b8924 100644 --- a/build/SimpleExec.Extensions.fs +++ b/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 [ diff --git a/build/Standalone.fs b/src/Fable.Build/Standalone.fs similarity index 100% rename from build/Standalone.fs rename to src/Fable.Build/Standalone.fs diff --git a/build/Test/Dart.fs b/src/Fable.Build/Test/Dart.fs similarity index 100% rename from build/Test/Dart.fs rename to src/Fable.Build/Test/Dart.fs diff --git a/build/Test/Integration.fs b/src/Fable.Build/Test/Integration.fs similarity index 100% rename from build/Test/Integration.fs rename to src/Fable.Build/Test/Integration.fs diff --git a/build/Test/JavaScript.fs b/src/Fable.Build/Test/JavaScript.fs similarity index 100% rename from build/Test/JavaScript.fs rename to src/Fable.Build/Test/JavaScript.fs diff --git a/build/Test/Python.fs b/src/Fable.Build/Test/Python.fs similarity index 100% rename from build/Test/Python.fs rename to src/Fable.Build/Test/Python.fs diff --git a/build/Test/Rust.fs b/src/Fable.Build/Test/Rust.fs similarity index 100% rename from build/Test/Rust.fs rename to src/Fable.Build/Test/Rust.fs diff --git a/build/Test/Standalone.fs b/src/Fable.Build/Test/Standalone.fs similarity index 100% rename from build/Test/Standalone.fs rename to src/Fable.Build/Test/Standalone.fs diff --git a/build/Test/TypeScript.fs b/src/Fable.Build/Test/TypeScript.fs similarity index 100% rename from build/Test/TypeScript.fs rename to src/Fable.Build/Test/TypeScript.fs diff --git a/build/Utils.fs b/src/Fable.Build/Utils.fs similarity index 97% rename from build/Utils.fs rename to src/Fable.Build/Utils.fs index d6892b5404..d8308e8a71 100644 --- a/build/Utils.fs +++ b/src/Fable.Build/Utils.fs @@ -15,7 +15,7 @@ type Path = /// Resolve a path relative to the repository root /// static member Resolve([] 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 diff --git a/build/Utils/Changelog.fs b/src/Fable.Build/Utils/Changelog.fs similarity index 100% rename from build/Utils/Changelog.fs rename to src/Fable.Build/Utils/Changelog.fs diff --git a/build/Utils/ChangelogParser.fs b/src/Fable.Build/Utils/ChangelogParser.fs similarity index 100% rename from build/Utils/ChangelogParser.fs rename to src/Fable.Build/Utils/ChangelogParser.fs diff --git a/build/Utils/Fsproj.fs b/src/Fable.Build/Utils/Fsproj.fs similarity index 100% rename from build/Utils/Fsproj.fs rename to src/Fable.Build/Utils/Fsproj.fs diff --git a/build/Utils/Npm.fs b/src/Fable.Build/Utils/Npm.fs similarity index 100% rename from build/Utils/Npm.fs rename to src/Fable.Build/Utils/Npm.fs diff --git a/build/Utils/Nuget.fs b/src/Fable.Build/Utils/Nuget.fs similarity index 100% rename from build/Utils/Nuget.fs rename to src/Fable.Build/Utils/Nuget.fs diff --git a/build/Workspace.fs b/src/Fable.Build/Workspace.fs similarity index 100% rename from build/Workspace.fs rename to src/Fable.Build/Workspace.fs