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

Commitc90b0ee

Browse files
committed
Merge branch 'master' of git://github.com/fsharp/fsharp.
2 parentsd84864a +b273df3 commitc90b0ee

File tree

530 files changed

+112430
-122859
lines changed

Some content is hidden

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

530 files changed

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

66
dist:

‎README‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,38 @@
1-
This is the F# compiler and core library for Mono, based on the F# Powerpack code drop
2-
under the OSS approved Apache 2.0 license.
1+
This is the F# compiler, core library and core tools (open source edition). It uses the Apache 2.0 license.
32

4-
The build follows the cli\2.0 and cli\4.0 configuration on the original *.fsproj files included in
5-
the F# Powerpack code drop, in terms of flags and defines.
3+
The "master" branch is for the latest version of F# (currently F# 3.0)
64

7-
To bootstrap the compiler, binaries built on VS2010 are used, as the official binaries
8-
fail to build due to a possible tail call bug on Mono.
9-
10-
This build is based on F# Powerpack r54075
11-
12-
F# original powerpack sources are available from http://fsharppowerpack.codeplex.com/
5+
To bootstrap the compiler, binaries built from an earlier version of this project are used.
136

147
======= REQUIREMENTS =======
158

169
Requires mono 2.9 or higher.
1710

18-
Requires bootstrapping libraries, tools and f# compiler. The lib/bootstrap/X.0 directories contain
19-
mono-built libraries, compiler and tools that can be used to bootstrap a build. You can also supply
20-
your own via the --with-bootstrap option.
11+
On OSX, requires automake 2.69, e.g. use the one from homebeew:
12+
http://mxcl.github.com/homebrew/
13+
brew install automake
2114

2215
======= BUILDING =======
2316

24-
To build, run ./autogen.sh, then make in the usual way.
17+
To build, run
18+
./autogen.sh
19+
make
20+
make install
21+
22+
On OSX, to replace the installation of F# that comes with Mono you may
23+
need to use a prefix:
24+
25+
./autogen.sh --prefix=/Library/Frameworks/Mono.framework/Versions/2.10.9/
26+
27+
To build the FSharp.Core.dll for MonoAndroid, use
28+
make do-2-1
29+
30+
======= NOTES =======
31+
32+
Uses bootstrapping libraries, tools and f# compiler. The
33+
lib/bootstrap/X.0 directories contain mono-built libraries, compiler
34+
and tools that can be used to bootstrap a build. You can also supply
35+
your own via the --with-bootstrap option.
36+
37+
F# original powerpack sources are available from http://fsharppowerpack.codeplex.com/
2538

‎autogen.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#!/usr/bin/env sh
22
which autoreconf> /dev/null|| (echo"Please install autoconf"&&exit 1)
3+
# on OSX autoconf may need a little help with these paths
4+
aclocal -I /opt/local/share/aclocal -I /usr/local/share/aclocal2> /dev/null
35
autoreconf&& ./configure$@

‎config.make.in‎

Lines changed: 57 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,41 @@ libdir := ${prefix}/lib/
66
bindir := ${prefix}/bin/
77
monodir := @MONODIR@/
88
monolibdir2 := $(monodir)2.0/
9+
10+
#This is where to find MonoTouch of MonoAndroid, for "make do-2-1"
11+
#
12+
#For now this is hardwired, it should be optionally detected by configure.ac
13+
monolibdir21 := /Developer/MonoAndroid/usr/lib/mono/2.1/
14+
#monolibdir21 := /Developer/MonoTouch/usr/lib/mono/2.1/
15+
916
monolibdir35 := $(monodir)3.5/
1017
monolibdir4 := $(monodir)4.0/
11-
tooldir := $(topdir)lib/bootstrap/2.0/
18+
tooldir := $(topdir)lib/bootstrap/4.0/
19+
20+
#Enable this fo faster bulds, but not on Mono 2.11.5, see https://bugzilla.xamarin.com/show_bug.cgi?id=7815
21+
#MONO_OPTIONS += --gc=sgen
22+
23+
CONFIG = release
24+
DISTVERSION = 201011
1225

13-
bootstrapdir = $(bootstrap)/$(TARGET)/
26+
VERSION_2_0 = 2.3.0.0
27+
VERSION_2_1 = 2.3.1.0
28+
VERSION_4_0 = 4.3.0.0
29+
TARGET_2_0 = 2.0
30+
TARGET_2_1 = 2.1
31+
TARGET_4_0 = 4.0
32+
TOKEN = b03f5f7f11d50a3a
33+
34+
bootstrapdir = $(bootstrap)/4.0/
1435
tmpdir = .libs/
1536
objdir = $(tmpdir)$(TARGET)/
16-
protodir = $(builddir)/lib/proto/$(TARGET)/
37+
protodir = $(builddir)/lib/proto/4.0/
1738
outdir = $(builddir)lib/$(CONFIG)/$(TARGET)/
1839

19-
FSSRGEN := $(tooldir)fssrgen.exe
20-
FSLEX := $(tooldir)fslex.exe
21-
FSYACC := $(tooldir)fsyacc.exe
22-
23-
CONFIG := debug
24-
DISTVERSION := 201011
40+
FSSRGEN = $(tooldir)../2.0/fssrgen.exe
41+
FSLEX = $(tooldir)../2.0/fslex.exe
42+
FSYACC = $(tooldir)../2.0/fsyacc.exe
2543

26-
VERSION_2_0 := 2.0.0.0
27-
VERSION_4_0 := 4.0.0.0
28-
TARGET_2_0 := 2.0
29-
TARGET_4_0 := 4.0
30-
TOKEN := b03f5f7f11d50a3a
3144

