Fix standalone fable-library folder for local test

fable-compiler · Sep 28, 2023 · df3adb1 · df3adb1
1 parent 97e70de
commit df3adb1
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "preLaunchTask": "build",
             "program": "${workspaceFolder}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
             // "args": ["watch", "--cwd", "src/quicktest", "--exclude", "Fable.Core", "--noCache", "--runScript"],
-            "args": ["src/fable-library", "--outDir", "build/fable-library-ts", "--fableLib", "build/fable-library-ts", "--lang", "TypeScript", "--typedArrays", "false", "--exclude", "Fable.Core", "--define", "FX_NO_BIGINT", "--define", "FABLE_LIBRARY"],
+            "args": ["src/fable-library", "--outDir", "temp/fable-library-ts", "--fableLib", "temp/fable-library-ts", "--lang", "TypeScript", "--typedArrays", "false", "--exclude", "Fable.Core", "--define", "FX_NO_BIGINT", "--define", "FABLE_LIBRARY"],
             "cwd": "${workspaceFolder}",
             "stopAtEntry": true,
             "console": "internalConsole"
@@ -37,7 +37,7 @@
         },
         {
             "args": [
-                "${workspaceFolder}/build/tests",
+                "${workspaceFolder}/temp/tests",
                 "--reporter",
                 "dot",
                 "--timeout",
@@ -54,7 +54,7 @@
         },
         {
             "args": [
-                "${workspaceFolder}/build/tests/TypeScriptCompiled/build/tests/TypeScript",
+                "${workspaceFolder}/temp/tests/TypeScriptCompiled/build/tests/TypeScript",
                 "--reporter",
                 "dot",
                 "--timeout",
@@ -118,8 +118,8 @@
             "type": "node",
             "request": "launch",
             "name": "Run compiler-js",
-            "program": "${workspaceRoot}/build/fable-compiler-js/src/fable-compiler-js/dist/app.js",
-            "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "build/tests-js"],
+            "program": "${workspaceRoot}/temp/fable-compiler-js/src/fable-compiler-js/dist/app.js",
+            "args": ["${workspaceRoot}/tests/Main/Fable.Tests.fsproj", "temp/tests-js"],
             "stopOnEntry": true
         },
         {
@@ -128,7 +128,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             "program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
-            "args": ["--outDir", "${workspaceRoot}/../fable-test", "--fableLib", "../../Fable/build/fable-library-rust", "--exclude", "Fable.Core", "--lang", "Rust", "--noCache"],
+            "args": ["--outDir", "${workspaceRoot}/../fable-test", "--fableLib", "../../Fable/temp/fable-library-rust", "--exclude", "Fable.Core", "--lang", "Rust", "--noCache"],
             "cwd": "${workspaceRoot}/../fable-test",
             "stopAtEntry": false,
             "console": "internalConsole"
@@ -150,7 +150,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             "program": "${workspaceRoot}/src/Fable.Cli/bin/Debug/net6.0/fable.dll",
-            "args": ["--outDir", "${workspaceRoot}/build/fable-library-rust/src", "--fableLib", ".", "--exclude", "Fable.Core", "--lang", "Rust", "--noCache", "--define", "FABLE_LIBRARY"],
+            "args": ["--outDir", "${workspaceRoot}/temp/fable-library-rust/src", "--fableLib", ".", "--exclude", "Fable.Core", "--lang", "Rust", "--noCache", "--define", "FABLE_LIBRARY"],
             "cwd": "${workspaceRoot}/src/fable-library-rust/src",
             "stopAtEntry": false,
             "console": "internalConsole"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -24,8 +24,8 @@
         "src/fcs-fable"
     ],
     "rust-analyzer.linkedProjects": [
-        "build/fable-library-rust/Cargo.toml",
-        "build/tests/Rust/Cargo.toml"
+        "temp/fable-library-rust/Cargo.toml",
+        "temp/tests/Rust/Cargo.toml"
     ],
     "editor.inlayHints.enabled": "offUnlessPressed",
     "dotnet.defaultSolution": "disable"

diff --git a/src/Fable.Cli/Properties/launchSettings.json b/src/Fable.Cli/Properties/launchSettings.json
@@ -5,14 +5,14 @@
       "workingDirectory": "../..",
 
       // fable-library-ts
-      // "commandLineArgs": "src/fable-library --outDir build/fable-library-ts --fableLib build/fable-library-ts --lang TypeScript --typedArrays false --exclude Fable.Core --define FX_NO_BIGINT --define FABLE_LIBRARY --noCache"
+      // "commandLineArgs": "src/fable-library --outDir temp/fable-library-ts --fableLib temp/fable-library-ts --lang TypeScript --typedArrays false --exclude Fable.Core --define FX_NO_BIGINT --define FABLE_LIBRARY --noCache"
 
       // test-ts
-      //"commandLineArgs": "tests/TypeScript --outDir build/tests/TypeScript --lang TypeScript --exclude Fable.Core --noCache",
+      //"commandLineArgs": "tests/TypeScript --outDir temp/tests/TypeScript --lang TypeScript --exclude Fable.Core --noCache",
 
       // quicktest-ts
       "commandLineArgs": "src/quicktest --lang TypeScript --exclude Fable.Core --noCache"
 
     }
   }
-}
+}
diff --git a/src/fable-compiler-js/src/app.fs b/src/fable-compiler-js/src/app.fs
@@ -14,7 +14,7 @@ let inline getCurrentFilePath() = fileURLToPath(importMetaUrl())
 
 let currentDirName = getCurrentFilePath() |> dirname
 let getMetadataDir(): string = join currentDirName "../../fable-metadata/lib/"
-let getFableLibDir(): string = join currentDirName "../../../build/fable-library/"
+let getFableLibDir(): string = join currentDirName "../../../temp/fable-library/"
 let getVersion(): string = ".next"
 let initFable (): Fable.Standalone.IFableManager = import "init" "../../fable-standalone/src/Main.fs.js"
 #else

diff --git a/src/fable-standalone/test/bench-compiler/app.fs b/src/fable-standalone/test/bench-compiler/app.fs
@@ -4,7 +4,7 @@ open Fable.Compiler.Platform
 open Fable.Compiler.ProjectParser
 
 let getMetadataDir(): string = __SOURCE_DIRECTORY__ + "/../../../fable-metadata/lib/"
-let getFableLibDir(): string = __SOURCE_DIRECTORY__ + "/../../../../build/fable-library"
+let getFableLibDir(): string = __SOURCE_DIRECTORY__ + "/../../../../temp/fable-library"
 let getVersion(): string = ".next"
 let initFable (): Fable.Standalone.IFableManager = Fable.Standalone.Main.init ()