Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit531cd5b

Browse files
authored
merge master into vs-rtm2017 (#3728)
* Generate source for .resx files on build. (#3607)* add build task to generate *.fs from *.resx files* generate source for embedded resources in tests* generate source for embedded resources in FSharp.Editor* generate source for embedded resources in FSharp.LanguageService* generate source for embedded resources in FSharp.ProjectSystem.FSharp* generate source for embedded resources in FSharp.VS.FSI* don't generate non-string resources when <=netstandard1.6* update baseline error message for testsThe error output should be the exception message, not the exception type.* perform up-to-date check before generating *.fs from *.resx* remove non-idiomatic fold for an array comprehension* correct newline replacement* output more friendly error message* throw if boolean value isn't explicitly `true` or `false`* only generate object resource code on non `netstandard1.*` and `netcoreapp1.*` platforms* ensure FSharp.Core specifies a target framework for resource generaton* rename attributes to be non-ambiguous and properly include them* fix order of file items in FSharp.Core* Fix build.cmd for certain always-shown errors (like "unable to find registry key"), improve finding of VS2017 tools, fix DEVGUIDE.md (#3635)* Fix build.com displaying the following error on each run "ERROR: The system was unable to find the specified registry key or value."* Remove warning about reg.exe errors introduced in #3614 (in commit b548bd7, but unrelated to that fix), it is no longer necessary.* Fix #3638, VS2017 Preview installation was not found when VS2017RTM is not installed. Remove comment introduced in #3614 (through commit966bd7f)* Fixing JaroWinkler tests with InvariantCulture and fixing async tests by removing Debugger.Break() (#3627)* Fixing JaroWinkler tests to use InvariantCulture for number-to-string* Fixing the crashing of test runners because of a Debugger.Break() in a test* update to System.Collections.Immutable 1.3.1 (#3641)* update to System.Collections.Immutable 1.3.1* fixes* fix assembly reference* [WIP] Adds optimized emit for int64 constants (#3620)* Adds optimized emit for int64 constants.* Adds comment linking to the changing PR.Thanks for this PR.Kevin* fix assembly reference (#3646)* Remove a few more build warnings (#3647)* fix assembly reference* remove more build warnings* fix build* move BuildFromSource projects to their own directory* Adds tests for emitted IL for new Int64 constants. (#3650)* Enable FS as prefix and ignore invalid values for warnings (#3631)* enable fs as prefix and ignore invalid values for warnings + tests* Allow #pragma to validate warnings* do it right* use ordinal compare* In both places* Add fs prefix to warnaserror* Fixup tests* Fix stack overflow on assembly resolution (#3658)* Fix stack overflow on tp assembly resolution* Feedback* Add impl files to file check results (#3659)* add LanguageServiceProfiling project to internals visible to list of FSharp.Compiler.Private project* add ImplementationFiles to FSharpCheckFileResults* make FSharpImplementationFileContents ctor internal* throw if ImplementationFiles is called having keepAssemblyContents flag set to false* add a test* spelling and cosmetics* This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd (#3672)* This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd* This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd* Remove ambiguous an irrelevant instruction, improved help and instructions* Fix a scenario where the return code wasn't nonzero for error conditions, fixes not creating backup dir when not backing up* add LanguageServiceProfiling project to internals visible to list of FSharp.Compiler.Private project (#3657)* bump FCS version (#3676)* bump version* Update RELEASE_NOTES.md* Parsing improvements: no reactor, add parsing options, error severity options (#3601)* Parse without reactor, add parsing options, error severity options* Revert parsing APIs (fallback to the new ones), fix VFT projects* Cache parse results after type check* Add impl files to file check results (#3659)* add LanguageServiceProfiling project to internals visible to list of FSharp.Compiler.Private project* add ImplementationFiles to FSharpCheckFileResults* make FSharpImplementationFileContents ctor internal* throw if ImplementationFiles is called having keepAssemblyContents flag set to false* add a test* spelling and cosmetics* This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd (#3672)* This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd* This adds backup, restore, coloration and many more checks to the update-vsintegration.cmd* Remove ambiguous an irrelevant instruction, improved help and instructions* Fix a scenario where the return code wasn't nonzero for error conditions, fixes not creating backup dir when not backing up* add LanguageServiceProfiling project to internals visible to list of FSharp.Compiler.Private project (#3657)* bump FCS version (#3676)* bump version* Update RELEASE_NOTES.md* updates to make tests pass* restore old behaviour of CheckFileInProjectAllowingStaleCachedResults (builder had been created by ParseFileInProject)* restore use of CheckFileInProjectAllowingStaleCachedResults* deprecate test relying on whacky behaviour of deprecated GetCheckResultsBeforeFileInProjectEvenIfStale* Use ParseFile and FSharpParsingOptions instead of ParseFileInProject* prepare FCS release with this feature* whitespace cleanup (#3682)* whitespace and docs (#3684)* Preserve XML docs for in-memory project references (#3683)* fix xmldocs for in-memory project references* add test* fix tests* whitespace and comments (#3686)* fix assembly reference* whitespace and comments* whitespace and comments* whitespace and comments* cherry pick two PRs from FCS (#3687)* fix assembly reference* remove line endings from all *.nuspec files* ProjectCracker returns *.fsi files in FSharpProjectOptions.SourceFiles array (in addition to *.fs files, in right order)* ProjectCracker raises exception if ProjectCrackerTool returns non null ProjectCrackerOptions.Error (new field)* fix build on linux* fix a test* slashes* revert slashes* Update FSharp.Compiler.Service.ProjectCracker.nuspec* try to fix travis* try to fix travis* list dependencies* no obsolete pdb in nuget* list dependencies* cherry pick of fsharp/fsharp change* bump FCS version number (#3688)* Update FSharp.Compiler.Service.MSBuild.v12.nuspec* fix FCS nuget on windows* fix-resource (#3690)* Bump FSharp.Compiler.Tools to 4.1.27 and align mono build files (#3693)* ri change from fsharp* fix test* bump FSC tools to 4.1.27* remove fsharp.core from Mono GAC* align mono directory* fix typo* install back versions with Mono* fix typo* update FCS doc generation (#3694)* update DEVGUIDE to add addiitional steps before running build (#3725)* Split templates out into a seperate vsix (#3720)* merge error* Merge issues
1 parentd26de72 commit531cd5b

File tree

284 files changed

+6180
-5459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+6180
-5459
lines changed

‎.gitignore‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,6 @@ scripts/*.patch
3535
/src/fsharp/FSharp.Compiler.Private/*.sln
3636
/src/fsharp/FSharp.Compiler.Private/*.userprefs
3737
/src/*.log
38-
/src/fsharp/FSharp.Compiler.Private/illex.fs
39-
/src/fsharp/FSharp.Compiler.Private/ilpars.fs
40-
/src/fsharp/FSharp.Compiler.Private/ilpars.fsi
41-
/src/fsharp/FSharp.Compiler.Private/lex.fs
42-
/src/fsharp/FSharp.Compiler.Private/pars.fs
43-
/src/fsharp/FSharp.Compiler.Private/pars.fsi
44-
/src/fsharp/FSharp.Compiler.Private/pplex.fs
45-
/src/fsharp/FSharp.Compiler.Private/pppars.fs
46-
/src/fsharp/FSharp.Compiler.Private/pppars.fsi
4738
/src/fsharp/Fsc-proto/illex.fs
4839
/src/fsharp/Fsc-proto/ilpars.fs
4940
/src/fsharp/Fsc-proto/ilpars.fsi

‎DEVGUIDE.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,15 @@ Follow the instructions below to build and develop the F# Compiler, Core Library
1313
Install
1414

1515
-[.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779)
16-
-[MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760)
16+
-[MSBuild 12.0](http://www.microsoft.com/en-us/download/details.aspx?id=40760) or Visual Studio 2013 (or later)
17+
18+
**NOTE on Windows:**
19+
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).
20+
2. The running command prompt must be run under Administrator right (`Run as Administrator`).
21+
22+
Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:
23+
24+
git clean -xfd
1725

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

‎FSharp.sln‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -205,18 +205,6 @@ Global
205205
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0=Release|Any CPU
206206
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg=Release|Any CPU
207207
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0=Release|Any CPU
208-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
209-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|Any CPU.Build.0=Debug|Any CPU
210-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.ActiveCfg=Debug|Any CPU
211-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Debug|x86.Build.0=Debug|Any CPU
212-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
213-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|Any CPU.Build.0=Proto|Any CPU
214-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.ActiveCfg=Proto|Any CPU
215-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Proto|x86.Build.0=Proto|Any CPU
216-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.ActiveCfg=Release|Any CPU
217-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|Any CPU.Build.0=Release|Any CPU
218-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.ActiveCfg=Release|Any CPU
219-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152}.Release|x86.Build.0=Release|Any CPU
220208
EndGlobalSection
221209
GlobalSection(SolutionProperties) =preSolution
222210
HideSolutionNode =FALSE
@@ -235,6 +223,5 @@ Global
235223
{88E2D422-6852-46E3-A740-83E391DC7973} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
236224
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
237225
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
238-
{A437A6EC-5323-47C2-8F86-E2CAC54FF152} ={3881429D-A97A-49EB-B7AE-A82BA5FE9C77}
239226
EndGlobalSection
240227
EndGlobal

‎Makefile‎

Lines changed: 45 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,106 +14,69 @@ all:
1414
$(MAKE) build
1515

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

2020
# The main targets
2121
build:
22-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
23-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
24-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
25-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/Fsc/Fsc.fsproj
26-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
27-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
28-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsi/Fsi.fsproj
29-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
31-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
32-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=3.1 src/fsharp/FSharp.Core/FSharp.Core.fsproj
33-
MONO_ENV_OPTIONS=$(monoopts)$(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=net40 /p:FSharpCoreBackVersion=4.0 src/fsharp/FSharp.Core/FSharp.Core.fsproj
34-
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40$@
35-
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40$@
36-
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40$@
37-
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40$@
38-
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40$@
39-
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40$@
40-
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40$@
41-
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40$@
42-
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40$@
43-
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40$@
44-
ifeq ("$(pclenabled47)", "yes")
45-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable47 src/fsharp/FSharp.Core/FSharp.Core.fsproj
46-
endif
47-
ifeq ("$(pclenabled7)", "yes")
48-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable7 src/fsharp/FSharp.Core/FSharp.Core.fsproj
49-
endif
50-
ifeq ("$(pclenabled78)", "yes")
51-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable78 src/fsharp/FSharp.Core/FSharp.Core.fsproj
52-
endif
53-
ifeq ("$(pclenabled259)", "yes")
54-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=portable259 src/fsharp/FSharp.Core/FSharp.Core.fsproj
55-
endif
56-
ifeq ("$(monodroidenabled)", "yes")
57-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=monoandroid10+monotouch10+xamarinios10 src/fsharp/FSharp.Core/FSharp.Core.fsproj
58-
endif
59-
ifeq ("$(xamarinmacenabled)", "yes")
60-
MONO_ENV_OPTIONS=$(monoopts) $(XBUILD) /p:Configuration=$(Configuration) /p:TargetFramework=xamarinmacmobile src/fsharp/FSharp.Core/FSharp.Core.fsproj
61-
endif
22+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core/FSharp.Core.fsproj
23+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Build/FSharp.Build.fsproj
24+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
25+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/Fsc/Fsc.fsproj
26+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
27+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
28+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
29+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
30+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj
31+
mkdir -p$(Configuration)/fsharp30/net40/bin
32+
mkdir -p$(Configuration)/fsharp31/net40/bin
33+
mkdir -p$(Configuration)/fsharp40/net40/bin
34+
cp -p packages/FSharp.Core.3.0.2/lib/net40/*$(Configuration)/fsharp30/net40/bin
35+
cp -p packages/FSharp.Core.3.1.2.5/lib/net40/*$(Configuration)/fsharp31/net40/bin
36+
cp -p packages/FSharp.Core.4.0.0.1/lib/net40/*$(Configuration)/fsharp40/net40/bin
37+
mkdir -p$(Configuration)/portable7/bin
38+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45/*$(Configuration)/portable7/bin
39+
mkdir -p$(Configuration)/portable47/bin
40+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+sl5+netcore45/*$(Configuration)/portable47/bin
41+
mkdir -p$(Configuration)/portable78/bin
42+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wp8/*$(Configuration)/portable78/bin
43+
mkdir -p$(Configuration)/portable259/bin
44+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wpa81+wp8/*$(Configuration)/portable259/bin
45+
mkdir -p$(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
46+
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/*$(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
47+
mkdir -p$(Configuration)/xamarinmacmobile/bin
48+
cp -p packages/FSharp.Core.4.1.17/lib/xamarinmac20/*$(Configuration)/xamarinmacmobile/bin
6249

6350

6451

6552
install:
6653
-rm -fr$(DESTDIR)$(monodir)/fsharp
6754
-rm -fr$(DESTDIR)$(monodir)/Microsoft\F#
6855
-rm -fr$(DESTDIR)$(monodir)/Microsoft\SDKs/F#
69-
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Core
70-
-rm -fr$(DESTDIR)$(monodir)/gac/FSharp.Compiler.Private
71-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v/FSharp
72-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v11.0/FSharp
73-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v12.0/FSharp
74-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v14.0/FSharp
75-
-rm -fr$(DESTDIR)$(monodir)/xbuild/Microsoft/VisualStudio/v15.0/FSharp
76-
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 install
56+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v/FSharp
57+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v11.0/FSharp
58+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v12.0/FSharp
59+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v14.0/FSharp
60+
-rm -fr$(DESTDIR)$(monodir)/msbuild/Microsoft/VisualStudio/v15.0/FSharp
61+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 install
7762
$(MAKE) -C mono/FSharp.Build install
7863
$(MAKE) -C mono/FSharp.Compiler.Private install
7964
$(MAKE) -C mono/Fsc install
8065
$(MAKE) -C mono/FSharp.Compiler.Interactive.Settings install
8166
$(MAKE) -C mono/FSharp.Compiler.Server.Shared install
8267
$(MAKE) -C mono/fsi install
8368
$(MAKE) -C mono/fsiAnyCpu install
84-
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=3.0 install
85-
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=3.1 install
86-
$(MAKE) -C mono/FSharp.Core TargetFramework=net40 FSharpCoreBackVersion=4.0 install
87-
$(MAKE) -C mono/policy.2.0.FSharp.Core TargetFramework=net40 install
88-
$(MAKE) -C mono/policy.2.3.FSharp.Core TargetFramework=net40 install
89-
$(MAKE) -C mono/policy.3.3.FSharp.Core TargetFramework=net40 install
90-
$(MAKE) -C mono/policy.3.7.FSharp.Core TargetFramework=net40 install
91-
$(MAKE) -C mono/policy.3.47.FSharp.Core TargetFramework=net40 install
92-
$(MAKE) -C mono/policy.3.78.FSharp.Core TargetFramework=net40 install
93-
$(MAKE) -C mono/policy.3.259.FSharp.Core TargetFramework=net40 install
94-
$(MAKE) -C mono/policy.4.0.FSharp.Core TargetFramework=net40 install
95-
$(MAKE) -C mono/policy.4.3.FSharp.Core TargetFramework=net40 install
96-
$(MAKE) -C mono/policy.4.4.FSharp.Core TargetFramework=net40 install
97-
ifeq ("$(pclenabled47)", "yes")
98-
$(MAKE) -C mono/FSharp.Core TargetFramework=portable47 install
99-
endif
100-
ifeq ("$(pclenabled7)", "yes")
101-
$(MAKE) -C mono/FSharp.Core TargetFramework=portable7 install
102-
endif
103-
ifeq ("$(pclenabled78)", "yes")
104-
$(MAKE) -C mono/FSharp.Core TargetFramework=portable78 install
105-
endif
106-
ifeq ("$(pclenabled259)", "yes")
107-
$(MAKE) -C mono/FSharp.Core TargetFramework=portable259 install
108-
endif
109-
ifeq ("$(monodroidenabled)", "yes")
110-
$(MAKE) -C mono/FSharp.Core TargetFramework=monoandroid10+monotouch10+xamarinios10 install
111-
endif
112-
ifeq ("$(xamarinmacenabled)", "yes")
113-
$(MAKE) -C mono/FSharp.Core TargetFramework=xamarinmacmobile install
114-
endif
69+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.0 install
70+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.1 install
71+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=4.0 install
72+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable47 install
73+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable7 install
74+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable78 install
75+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable259 install
76+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=monoandroid10+monotouch10+xamarinios10 install
77+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=xamarinmacmobile install
11578
echo"------------------------------ INSTALLED FILES --------------"
116-
ls -xlR $(DESTDIR)$(monodir)/fsharp $(DESTDIR)$(monodir)/xbuild $(DESTDIR)$(monodir)/gac/FSharp* $(DESTDIR)$(monodir)/Microsoft*
79+
ls -xlR$(DESTDIR)$(monodir)/fsharp$(DESTDIR)$(monodir)/msbuild$(DESTDIR)$(monodir)/xbuild$(DESTDIR)$(monodir)/Reference\Assemblies$(DESTDIR)$(monodir)/gac/FSharp*$(DESTDIR)$(monodir)/Microsoft*||true
11780

11881
dist:
11982
-rm -r fsharp-$(DISTVERSION) fsharp-$(DISTVERSION).tar.bz2

‎before_install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fi)
5858
fi)
5959

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

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp