Skip to content

Commit 87e807e

Browse files
committed
scripts: remove unneeded fsx-legacy.bat
This should have been done in: 524c92c
1 parent 524c92c commit 87e807e

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

scripts/fsx-legacy.bat

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

scripts/make.fsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,13 +188,18 @@ let fsxInstallationDir =
188188

189189
#if !LEGACY_FRAMEWORK
190190
let fsxBat = Path.Combine(ScriptsDir.FullName, "fsx.bat") |> FileInfo
191-
#else
192-
let fsxBat = Path.Combine(ScriptsDir.FullName, "fsx-legacy.bat") |> FileInfo
193-
#endif
194191

195192
let fsxBatDestination =
196193
Path.Combine(fsxInstallationDir.FullName, "fsx.bat") |> FileInfo
197194

195+
let fsxInstalledExecutable = fsxBatDestination
196+
#else
197+
let fsxExeDestination =
198+
Path.Combine(fsxInstallationDir.FullName, "fsx.exe") |> FileInfo
199+
200+
let fsxInstalledExecutable = fsxExeDestination
201+
#endif
202+
198203
let maybeTarget = GatherTarget(Misc.FsxOnlyArguments())
199204

200205
let assemblyExecutableExtension =
@@ -253,9 +258,9 @@ let Install(isReinstall: bool) =
253258
Path.Combine(finalReleaseFolderPath, "fsx.runtimeconfig.json"),
254259
Path.Combine(fsxInstallationDir.FullName, "fsx.runtimeconfig.json")
255260
)
256-
#endif
257261

258262
File.Copy(fsxBat.FullName, fsxBatDestination.FullName)
263+
#endif
259264

260265
let fsdkInstallDir =
261266
Path.Combine(fsxInstallationDir.FullName, "Fsdk") |> DirectoryInfo
@@ -324,14 +329,14 @@ match maybeTarget with
324329
| Some "check" ->
325330

326331
// FIXME: contributor should be able to run 'make check' before 'make install'
327-
if not fsxBatDestination.Exists then
332+
if not fsxInstalledExecutable.Exists then
328333
Console.WriteLine "install first"
329334
Environment.Exit 1
330335

331336
let testProcess =
332337
Process.Execute(
333338
{
334-
Command = fsxBatDestination.FullName
339+
Command = fsxInstalledExecutable.FullName
335340
Arguments = Path.Combine(ScriptsDir.FullName, "runTests.fsx")
336341
},
337342
Echo.All

scripts/runTests.fsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ let GetFsxWindowsLauncher() =
3131
let fsxWinInstallationDir =
3232
Path.Combine(programFiles.FullName, "fsx") |> DirectoryInfo
3333

34+
#if !LEGACY_FRAMEWORK
3435
Path.Combine(fsxWinInstallationDir.FullName, "fsx.bat") |> FileInfo
36+
#else
37+
Path.Combine(fsxWinInstallationDir.FullName, "fsx.exe") |> FileInfo
38+
#endif
3539

3640
let CreateCommand(executable: FileInfo, args: string) =
3741
let platform = Misc.GuessPlatform()

0 commit comments

Comments
 (0)