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

Commit08bc40d

Browse files
committed
Remove fsharpc2, fsharpi2
The mono F# 2.0 build built an extra copy of FSharp.Compiler.dll,fsc.exe, fsi.exe under mono/lib/2.0. These were to give the option torun the compiler and F# interactive running under .NET 2.0, accessed by"fsharpc2" and "fsharpi2"For F# 3.0 these are no longer needed - like Microsoft releases of F#we only need one compiler, running on the mono .NET 4.0 profile. Thiscompiler is used for compiling .NET 2.0, .NET 4.0, Silverlight,Portable, Android etc. code. There is nothing special about .NET 2.0that needs its own copy of the compiler.So the commands "fsharpc2" and "fsharpi2" have been removed from themono F# 3.0 build.The commit also includes some other changes to reduce build times, likerunning fsyacc, flex etc. only once rather than twice.
1 parentfb45f2e commit08bc40d

File tree

15 files changed

+101
-53
lines changed

15 files changed

+101
-53
lines changed

‎Makefile.in‎

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

3-
allcleaninstalldo-protodo-2-0do-2-1do-4-0clean-2-0clean-2-1clean-4-0:
3+
allcleaninstalldo-protodo-finaldo-2-1:
44
$(MAKE) -C src/fsharp$@
55

66
dist:

‎src/fsharp/FSharp.Build-proto/Makefile.in‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ RESOURCES = \
2929
$(tmpdir)FSBuild.resources
3030

3131
$(tmpdir)FSBuild.resources:$(srcdir)../FSharp.Build/FSBuild.txt
32-
mono--debug$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
32+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
3333
resgen$(@:.resources=.resx)$@
3434

3535
do-proto: do-4-0
3636

37+
clean: clean-4-0
38+
3739
include$(topdir)/src/fsharp/targets.make
3840

‎src/fsharp/FSharp.Build/Makefile.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,9 @@ $(tmpdir)FSBuild.resources: $(srcdir)FSBuild.txt
3333

3434
include$(topdir)/src/fsharp/targets.make
3535

36-
install: install-lib-2 install-lib-4
36+
do-final: do-4-0
37+
38+
clean: clean-4-0
39+
40+
install: install-lib-4
3741

‎src/fsharp/FSharp.Compiler-proto/Makefile.in‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,24 +156,34 @@ RESOURCES= \
156156
$(tmpdir)FSComp.resources
157157

158158
$(tmpdir)FSComp.resources:$(srcdir)../FSComp.txt
159-
mono--debug$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
159+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
160160
resgen$(@:.resources=.resx)$@
161161

162162
$(tmpdir)FSStrings.resources:$(srcdir)../FSStrings.resx
163163
resgen$<$@
164164

165165
$(tmpdir)lex.fs:$(srcdir)../lex.fsl
166-
mono --debug$(FSLEX)$< -o$@ --lexlib Internal.Utilities.Text.Lexing --unicode
166+
mono$(MONO_OPTIONS)$(FSLEX)$< -o$@ --lexlib Internal.Utilities.Text.Lexing --unicode
167+
@-mkdir -p ../FSharp.Compiler/.libs/
168+
cp -p$(tmpdir)lex.fs* ../FSharp.Compiler/.libs/
167169

168170
$(tmpdir)illex.fs:$(srcdir)../../absil/illex.fsl
169-
mono --debug$(FSLEX)$< -o$@ --lexlib Internal.Utilities.Text.Lexing --unicode
171+
mono$(MONO_OPTIONS)$(FSLEX)$< -o$@ --lexlib Internal.Utilities.Text.Lexing --unicode
172+
@-mkdir -p ../FSharp.Compiler/.libs/
173+
cp -p$(tmpdir)illex.fs* ../FSharp.Compiler/.libs/
170174

171175
$(tmpdir)pars.fs:$(srcdir)../pars.fsy
172-
mono --debug$(FSYACC)$< -o$@ --internal --open Microsoft.FSharp.Compiler --module Microsoft.FSharp.Compiler.Parser --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing
176+
mono$(MONO_OPTIONS)$(FSYACC)$< -o$@ --internal --open Microsoft.FSharp.Compiler --module Microsoft.FSharp.Compiler.Parser --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing
177+
@-mkdir -p ../FSharp.Compiler/.libs/
178+
cp -p$(tmpdir)pars.fs* ../FSharp.Compiler/.libs/
173179

174180
$(tmpdir)ilpars.fs:$(srcdir)../../absil/ilpars.fsy
175-
mono --debug$(FSYACC)$< -o$@ --internal --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing
181+
mono$(MONO_OPTIONS)$(FSYACC)$< -o$@ --internal --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing
182+
@-mkdir -p ../FSharp.Compiler/.libs/
183+
cp -p$(tmpdir)ilpars.fs* ../FSharp.Compiler/.libs/
176184

