@@ -188,13 +188,18 @@ let fsxInstallationDir =
188188
189189#if ! LEGACY_ FRAMEWORK
190190let fsxBat = Path.Combine( ScriptsDir.FullName, " fsx.bat" ) |> FileInfo
191- #else
192- let fsxBat = Path.Combine( ScriptsDir.FullName, " fsx-legacy.bat" ) |> FileInfo
193- #endif
194191
195192let 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+
198203let maybeTarget = GatherTarget( Misc.FsxOnlyArguments())
199204
200205let 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
0 commit comments