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

Commitda3baeb

Browse files
committed
Optionally build FSharp.Core for Mono profile 2.1 (MonoAndroid, on Mac).
Optionally build FSharp.Core for Mono profile 2.1. make do-2-1builds libs/debug/2.1/FSharp.Corewhich (fingers crossed!) should be enough or MonoAndroid and MonoTouch,though the restrictions on generics on those platforms will be aproblem.Only works for Mac with MonoAndroid installed right now but onlybecause the path to the 2.1 profile mscorlib.dll is hardwiredAlso, only build one copy of proto (the one for .NET 4.0) to reducebuild times
1 parent86a1a6e commitda3baeb

22 files changed

+164
-260
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-4-0clean-2-0clean-4-0:
3+
allcleaninstalldo-protodo-2-0do-2-1do-4-0clean-2-0clean-2-1clean-4-0:
44
$(MAKE) -C src/fsharp$@
55

66
dist:

‎README‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
This is theopen sourceF# compilerand corelibrary. It uses the Apache 2.0 license.
1+
This is the F# compiler, core libraryand coretools (open source edition). It uses the Apache 2.0 license.
22

3-
The "master" branch is for the latest version of F#,currently F# 3.0
3+
The "master" branch is for the latest version of F# (currently F# 3.0)
44

55
The "2.0" branch is for F# 2.0.
66

@@ -14,6 +14,9 @@ Requires mono 2.9 or higher.
1414

1515
To build, run ./autogen.sh, then make in the usual way.
1616

17+
To build the experimental FSharp.Core.dll for MonoAndroid or MonoTouch, use
18+
make do-2-1
19+
1720
======= NOTES =======
1821

1922
Uses bootstrapping libraries, tools and f# compiler. The lib/bootstrap/X.0 directories contain

‎config.make.in‎

Lines changed: 35 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@ libdir := ${prefix}/lib/
66
bindir := ${prefix}/bin/
77
monodir := @MONODIR@/
88
monolibdir2 := $(monodir)2.0/
9+
10+
#For now this is hardwired, it should be optionally detected by configure.ac
11+
monolibdir21 := /Developer/MonoAndroid/usr/lib/mono/2.1/
12+
913
monolibdir35 := $(monodir)3.5/
1014
monolibdir4 := $(monodir)4.0/
11-
tooldir := $(topdir)lib/bootstrap/2.0/
15+
tooldir := $(topdir)lib/bootstrap/4.0/
1216

1317
#MONO_OPTIONS += --gc=sgen
1418

15-
bootstrapdir = $(bootstrap)/$(TARGET)/
19+
bootstrapdir = $(bootstrap)/4.0/
1620
tmpdir = .libs/
1721
objdir = $(tmpdir)$(TARGET)/
18-
protodir = $(builddir)/lib/proto/$(TARGET)/
22+
protodir = $(builddir)/lib/proto/4.0/
1923
outdir = $(builddir)lib/$(CONFIG)/$(TARGET)/
2024

2125
FSSRGEN := $(tooldir)fssrgen.exe
@@ -26,8 +30,10 @@ CONFIG := debug
2630
DISTVERSION := 201011
2731

2832
VERSION_2_0 := 2.3.0.0
33+
VERSION_2_1 := 2.3.1.0
2934
VERSION_4_0 := 4.3.0.0
3035
TARGET_2_0 := 2.0
36+
TARGET_2_1 := 2.1
3137
TARGET_4_0 := 4.0
3238
TOKEN := b03f5f7f11d50a3a
3339

@@ -43,7 +49,7 @@ FLAGS = \
4349
--nowarn:9
4450

4551
FINAL_FLAGS = \
46-
--define:STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY \
52+
--define:STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY \
4753
--delaysign+ \
4854
--keyfile:$(topdir)msfinal.pub
4955

@@ -61,22 +67,33 @@ DEFINES_2_0 = \
6167
--define:FX_NO_STRUCTURAL_EQUALITY \
6268
--define:FX_NO_IOBSERVABLE \
6369
--define:FX_NO_TUPLE \
64-
--define:FX_ATLEAST_35 \
70+
--define:FX_ATLEAST_35 \
6571
--define:FX_NO_LAZY \
6672
--define:FX_NO_CANCELLATIONTOKEN_CLASSES \
67-
--define:FX_NO_MONITOR_REPORTS_LOCKTAKEN \
68-
--define:FX_NO_TPL_PARALLEL \
69-
--define:FX_NO_CUSTOMATTRIBUTEDATA \
73+
--define:FX_NO_MONITOR_REPORTS_LOCKTAKEN \
74+
--define:FX_NO_TPL_PARALLEL \
75+
--define:FX_NO_CUSTOMATTRIBUTEDATA \
7076
--define:FX_NO_TASK \
71-
--define:FX_NO_BIGINT
77+
--define:FX_NO_BIGINT
78+
79+
DEFINES_2_1 = \
80+
$(DEFINES_GENERAL) \
81+
$(DEFINES_DEBUG) \
82+
--define:FX_NO_STRUCTURAL_EQUALITY \
83+
--define:FX_NO_CUSTOMATTRIBUTEDATA \
84+
--define:FX_NO_BIGINT_CULTURE_PARSE \
85+
--define:FX_ATLEAST_40 \
86+
--define:FX_ATLEAST_35 \
87+
--define:FX_ATLEAST_LINQ \
88+
--define:FX_NO_BIGINT
7289

7390
DEFINES_4_0 = \
7491
$(DEFINES_GENERAL) \
7592
$(DEFINES_DEBUG) \
76-
--define:FX_NO_BIGINT_CULTURE_PARSE \
77-
--define:FX_ATLEAST_40 \
78-
--define:FX_ATLEAST_35 \
79-
--define:FX_ATLEAST_LINQ
93+
--define:FX_NO_BIGINT_CULTURE_PARSE \
94+
--define:FX_ATLEAST_40 \
95+
--define:FX_ATLEAST_35 \
96+
--define:FX_ATLEAST_LINQ
8097

8198
REFERENCES_2_0 = \
8299
-r:$(monolibdir)Microsoft.Build.Engine.dll \
@@ -87,6 +104,11 @@ REFERENCES_2_0 = \
87104
-r:$(monolibdir)System.Core.dll \
88105
-r:$(monolibdir)System.dll
89106

107+
REFERENCES_2_1 = \
108+
-r:$(monolibdir21)mscorlib.dll \
109+
-r:$(monolibdir21)System.Core.dll \
110+
-r:$(monolibdir21)System.dll
111+
90112
REFERENCES_4_0 = \
91113
-r:$(monolibdir)Microsoft.Build.Engine.dll \
92114
-r:$(monolibdir)Microsoft.Build.Framework.dll \

‎lib/bootstrap/2.0/FSharp.Build.dll‎

-45.5 KB
Binary file not shown.
-22 KB
Binary file not shown.
-8 KB
Binary file not shown.
-9.85 MB
Binary file not shown.

‎lib/bootstrap/2.0/FSharp.Core.dll‎

-910 KB
Binary file not shown.
-273 KB
Binary file not shown.
-405 KB
Binary file not shown.

0 commit comments

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