Skip to content

Commit 09ad8f1

Browse files
Fixes for Windows build
1 parent 4d7fd37 commit 09ad8f1

10 files changed

+1200
-1200
lines changed

build.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Target "GenerateBindings" (fun () ->
8080
fsharpBin |> Option.iter (fun fsharpBin ->
8181
System.Environment.SetEnvironmentVariable("FSHARP_BIN", fsharpBin))
8282

83-
(TimeSpan.FromMinutes 5.0)
83+
(TimeSpan.FromMinutes 15.0)
8484
|> ProcessHelper.ExecProcess (fun p ->
8585
p.FileName <- typings @@ "FunScript.TypeScript" @@ "FunScript.TypeScript.exe"
8686
p.WorkingDirectory <- typings @@ "FunScript.TypeScript")
439 KB
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
512 Bytes
Binary file not shown.

src/FSharp.Atom.Generator.fsproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<OutputType>Exe</OutputType>
88
<RootNamespace>FSharp.Atom.Generator</RootNamespace>
99
<AssemblyName>FSharp.Atom.Generator</AssemblyName>
10+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11+
<TargetFrameworkProfile />
1012
</PropertyGroup>
1113
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1214
<DebugSymbols>true</DebugSymbols>
@@ -29,6 +31,14 @@
2931
<Externalconsole>true</Externalconsole>
3032
<Tailcalls>true</Tailcalls>
3133
</PropertyGroup>
34+
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
35+
<ItemGroup>
36+
<Compile Include="atom-extra.fs" />
37+
<Compile Include="core.fs" />
38+
<Compile Include="paket.fs" />
39+
<Compile Include="main.fs" />
40+
<None Include="atom-bindings.fsx" />
41+
</ItemGroup>
3242
<ItemGroup>
3343
<Reference Include="mscorlib" />
3444
<Reference Include="FSharp.Core" />
@@ -69,14 +79,4 @@
6979
<HintPath>..\lib\FunScript.dll</HintPath>
7080
</Reference>
7181
</ItemGroup>
72-
<ItemGroup>
73-
<Compile Include="atom-extra.fs" />
74-
<Compile Include="core.fs" />
75-
<Compile Include="paket.fs" />
76-
<Compile Include="main.fs" />
77-
</ItemGroup>
78-
<Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
79-
<ItemGroup>
80-
<None Include="atom-bindings.fsx" />
81-
</ItemGroup>
8282
</Project>

src/atom-extra.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module Atom
44
open FunScript
55
open FunScript.TypeScript
66

7-
7+
88
[<JSEmit("var cmd = {}; cmd[{1}]=function() { return {2}(); }; return atom.commands.add({0}, cmd);")>]
99
let addCommand(name:string, cmdName:string, func:unit -> unit) = failwith "JS"
1010

src/core.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ type Core() =
283283
member x.activate(state:obj) =
284284
let panel =
285285
let t = Views.ErrorPanelView.create ()
286-
Globals.atom.workspace.addBottomPanel (unbox<AnonymousType573>{Views.PanelOptions.item = t; Views.PanelOptions.priority = 100; Views.PanelOptions.visible = false})
286+
Globals.atom.workspace.addBottomPanel (unbox<AnonymousType499>{Views.PanelOptions.item = t; Views.PanelOptions.priority = 100; Views.PanelOptions.visible = false})
287287

288288
Globals.atom.workspace.onDidChangeActivePaneItem (unbox<Function>( fun ed -> AutocompleteHandler.parseEditor ed (fun _ -> ()) service |> ignore))
289289
Globals.atom.workspace.onDidChangeActivePaneItem (unbox<Function>(fun ed -> ed |> Views.ErrorPanelView.hadnleEditorChange panel))

0 commit comments

Comments
 (0)