3245
FLAGS = \
3346
--doc:$(objdir)$(NAME).xml \
@@ -41,13 +54,12 @@ FLAGS = \
4154
--nowarn:9
4255

4356
FINAL_FLAGS = \
57+
--define:STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY \
4458
--delaysign+ \
4559
--keyfile:$(topdir)msfinal.pub
4660

4761
DEFINES_GENERAL = \
48-
--define:NO_STRONG_NAMES \
4962
--define:TRACE \
50-
--define:FX_ATLEAST_35 \
5163
--define:MONO
5264

5365
DEFINES_DEBUG = \
@@ -57,18 +69,36 @@ DEFINES_DEBUG = \
5769
DEFINES_2_0 = \
5870
$(DEFINES_GENERAL) \
5971
$(DEFINES_DEBUG) \
60-
--define:FX_FSLIB_STRUCTURAL_EQUALITY \
61-
--define:FX_FSLIB_IOBSERVABLE \
62-
--define:FX_FSLIB_TUPLE \
63-
--define:FX_FSLIB_LAZY \
72+
--define:FX_NO_STRUCTURAL_EQUALITY \
73+
--define:FX_NO_IOBSERVABLE \
74+
--define:FX_NO_TUPLE \
75+
--define:FX_ATLEAST_35 \
76+
--define:FX_NO_LAZY \
6477
--define:FX_NO_CANCELLATIONTOKEN_CLASSES \
65-
--define:FX_NO_TASK
78+
--define:FX_NO_MONITOR_REPORTS_LOCKTAKEN \
79+
--define:FX_NO_TPL_PARALLEL \
80+
--define:FX_NO_CUSTOMATTRIBUTEDATA \
81+
--define:FX_NO_TASK \
82+
--define:FX_NO_BIGINT
83+
84+
DEFINES_2_1 = \
85+
$(DEFINES_GENERAL) \
86+
$(DEFINES_DEBUG) \
87+
--define:FX_NO_STRUCTURAL_EQUALITY \
88+
--define:FX_NO_CUSTOMATTRIBUTEDATA \
89+
--define:FX_NO_BIGINT_CULTURE_PARSE \
90+
--define:FX_ATLEAST_40 \
91+
--define:FX_ATLEAST_35 \
92+
--define:FX_ATLEAST_LINQ \
93+
--define:FX_NO_BIGINT
6694

6795
DEFINES_4_0 = \
6896
$(DEFINES_GENERAL) \
6997
$(DEFINES_DEBUG) \
98+
--define:FX_NO_BIGINT_CULTURE_PARSE \
7099
--define:FX_ATLEAST_40 \
71-
--define:BE_SECURITY_TRANSPARENT
100+
--define:FX_ATLEAST_35 \
101+
--define:FX_ATLEAST_LINQ
72102

73103
REFERENCES_2_0 = \
74104
-r:$(monolibdir)Microsoft.Build.Engine.dll \
@@ -79,6 +109,11 @@ REFERENCES_2_0 = \
79109
-r:$(monolibdir)System.Core.dll \
80110
-r:$(monolibdir)System.dll
81111

112+
REFERENCES_2_1 = \
113+
-r:$(monolibdir21)mscorlib.dll \
114+
-r:$(monolibdir21)System.Core.dll \
115+
-r:$(monolibdir21)System.dll
116+
82117
REFERENCES_4_0 = \
83118
-r:$(monolibdir)Microsoft.Build.Engine.dll \
84119
-r:$(monolibdir)Microsoft.Build.Framework.dll \

‎configure.ac‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ if test "x$PKG_CONFIG" = "xno"; then
1212
AC_MSG_ERROR([You need to install pkg-config])
1313
fi
1414

15-
PKG_CHECK_MODULES([MONO],[mono >= 2.9])
16-
17-
PKG_CHECK_MODULES([MONO_2_12],
18-
[mono >= 2.11.5], HAVE_MONO_2_12_OR_HIGHER=yes, HAVE_MONO_2_12_OR_HIGHER=no)
19-
20-
if test "x$HAVE_MONO_2_12_OR_HIGHER" = "xno" ; then
21-
AC_MSG_WARN([Mono 2.11.5 or higher is recommended, for better MSBuild (xbuild) compatibility])
22-
fi
15+
#PKG_CHECK_MODULES([MONO], [mono >= 2.9])
16+
#
17+
#PKG_CHECK_MODULES([MONO_2_12],
18+
#[mono >= 2.11.5], HAVE_MONO_2_12_OR_HIGHER=yes, HAVE_MONO_2_12_OR_HIGHER=no)
19+
#
20+
#if test "x$HAVE_MONO_2_12_OR_HIGHER" = "xno" ; then
21+
#AC_MSG_WARN([Mono 2.11.5 or higher is recommended, for better MSBuild (xbuild) compatibility])
22+
#fi
2323

2424
# Checks for libraries.
2525

@@ -71,6 +71,8 @@ src/fsharp/Fsc/Makefile
7171
src/fsharp/FSharp.Compiler.Interactive.Settings/Makefile
7272
src/fsharp/FSharp.Compiler.Server.Shared/Makefile
7373
src/fsharp/fsi/Makefile
74+
src/fsharp/policy.2.0.FSharp.Core/Makefile
75+
src/fsharp/policy.4.0.FSharp.Core/Makefile
7476
])
7577
AC_OUTPUT
7678

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

-47 KB
Binary file not shown.
-6.92 KB
Binary file not shown.

0 commit comments

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