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

Commit3800b76

Browse files
authored
Merge pull requestfsharp#820 from dsyme/simplify-mono
Simplify mono - remove use of autoconf
2 parentsba744fc +8a5fa57 commit3800b76

18 files changed

+60
-361
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,8 @@
2121
*.rtfdiff=astextplain
2222
*.RTFdiff=astextplain
2323

24-
install-shtexteol=lf
25-
autogen.shtexteol=lf
26-
launcher.intexteol=lf
27-
config.make.intexteol=lf
28-
targets.maketexteol=lf
29-
configure.actexteol=lf
30-
Makefile.intexteol=lf
24+
mono/install-shtexteol=lf
25+
mono/launchertexteol=lf
26+
mono/config.maketexteol=lf
3127

3228
*.bsllinguist-vendored=true

‎.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,7 @@ Proto
106106
sign_temp
107107
.libs
108108
configure
109-
mono/launcher
110-
autom4te.cache
111109
config.log
112-
mono/config.make
113110
config.status
114111
src/fsharp/FSharp.Compiler/illex.fs
115112
src/fsharp/FSharp.Compiler/ilpars.fs

‎DotnetCLIToolsVersion.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎FSharp.sln‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B8DDA694
3939
EndProject
4040
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Libraries","Libraries","{3058BC79-8E79-4645-B05D-48CC182FA8A6}"
4141
EndProject
42-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="HostedCompilerServer","tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj","{4239EFEA-E746-446A-BF7A-51FCBAB13946}"
43-
EndProject
44-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="ILComparer","tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj","{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
45-
EndProject
4642
Global
4743
GlobalSection(SolutionConfigurationPlatforms) =preSolution
4844
Debug|Any CPU=Debug|Any CPU
@@ -185,26 +181,6 @@ Global
185181
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.Build.0=Release|Any CPU
186182
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.ActiveCfg=Release|Any CPU
187183
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.Build.0=Release|Any CPU
188-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
189-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|Any CPU.Build.0=Debug|Any CPU
190-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|x86.ActiveCfg=Debug|Any CPU
191-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Debug|x86.Build.0=Debug|Any CPU
192-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Proto|Any CPU.ActiveCfg=Release|Any CPU
193-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Proto|x86.ActiveCfg=Release|Any CPU
194-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Release|Any CPU.ActiveCfg=Release|Any CPU
195-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Release|Any CPU.Build.0=Release|Any CPU
196-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Release|x86.ActiveCfg=Release|Any CPU
197-
{4239EFEA-E746-446A-BF7A-51FCBAB13946}.Release|x86.Build.0=Release|Any CPU
198-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
199-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Debug|Any CPU.Build.0=Debug|Any CPU
200-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Debug|x86.ActiveCfg=Debug|Any CPU
201-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Debug|x86.Build.0=Debug|Any CPU
202-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Proto|Any CPU.ActiveCfg=Release|Any CPU
203-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Proto|x86.ActiveCfg=Release|Any CPU
204-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.ActiveCfg=Release|Any CPU
205-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|Any CPU.Build.0=Release|Any CPU
206-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.ActiveCfg=Release|Any CPU
207-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}.Release|x86.Build.0=Release|Any CPU
208184
EndGlobalSection
209185
GlobalSection(SolutionProperties) =preSolution
210186
HideSolutionNode =FALSE
@@ -221,7 +197,5 @@ Global
221197
{C163E892-5BF7-4B59-AA99-B0E8079C67C4} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
222198
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
223199
{88E2D422-6852-46E3-A740-83E391DC7973} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
224-
{4239EFEA-E746-446A-BF7A-51FCBAB13946} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
225-
{2E60864A-E3FF-4BCC-810F-DC7C34E6B236} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
226200
EndGlobalSection
227201
EndGlobal

‎Makefile‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,30 @@
11
include$(topsrcdir)mono/config.make
22

3-
.PHONY: restore build
3+
.PHONY: restore build build-proto
44

55
restore:
66
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
7+
chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe
8+
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
9+
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
710

811
# Make the proto using the bootstrap, then make the final compiler using the proto
912
# We call MAKE sequentially because we don't want build-final to explicitly depend on build-proto,
1013
# as that causes a complete recompilation of both proto and final everytime you touch the
1114
# compiler sources.
1215
all:
16+
@echo -----------
17+
@echo prefix=$(prefix)
18+
@echo topdir=$(topdir)
19+
@echo monodir=$(monodir)
20+
@echo monolibdir=$(monolibdir)
21+
@echo monobindir=$(monobindir)
22+
@echo -----------
23+
$(MAKE) restore
1324
$(MAKE) build-proto
1425
$(MAKE) build
1526

16-
build-proto: restore
27+
build-proto:
1728
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
1829
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=Proto /p:TargetDotnetProfile=$(TargetDotnetProfile) src/fsharp/Fsc-proto/Fsc-proto.fsproj
1930

‎README.md‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ If using NuGet Package Manager, add the source to the list of available package
143143

144144
Building F# on Unix-type platforms requires[Mono](http://www.mono-project.com/download/) 5.0 or higher.
145145

146-
./autogen.sh --prefix=/usr
147146
make
148147
sudo make install
149148

@@ -152,17 +151,16 @@ That build and installs optimized binaries. To make debug, use ```make CONFIG=de
152151

153152
###Building on macOS
154153

155-
Building on macOS requires an install of the latestXamarintools or Mono package. Use a prefix to your version of Mono:
154+
Building on macOS requires an install of the latestVisual Studio for Mactools or Mono package.
156155

157-
./autogen.sh --prefix=/Library/Frameworks/Mono.framework/Versions/Current/
158156
make
159157
sudo make install
160158

161159
That build and installs optimized binaries. To make debug, use```make CONFIG=debug```
162160

163161
###Building on Windows
164162

165-
Install[.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779) and[MSBuild 12.0](https://www.microsoft.com/en-us/download/details.aspx?id=40760)
163+
Install[.NET 4.5.1](http://www.microsoft.com/en-us/download/details.aspx?id=40779).
166164

167165
Build using:
168166

@@ -184,8 +182,7 @@ If a strong-name signed FSharp.Core.dll is needed then use the one in
184182
vagrant up
185183
vagrant ssh
186184
cd /vagrant
187-
sudo apt-get install dos2unix autoconf
188-
./autogen.sh --prefix=/usr
185+
sudo apt-get install mono-complete
189186
make
190187
sudo make install
191188

@@ -295,7 +292,7 @@ accepting contributions to the F# compiler/library and tools.
295292

296293
In 2016 the Microsofthttp://visualfsharp.codeplex.com repo moved to GitHub athttps://github.com/Microsoft/visualfsharp.
297294

298-
This repository uses bootstrapping libraries, tools and F# compiler. The`lib/bootstrap/X.0` directories contain mono-built libraries, compiler and tools that can be used to bootstrap a build.You can also supply your own via the`--with-bootstrap` option.
295+
This repository uses bootstrapping libraries, tools and F# compiler. The`lib/bootstrap/X.0` directories contain mono-built libraries, compiler and tools that can be used to bootstrap a build.Y
299296

300297

301298

‎autogen.sh‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎build-netcore.bat‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎configure.ac‎

Lines changed: 0 additions & 76 deletions
This file was deleted.

‎lib/netcore/build-fsc-netcore.proj‎

Lines changed: 0 additions & 78 deletions
This file was deleted.

0 commit comments

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