Skip to content

Commit bfb7679

Browse files
Krzysztof-CieslakKrzysztof-Cieslak
committed
Fixed Windows Build (#4)
Fixed problems from https://github.com/Krzysztof-Cieslak/FSharp.Atom/issues/4
1 parent 09ad8f1 commit bfb7679

File tree

3 files changed

+66
-56
lines changed

3 files changed

+66
-56
lines changed

‎build.fsx‎

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@ open Fake.Git
1111
open Fake.ProcessHelper
1212
open Fake.ZipHelper
1313

14+
#if MONO
15+
#else
16+
#load "src/atom-bindings.fsx"
17+
#load "src/atom-extra.fs"
18+
#load "src/core.fs"
19+
#load "src/paket.fs"
20+
#load "src/main.fs"
21+
#endif
22+
1423
// --------------------------------------------------------------------------------------
1524
// Build the Generator project and run it
1625
// --------------------------------------------------------------------------------------
@@ -21,13 +30,19 @@ Target "BuildGenerator" (fun () ->
2130
|> Log "AppBuild-Output: "
2231
)
2332

24-
Target "RunGenerator" (fun () ->
25-
(TimeSpan.FromMinutes 5.0)
26-
|> ProcessHelper.ExecProcess (fun p ->
27-
p.FileName <- __SOURCE_DIRECTORY__ @@ "src" @@ "bin" @@ "Debug" @@ "FSharp.Atom.Generator.exe" )
28-
|> ignore
33+
Target "RunGenerator" (fun () ->
34+
35+
(TimeSpan.FromMinutes 5.0)
36+
|> ProcessHelper.ExecProcess (fun p ->
37+
p.FileName <- __SOURCE_DIRECTORY__ @@ "src" @@ "bin" @@ "Debug" @@ "FSharp.Atom.Generator.exe" )
38+
|> ignore
2939
)
3040

41+
Target "RunScript" (fun () ->
42+
FSharp.Atom.Generator.translateModules()
43+
)
44+
45+
3146
// --------------------------------------------------------------------------------------
3247
// Generate FunScript bindings from the *.d.ts files in the 'typings' folder
3348
// --------------------------------------------------------------------------------------
@@ -91,5 +106,9 @@ Target "GenerateBindings" (fun () ->
91106
// Run generator by default. Invoke 'build <Target>' to override
92107
// --------------------------------------------------------------------------------------
93108

109+
#if MONO
94110
"BuildGenerator" ==> "RunGenerator"
95111
RunTargetOrDefault "RunGenerator"
112+
#else
113+
RunTargetOrDefault "RunScript"
114+
#endif

‎src/core/lib/core.js‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -95,25 +95,25 @@ Array__FoldIndexed$Unit__IDisplayBufferMarker_Unit__IDisplayBufferMarker_ = (fun
9595
});
9696
Array__Iterate$Error_Error_ = (function(f,xs)
9797
{
98-
var _957;
98+
var _532;
9999
return Array__Fold$Error__Unit_Error__Unit_((function(unitVar0)
100100
{
101101
return (function(x)
102102
{
103103
return f(x);
104104
});
105-
}), _957, xs);
105+
}), _532, xs);
106106
});
107107
Array__Iterate$IDisplayBufferMarker_IDisplayBufferMarker_ = (function(f,xs)
108108
{
109-
var _884;
109+
var _459;
110110
return Array__Fold$IDisplayBufferMarker__Unit_IDisplayBufferMarker__Unit_((function(unitVar0)
111111
{
112112
return (function(x)
113113
{
114114
return f(x);
115115
});
116-
}), _884, xs);
116+
}), _459, xs);
117117
});
118118
Array__Length$Error_Error_ = (function(xs)
119119
{
@@ -247,16 +247,16 @@ AutocompleteProvider__getSuggestion$ = (function(service,options)
247247
try
248248
{
249249
var result = ((window.JSON).parse(msg));
250-
var _319;
250+
var _734;
251251
if (((prefix == ".") || (prefix == "=")))
252252
{
253-
_319 = "";
253+
_734 = "";
254254
}
255255
else
256256
{
257-
_319 = prefix;
257+
_734 = prefix;
258258
};
259-
var pref = _319;
259+
var pref = _734;
260260
if ((result.Kind == "completion"))
261261
{
262262
return resolve(Seq__ToArray$Object_Object_(Seq__Map$String_1_Object_String_Object_((function(t)
@@ -516,16 +516,16 @@ HighlighterHandler__handle$ = (function(lst)
516516
var action = (function(item)
517517
{
518518
var marker = (editor.markBufferRange([[item.StartLine, item.StartColumn], [item.EndLine, item.EndColumn]]));
519-
var _935;
519+
var _510;
520520
if ((item.Severity == "Warning"))
521521
{
522-
_935 = "highlight-warning";
522+
_510 = "highlight-warning";
523523
}
524524
else
525525
{
526-
_935 = "highlight-error";
526+
_510 = "highlight-error";
527527
};
528-
var cls = _935;
528+
var cls = _510;
529529
HighlighterHandler__marked = Array__Append$IDisplayBufferMarker_IDisplayBufferMarker_([marker], HighlighterHandler__marked);
530530
editor.decorateMarker(marker, {type: 'highlight', class: cls});
531531
});
@@ -598,16 +598,16 @@ Seq__Delay$Object_Object_ = (function(f)
598598
{
599599
return Seq__FromFactory$Object_Object_((function(unitVar0)
600600
{
601-
var _585;
602-
return Seq__Enumerator$Object_Object_(f(_585));
601+
var _1000;
602+
return Seq__Enumerator$Object_Object_(f(_1000));
603603
}));
604604
});
605605
Seq__Delay$String_1String = (function(f)
606606
{
607607
return Seq__FromFactory$String_1String((function(unitVar0)
608608
{
609-
var _494;
610-
return Seq__Enumerator$String_1String(f(_494));
609+
var _909;
610+
return Seq__Enumerator$String_1String(f(_909));
611611
}));
612612
});
613613
Seq__Enumerator$Object_Object_ = (function(xs)
@@ -690,8 +690,8 @@ Seq__FromFactory$Object_Object_ = (function(f)
690690
{
691691
return (function(__,unitVar1)
692692
{
693-
var _577;
694-
return __.factory(_577);
693+
var _992;
694+
return __.factory(_992);
695695
})(impl, unitVar1);
696696
})};
697697
});
@@ -703,8 +703,8 @@ Seq__FromFactory$String_1String = (function(f)
703703
{
704704
return (function(__,unitVar1)
705705
{
706-
var _422;
707-
return __.factory(_422);
706+
var _837;
707+
return __.factory(_837);
708708
})(impl, unitVar1);
709709
})};
710710
});
@@ -716,14 +716,14 @@ Seq__FromFactory$String___String___ = (function(f)
716716
{
717717
return (function(__,unitVar1)
718718
{
719-
var _204;
720-
return __.factory(_204);
719+
var _215;
720+
return __.factory(_215);
721721
})(impl, unitVar1);
722722
})};
723723
});
724724
Seq__IterateIndexed$Object_Object_ = (function(f,xs)
725725
{
726-
var _599;
726+
var _1014;
727727
return Seq__FoldIndexed$Object__Unit_Object__Unit_((function(i)
728728
{
729729
return (function(unitVar1)
@@ -733,11 +733,11 @@ Seq__IterateIndexed$Object_Object_ = (function(f,xs)
733733
return f(i)(x);
734734
});
735735
});
736-
}), _599, xs);
736+
}), _1014, xs);
737737
});
738738
Seq__IterateIndexed$String___String___ = (function(f,xs)
739739
{
740-
var _224;
740+
var _235;
741741
return Seq__FoldIndexed$String____Unit_String____Unit_((function(i)
742742
{
743743
return (function(unitVar1)
@@ -747,7 +747,7 @@ Seq__IterateIndexed$String___String___ = (function(f,xs)
747747
return f(i)(x);
748748
});
749749
});
750-
}), _224, xs);
750+
}), _235, xs);
751751
});
752752
Seq__Map$String_1_Object_String_Object_ = (function(f,xs)
753753
{
@@ -863,8 +863,8 @@ Seq__Unfold$IEnumerator_1_String__Object_IEnumerator_1_String__Object_ = (functi
863863
});
864864
return (Option__IsSome$IEnumerator_1_String_IEnumerator_1_String_(__.acc) && (function()
865865
{
866-
var _555;
867-
return next(_555);
866+
var _970;
867+
return next(_970);
868868
})());
869869
})(impl, unitVar1);
870870
}), Reset: (function(unitVar1)
@@ -920,8 +920,8 @@ Seq__Unfold$IEnumerator_1_String__String_1IEnumerator_1_String__String = (functi
920920
});
921921
return (Option__IsSome$IEnumerator_1_String_IEnumerator_1_String_(__.acc) && (function()
922922
{
923-
var _471;
924-
return next(_471);
923+
var _886;
924+
return next(_886);
925925
})());
926926
})(impl, unitVar1);
927927
}), Reset: (function(unitVar1)
@@ -977,8 +977,8 @@ Seq__Unfold$Int32__String_1Int32_String = (function(f,seed)
977977
});
978978
return (Option__IsSome$Int32_Int32(__.acc) && (function()
979979
{
980-
var _400;
981-
return next(_400);
980+
var _815;
981+
return next(_815);
982982
})());
983983
})(impl, unitVar1);
984984
}), Reset: (function(unitVar1)
@@ -1034,8 +1034,8 @@ Seq__Unfold$Int32__String___Int32_String___ = (function(f,seed)
10341034
});
10351035
return (Option__IsSome$Int32_Int32(__.acc) && (function()
10361036
{
1037-
var _182;
1038-
return next(_182);
1037+
var _193;
1038+
return next(_193);
10391039
})());
10401040
})(impl, unitVar1);
10411041
}), Reset: (function(unitVar1)
@@ -1186,34 +1186,34 @@ return [(function(ign)
11861186
return (new Core___ctor$());
11871187
}), (function(_this)
11881188
{
1189-
return Core__provide$(_this);
1189+
return Core__deactivate$(_this);
11901190
}), (function(_this)
11911191
{
11921192
return (function(p0)
11931193
{
1194-
return Core__getSuggestion$(_this, p0);
1194+
return Core__activate$(_this, p0);
11951195
});
11961196
}), (function(_this)
11971197
{
11981198
return (function(p0)
11991199
{
1200-
return Core__activate$(_this, p0);
1200+
return Core__getSuggestion$(_this, p0);
12011201
});
12021202
}), (function(_this)
12031203
{
1204-
return Core__deactivate$(_this);
1204+
return Core__provide$(_this);
12051205
})]
12061206
}
12071207
var _funcs = wrappedFunScript();
12081208
var _self = _funcs[0]();
12091209

12101210
module.exports = AtomFSharpCore = {
1211-
provide: function() {
1211+
deactivate: function() {
12121212
return _funcs[1](_self); },
1213-
getSuggestion: function(p1) {
1214-
return _funcs[2](_self)(p1); },
12151213
activate: function(p1) {
1214+
return _funcs[2](_self)(p1); },
1215+
getSuggestion: function(p1) {
12161216
return _funcs[3](_self)(p1); },
1217-
deactivate: function() {
1217+
provide: function() {
12181218
return _funcs[4](_self); }
12191219
};

‎src/main.fs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44
// Load the F# implementation and specify parameters for the translator
55
// --------------------------------------------------------------------------------------
66

7-
#if INTERACTIVE
8-
// On .NET, this can also be used through F# Interactive. On mono, this
9-
// needs to be compiled though, because FSI emitted types do not implement
10-
// get_MetadataToken and so something inside FunScript goes wrong..
11-
#load "atom-bindings.fsx"
12-
#load "atom-extra.fs"
13-
#load "core.fs"
14-
#load "paket.fs"
15-
#endif
167

178
// Root directory, relatively to which files are saved
189
let root = __SOURCE_DIRECTORY__

0 commit comments

Comments
 (0)