Skip to content

Commit ce4d5f4

Browse files
dsymedsyme
committed
Merge pull request #561 from dsyme/use-compiler-tools
Use FSharp.Compiler.Tools instead of bootstrap
2 parents ec7f193 + 38b6ae8 commit ce4d5f4

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

‎Makefile.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ include $(topsrcdir)config.make
22

33
all clean install build build-proto all-monotouch-monodroid-xamarinmac all-monotouch-monodroid all-monotouch all-monodroid all-xamarinmac all-monotouch-xamarinmac:
44
$(MAKE) -C src/fsharp $@
5+
MONO_ENV_OPTIONS=$(monoopts) .nuget/NuGet.exe restore -PackageDirectory packages
56

67
dist:
78
-rm -r fsharp-$(DISTVERSION) fsharp-$(DISTVERSION).tar.bz2

‎build.bat‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,26 @@ if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles(x86)%\MSBuild\14.0\Bin
77
if not exist %_msbuildexe% set _msbuildexe="%ProgramFiles%\MSBuild\14.0\Bin\MSBuild.exe"
88
if not exist %_msbuildexe% echo Error: Could not find MSBuild.exe. Please see http://www.microsoft.com/en-us/download/details.aspx?id=40760. && goto :eof
99

10+
set msbuildflags=/maxcpucount
11+
set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
12+
if not exist %_ngenexe% echo Note: Could not find ngen.exe.
13+
1014
::Clean
1115
del /F /S /Q lib\proto
1216
del /F /S /Q lib\release
1317

1418
::Build
19+
.nuget\NuGet.exe restore -PackagesDirectory packages
20+
%_ngenexe% install packages\FSharp.Compiler.Tools.4.0.0.1\tools\fsc.exe
1521
%_msbuildexe% src\fsharp-proto-build.proj
16-
ngen install lib\proto\fsc-proto.exe
17-
%_msbuildexe% src\fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release
18-
%_msbuildexe% src\fsharp-library-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
19-
%_msbuildexe% src\fsharp-compiler-build.proj /p:TargetFramework=net40 /p:Configuration=Release
20-
%_msbuildexe% src\fsharp-compiler-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
21-
%_msbuildexe% src\fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
22-
%_msbuildexe% src\fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
23-
%_msbuildexe% src\fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
24-
%_msbuildexe% src\fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
25-
%_msbuildexe% src\fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
26-
%_msbuildexe% src\fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono.snk
22+
%_ngenexe% install lib\proto\fsc-proto.exe
23+
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release
24+
%_msbuildexe% %msbuildflags% src\fsharp-library-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
25+
%_msbuildexe% %msbuildflags% src\fsharp-compiler-build.proj /p:TargetFramework=net40 /p:Configuration=Release
26+
%_msbuildexe% %msbuildflags% src\fsharp-compiler-unittests-build.proj /p:TargetFramework=net40 /p:Configuration=Release
27+
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=Release
28+
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=Release
29+
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=Release
30+
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=Release
31+
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
32+
%_msbuildexe% %msbuildflags% src\fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release /p:KeyFile=..\..\..\mono.snk

‎packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="FsCheck" version="2.0.3" />
4+
<package id="FSharp.Compiler.Tools" version="4.0.0.1" />
45
<package id="NUnit.Runners" version="2.6.4" targetFramework="net45" />
56
<package id="NUnit" version="3.0.0" targetFramework="net45" />
67
<package id="NUnit.Console" version="3.0.0" targetFramework="net45" />

‎src/FSharpSource.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Tailcalls>true</Tailcalls>
77
<TargetFramework Condition="'$(TargetFramework)'==''">net40</TargetFramework>
88
<LkgPath>$(FSharpSourcesRoot)\..\lib\bootstrap\4.0</LkgPath>
9+
<LkgPath2>$(FSharpSourcesRoot)\..\packages\FSharp.Compiler.Tools.4.0.0.1\tools</LkgPath2>
910
<FsLexUnicode>true</FsLexUnicode>
1011
<OtherFlags>$(OtherFlags) --times</OtherFlags>
1112
<NoWarn>$(NoWarn);69;65;54;61;75</NoWarn>
@@ -896,7 +897,7 @@ Some other NuGET monikers to support in the future, see http://docs.nuget.org/do
896897

897898
<!-- Include the bootstrap targets file when building the proto compiler using the bootstrap -->
898899
<!-- Also include it if Proto targets file doesn't exist, e.g. when cleaning the build with /t:Clean -->
899-
<Import Project="$(LkgPath)\Microsoft.FSharp.Targets"
900+
<Import Project="$(LkgPath2)\Microsoft.FSharp.Targets"
900901
Condition="(!Exists('..\lib\proto\Microsoft.FSharp-proto.targets') OR '$(BuildWith)' == 'LKG') " />
901902

902903
<!-- If compiling portable, then Microsoft.Portable.Core.targets -->

0 commit comments

Comments
 (0)