Skip to content

Commit

Permalink
Revert "fsxc: print fs autogenerated file (debug)"
Browse files Browse the repository at this point in the history
This reverts commit 0c2150c
because we don't need the debug output anymore.
  • Loading branch information
knocte committed Sep 5, 2024
1 parent 2cab8f3 commit 0133549
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 17 deletions.
18 changes: 3 additions & 15 deletions fsxc/Fsxc.fs
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ module Program =
let preprocessScriptContents
(origScript: FileInfo)
(contents: List<LineAction>)
: List<CompilerInput> * List<ExtraExtension> * FileInfo =
: List<CompilerInput> * List<ExtraExtension> =

#if LEGACY_FRAMEWORK
// from "Microsoft.Build", "16.11.0" to .../packages/Microsoft.Build.16.11.0/lib/net472/Microsoft.Build.dll
Expand Down Expand Up @@ -705,8 +705,7 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() }
)
}
|> List.ofSeq,
extraExtensions,
autogeneratedFile
extraExtensions

#if LEGACY_FRAMEWORK
let getSourceFiles(flags: seq<CompilerInput>) : seq<FileInfo> =
Expand Down Expand Up @@ -843,17 +842,8 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() }

let binFolder = GetBinFolderForAScript script

let compilerInputs, extraExtensions, autoGenFile =
let compilerInputs, extraExtensions =
preprocessScriptContents script contents

Console.WriteLine(
"_________________START AUTOGEN FILE_________________"
)

for line in File.ReadAllLines(autoGenFile.FullName) do
Console.WriteLine line

Console.WriteLine("_________________END AUTOGEN FILE_________________")
#if !LEGACY_FRAMEWORK
let projectFile = generateProjectFile script contents extraExtensions
#else // dummy for to just prevent "unused" warning, meh
Expand Down Expand Up @@ -921,8 +911,6 @@ let fsi = { CommandLineArgs = System.Environment.GetCommandLineArgs() }
| _ -> "fsharpc"
#endif

Console.WriteLine(">>>>>>>>>>>>>>>COMPFLAGS: " + fscompilerflags)

let proc =
Process.Execute(
{
Expand Down
3 changes: 1 addition & 2 deletions scripts/runTests.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -347,12 +347,11 @@ let dotnetFsiCmd =
Process.Execute(dotnetFsiCmd, Echo.All) |> UnwrapDefault
#endif

(*
let processTest = Path.Combine(TestDir.FullName, "testProcess.fsx") |> FileInfo

Process.Execute(CreateCommand(processTest, String.Empty), Echo.All)
|> UnwrapDefault
*)


(* this is actually only really useful for when process spits both stdout & stderr
let processConcurrencyTest = Path.Combine(TestDir.FullName, "testProcessConcurrency.fsx") |> FileInfo
Expand Down

0 comments on commit 0133549

Please sign in to comment.