177185
do-proto: do-4-0
178186

187+
clean: clean-4-0
188+
179189
include$(topdir)/src/fsharp/targets.make

‎src/fsharp/FSharp.Compiler.Interactive.Settings/Makefile.in‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ $(tmpdir)FSInteractiveSettings.resources: $(srcdir)../FSInteractiveSettings.txt
3131

3232
include$(topdir)/src/fsharp/targets.make
3333

34-
install: install-lib-2 install-lib-4
34+
do-final: do-4-0
35+
36+
clean: clean-4-0
37+
38+
install: install-lib-4
39+
40+
3541

3642

‎src/fsharp/FSharp.Compiler.Server.Shared/Makefile.in‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ $(tmpdir)FSServerShared.resources: $(srcdir)../fsiserver/FSServerShared.txt
3030

3131
include$(topdir)/src/fsharp/targets.make
3232

33-
install: install-lib-2 install-lib-4
33+
do-final: do-4-0
34+
35+
clean: clean-4-0
36+
37+
install: install-lib-4
38+
39+
3440

3541

‎src/fsharp/FSharp.Compiler/Makefile.in‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,26 +178,31 @@ RESOURCES= \
178178
$(tmpdir)FSComp.resources
179179

180180
$(tmpdir)FSComp.resources:$(srcdir)../FSComp.txt
181-
mono--debug$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
181+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(@:.resources=.fs)$(@:.resources=.resx)
182182
resgen$(@:.resources=.resx)$@
183183

184184
$(tmpdir)FSStrings.resources:$(srcdir)../FSStrings.resx
185185
resgen$<$@
186186

187187
$(tmpdir)lex.fs:$(srcdir)../lex.fsl
188-
mono--debug$(FSLEX)$< -o$@ --lexlib Internal.Utilities.Text.Lexing --unicode
188+
mono$(MONO_OPTIONS)$(FSLEX)$< -o$@ --lexlib Internal.Utilities.Text.Lexing --unicode
189189

190190
$(tmpdir)illex.fs:$(srcdir)../../absil/illex.fsl
191-
mono--debug$(FSLEX)$< -o$@ --lexlib Internal.Utilities.Text.Lexing --unicode
191+
mono$(MONO_OPTIONS)$(FSLEX)$< -o$@ --lexlib Internal.Utilities.Text.Lexing --unicode
192192

193193
$(tmpdir)pars.fs:$(srcdir)../pars.fsy
194-
mono--debug$(FSYACC)$< -o$@ --internal --open Microsoft.FSharp.Compiler --module Microsoft.FSharp.Compiler.Parser --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing
194+
mono$(MONO_OPTIONS)$(FSYACC)$< -o$@ --internal --open Microsoft.FSharp.Compiler --module Microsoft.FSharp.Compiler.Parser --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing
195195

196196
$(tmpdir)ilpars.fs:$(srcdir)../../absil/ilpars.fsy
197-
mono--debug$(FSYACC)$< -o$@ --internal --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing
197+
mono$(MONO_OPTIONS)$(FSYACC)$< -o$@ --internal --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing
198198

199199
include$(topdir)/src/fsharp/targets.make
200200

201-
install: install-lib-2 install-lib-4
201+
do-final: do-4-0
202+
203+
clean: clean-4-0
204+
205+
install: install-lib-4
206+
202207

203208

‎src/fsharp/FSharp.Core/Makefile.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,9 @@ $(tmpdir)FSCore.resources: $(srcdir)FSCore.resx
102102

103103
include$(topdir)/src/fsharp/targets.make
104104

105+
do-final: do-4-0 do-2-0
106+
107+
clean: clean-4-0 clean-2-1 clean-2-0
108+
105109
install: install-lib-2 install-lib-4 install-lib-4-5
106110

‎src/fsharp/Fsc-proto/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ sources = \
2828

2929
do-proto: do-4-0$(protodir)FSharp.Core.dll
3030

31+
clean: clean-4-0
32+
3133
include$(topdir)/src/fsharp/targets.make
3234

3335
$(protodir)FSharp.Core.dll:$(bootstrapdir)FSharp.Core.dll

‎src/fsharp/Fsc/Makefile.in‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,11 @@ sources = \
2424

2525
include$(topdir)/src/fsharp/targets.make
2626

27-
install: install-bin-2 install-bin-4 install-bin-4-5
27+
do-final: do-4-0
28+
29+
clean: clean-4-0
30+
31+
install: install-bin-4
32+
33+
2834

0 commit comments

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