Skip to content

merge master into vs-rtm2017 #3728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KevinRansom merged 46 commits into from
Oct 11, 2017
Merged

merge master into vs-rtm2017 #3728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
e6d46b9
Generate source for .resx files on build. (#3607)
brettfo Sep 22, 2017
65819cc
fix order of file items in FSharp.Core
brettfo Sep 22, 2017
01eab69
Fix build.cmd for certain always-shown errors (like "unable to find r…
abelbraaksma Sep 25, 2017
d08a5ff
Fixing JaroWinkler tests with InvariantCulture and fixing async tests…
abelbraaksma Sep 25, 2017
383e2f6
update to System.Collections.Immutable 1.3.1 (#3641)
dsyme Sep 25, 2017
51a19b9
fix assembly reference
dsyme Sep 25, 2017
46df51f
[WIP] Adds optimized emit for int64 constants (#3620)
ChrSteinert Sep 25, 2017
c2406fd
fix assembly reference (#3646)
dsyme Sep 25, 2017
af82cbe
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Sep 25, 2017
bd9b37c
Remove a few more build warnings (#3647)
dsyme Sep 26, 2017
1b72733
move BuildFromSource projects to their own directory
brettfo Sep 26, 2017
9da66d1
Adds tests for emitted IL for new Int64 constants. (#3650)
ChrSteinert Sep 26, 2017
b96f64b
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Sep 27, 2017
780b6c4
Enable FS as prefix and ignore invalid values for warnings (#3631)
KevinRansom Sep 27, 2017
34e669c
Fix stack overflow on assembly resolution (#3658)
KevinRansom Sep 29, 2017
20573b7
Add impl files to file check results (#3659)
vasily-kirichenko Oct 2, 2017
4a1e31b
This adds backup, restore, coloration and many more checks to the upd…
abelbraaksma Oct 2, 2017
faf693a
add LanguageServiceProfiling project to internals visible to list of …
vasily-kirichenko Oct 2, 2017
88fc657
bump FCS version (#3676)
dsyme Oct 2, 2017
4c244da
Parsing improvements: no reactor, add parsing options, error severity…
auduchinok Oct 3, 2017
841dc2c
whitespace cleanup (#3682)
dsyme Oct 3, 2017
d29d6e2
whitespace and docs (#3684)
dsyme Oct 3, 2017
1d59de8
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Oct 3, 2017
5d177a4
Preserve XML docs for in-memory project references (#3683)
dsyme Oct 3, 2017
9893e72
whitespace and comments (#3686)
dsyme Oct 3, 2017
47ce8af
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Oct 3, 2017
c76b29e
cherry pick two PRs from FCS (#3687)
dsyme Oct 3, 2017
245a40b
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Oct 3, 2017
e29e235
try to fix travis
dsyme Oct 3, 2017
940fcb0
try to fix travis
dsyme Oct 3, 2017
585b9b4
list dependencies
dsyme Oct 3, 2017
20b9173
no obsolete pdb in nuget
dsyme Oct 3, 2017
4723695
list dependencies
dsyme Oct 3, 2017
9a64db8
cherry pick of fsharp/fsharp change
dsyme Oct 4, 2017
4635c8d
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Oct 4, 2017
7926274
bump FCS version number (#3688)
dsyme Oct 4, 2017
948f7e7
Update FSharp.Compiler.Service.MSBuild.v12.nuspec
dsyme Oct 4, 2017
d94167f
fix FCS nuget on windows
dsyme Oct 4, 2017
83208f8
fix-resource (#3690)
dsyme Oct 4, 2017
d39cba7
Bump FSharp.Compiler.Tools to 4.1.27 and align mono build files (#3693)
dsyme Oct 4, 2017
81d162c
update FCS doc generation (#3694)
dsyme Oct 4, 2017
db2e4e2
update DEVGUIDE to add addiitional steps before running build (#3725)
eriawan Oct 10, 2017
6ecacd7
Split templates out into a seperate vsix (#3720)
KevinRansom Oct 10, 2017
57b2cfe
Merge branch 'vs2017-rtm' into master
KevinRansom Oct 10, 2017
94cbf13
merge error
KevinRansom Oct 11, 2017
04eea09
Merge issues
KevinRansom Oct 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@ scripts/*.patch
/src/fsharp/FSharp.Compiler.Private/*.sln
/src/fsharp/FSharp.Compiler.Private/*.userprefs
/src/*.log
/src/fsharp/FSharp.Compiler.Private/illex.fs
/src/fsharp/FSharp.Compiler.Private/ilpars.fs
/src/fsharp/FSharp.Compiler.Private/ilpars.fsi
/src/fsharp/FSharp.Compiler.Private/lex.fs
/src/fsharp/FSharp.Compiler.Private/pars.fs
/src/fsharp/FSharp.Compiler.Private/pars.fsi
/src/fsharp/FSharp.Compiler.Private/pplex.fs
/src/fsharp/FSharp.Compiler.Private/pppars.fs
/src/fsharp/FSharp.Compiler.Private/pppars.fsi
/src/fsharp/Fsc-proto/illex.fs
/src/fsharp/Fsc-proto/ilpars.fs
/src/fsharp/Fsc-proto/ilpars.fsi
Expand Down
10 changes: 9 additions & 1 deletion DEVGUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,15 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
Install

- [.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779)
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
- [MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760) or Visual Studio 2013 (or later)

**NOTE on Windows:**
1. It is recommended to run the build.cmd and the qualifiers below on a command prompt with path set to have the location of MSBuild. If we have Visual Studio, we can also run using `Developer Command Prompt for Visual Studio 20xx` (depends on Visual Studio version). This developer command prompt is easier to use than normal command prompt, because it already has the correct path of Visual Studio and .NET's tooling set for us to use (including MSBuild).
2. The running command prompt must be run under Administrator right (`Run as Administrator`).

Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:

git clean -xfd

On Windows you can build the F# compiler for .NET Framework as follows:

Expand Down
13 changes: 0 additions & 13 deletions FSharp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,6 @@ Global
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0 = Release|Any CPU
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg = Release|Any CPU
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0 = Release|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.ActiveCfg = Debug|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.Build.0 = Debug|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.Build.0 = Proto|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.ActiveCfg = Proto|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.Build.0 = Proto|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.Build.0 = Release|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.ActiveCfg = Release|Any CPU
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -235,6 +223,5 @@ Global
{88E2D422-6852-46E3-A740-83E391DC7973} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{4239EFEA-E746-446A-BF7A-51FCBAB13946} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
{A437A6EC-5323-47C2-8F86-E2CAC54FF152} = {3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
EndGlobalSection
EndGlobal
127 changes: 45 additions & 82 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,106 +14,69 @@ all:
$(MAKE) build

build-proto: restore
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=Proto /p:TargetFramework=$(TargetFramework) src/fsharp/Fsc-proto/Fsc-proto.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/Fsc-proto/Fsc-proto.fsproj

# The main targets
build:
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsi/Fsi.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.1 src/fsharp/FSharp.Core/FSharp.Core.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=4.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40 $@
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40 $@
ifeq ("$(pclenabled47)", "yes")
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable47 src/fsharp/FSharp.Core/FSharp.Core.fsproj
endif
ifeq ("$(pclenabled7)", "yes")
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable7 src/fsharp/FSharp.Core/FSharp.Core.fsproj
endif
ifeq ("$(pclenabled78)", "yes")
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable78 src/fsharp/FSharp.Core/FSharp.Core.fsproj
endif
ifeq ("$(pclenabled259)", "yes")
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable259 src/fsharp/FSharp.Core/FSharp.Core.fsproj
endif
ifeq ("$(monodroidenabled)", "yes")
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=monoandroid10+monotouch10+xamarinios10 src/fsharp/FSharp.Core/FSharp.Core.fsproj
endif
ifeq ("$(xamarinmacenabled)", "yes")
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=xamarinmacmobile src/fsharp/FSharp.Core/FSharp.Core.fsproj
endif
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/Fsc/Fsc.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
MONO_ENV_OPTIONS=$(monoopts) $(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
mkdir -p $(Configuration)/fsharp30/net40/bin
mkdir -p $(Configuration)/fsharp31/net40/bin
mkdir -p $(Configuration)/fsharp40/net40/bin
cp -p packages/FSharp.Core.3.0.2/lib/net40/* $(Configuration)/fsharp30/net40/bin
cp -p packages/FSharp.Core.3.1.2.5/lib/net40/* $(Configuration)/fsharp31/net40/bin
cp -p packages/FSharp.Core.4.0.0.1/lib/net40/* $(Configuration)/fsharp40/net40/bin
mkdir -p $(Configuration)/portable7/bin
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45/* $(Configuration)/portable7/bin
mkdir -p $(Configuration)/portable47/bin
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+sl5+netcore45/* $(Configuration)/portable47/bin
mkdir -p $(Configuration)/portable78/bin
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wp8/* $(Configuration)/portable78/bin
mkdir -p $(Configuration)/portable259/bin
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wpa81+wp8/* $(Configuration)/portable259/bin
mkdir -p $(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/* $(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
mkdir -p $(Configuration)/xamarinmacmobile/bin
cp -p packages/FSharp.Core.4.1.17/lib/xamarinmac20/* $(Configuration)/xamarinmacmobile/bin



install:
-rm -fr $(DESTDIR)$(monodir)/fsharp
-rm -fr $(DESTDIR)$(monodir)/Microsoft\ F#
-rm -fr $(DESTDIR)$(monodir)/Microsoft\ SDKs/F#
-rm -fr $(DESTDIR)$(monodir)/gac/FSharp.Core
-rm -fr $(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp
-rm -fr $(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 install
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v/FSharp
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v11.0/FSharp
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v12.0/FSharp
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v14.0/FSharp
-rm -fr $(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v15.0/FSharp
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 install
$(MAKE) -C mono/FSharp.Build install
$(MAKE) -C mono/FSharp.Compiler.Private install
$(MAKE) -C mono/Fsc install
$(MAKE) -C mono/FSharp.Compiler.Interactive.Settings install
$(MAKE) -C mono/FSharp.Compiler.Server.Shared install
$(MAKE) -C mono/fsi install
$(MAKE) -C mono/fsiAnyCpu install
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=3.0 install
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=3.1 install
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=4.0 install
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40 install
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40 install
ifeq ("$(pclenabled47)", "yes")
$(MAKE) -C mono/FSharp.Core TargetFramework=portable47 install
endif
ifeq ("$(pclenabled7)", "yes")
$(MAKE) -C mono/FSharp.Core TargetFramework=portable7 install
endif
ifeq ("$(pclenabled78)", "yes")
$(MAKE) -C mono/FSharp.Core TargetFramework=portable78 install
endif
ifeq ("$(pclenabled259)", "yes")
$(MAKE) -C mono/FSharp.Core TargetFramework=portable259 install
endif
ifeq ("$(monodroidenabled)", "yes")
$(MAKE) -C mono/FSharp.Core TargetFramework=monoandroid10+monotouch10+xamarinios10 install
endif
ifeq ("$(xamarinmacenabled)", "yes")
$(MAKE) -C mono/FSharp.Core TargetFramework=xamarinmacmobile install
endif
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.0 install
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.1 install
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=4.0 install
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable47 install
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable7 install
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable78 install
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable259 install
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=monoandroid10+monotouch10+xamarinios10 install
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=xamarinmacmobile install
echo "------------------------------ INSTALLED FILES --------------"
ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/xbuild $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft*
ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/msbuild $(DESTDIR)$(monodir)/xbuild $(DESTDIR)$(monodir)/Reference\ Assemblies $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft* || true

dist:
-rm -r fsharp-$(DISTVERSION) fsharp-$(DISTVERSION).tar.bz2
Expand Down
2 changes: 1 addition & 1 deletion before_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ fi)
fi)

#TODO: work out how to avoid the need for this
chmod u+x packages/FSharp.Compiler.Tools.4.1.23/tools/fsi.exe
chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe

Expand Down
Loading