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

Commite6351d4

Browse files
committed
Merge branch 'master' ofhttps://github.com/fsharp/fsharp
2 parents6c235ac +bcfd8ce commite6351d4

22 files changed

+376
-154
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,6 @@ src/fsharp/FSharp.Compiler-proto/pars.fs
5151
src/fsharp/FSharp.Compiler-proto/pars.fsi
5252
*~
5353
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.sln
54-
5554
tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012_FSharp_ConsoleApp_net45/Sample_VS2012_FSharp_ConsoleApp_net45.userprefs
55+
*.suo
56+
obj

‎README.md‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,25 @@ sudo make install
3737
```
3838
cd src
3939
msbuild fsharp-proto-build.proj
40+
ngen install ..\lib\proto\4.0\fsc-proto.exe (optional)
4041
msbuild fsharp-library-build.proj
4142
msbuild fsharp-compiler-build.proj
4243
```
43-
You can also build the FSharp.Core for .NET 2.0, Mono 2.1 andSilverlight 5.0 profiles:
44+
You can also build the FSharp.Core for .NET 2.0, Mono 2.1,Silverlight 5.0, Windows Phone 7.1, Portable Profile47 (net45+sl5+win8), Portable Profile88 (net4+sl4+wp71+win8) and XNA 4.0 for Xbox 360 profiles:
4445
```
4546
msbuild fsharp-library-build.proj /p:TargetFramework=net20
4647
msbuild fsharp-library-build.proj /p:TargetFramework=mono21
48+
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net45+sl5+win8
49+
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net4+sl4+wp71+win8
4750
msbuild fsharp-library-build.proj /p:TargetFramework=sl5
51+
msbuild fsharp-library-build.proj /p:TargetFramework=wp7
52+
msbuild fsharp-library-build.proj /p:TargetFramework=net40-xna40-xbox360
4853
```
49-
5054
You can also build the FSharp.Core and FSharp.Compiler.Silverlight.dll for Silverlight 5.0:
5155
```
5256
msbuild fsharp-library-build.proj /p:TargetFramework=sl5-compiler
5357
msbuild fsharp-compiler-build.proj /p:TargetFramework=sl5-compiler
5458
```
55-
And for Release versions of the same:
56-
```
57-
msbuild fsharp-library-build.proj /p:Configuration=Release
58-
msbuild fsharp-compiler-build.proj /p:Configuration=Release
59-
msbuild fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
60-
msbuild fsharp-library-build.proj /p:TargetFramework=mono21 /p:Configuration=Release
61-
msbuild fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
62-
msbuild fsharp-library-build.proj /p:TargetFramework=sl5-compiler /p:Configuration=Release
63-
msbuild fsharp-compiler-build.proj /p:TargetFramework=sl5-compiler /p:Configuration=Release
64-
```
6559
###On Windows, using xbuild (e.g. if no .NET is installed and only Mono 3.0 is installed):
6660

6761
```

‎config.make.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ SIGN_FLAGS = \
6565

6666
DEFINES_GENERAL = \
6767
--define:TRACE \
68-
--define:MONO
68+
--define:CROSS_PLATFORM_COMPILER
6969

7070
ifeq ($(CONFIG),debug)
7171
DEFINES_DEBUG = \

‎configure.ac‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ if ! pkg-config --atleast-version=$MONO_REQUIRED_VERSION mono; then
1919
AC_MSG_ERROR("Youneedmono$MONO_REQUIRED_VERSION")
2020
fi
2121

22+
AC_PATH_PROG(MONO_SGEN,mono-sgen,no)
23+
2224
if ! pkg-config --atleast-version=$MONO_RECOMMENDED_VERSION mono; then
2325
AC_MSG_WARN([Mono $MONO_RECOMMENDED_VERSION or higher is recommended, for better MSBuild (xbuild) compatibility])
24-
fi
2526

26-
AC_PATH_PROG(MONO_SGEN,mono-sgen,no)
27+
# stability of Mono's SGEN GC is not so good in older versions than Mono v3.0
28+
MONO_SGEN=no
29+
fi
2730

2831
# Checks for libraries.
2932

‎launcher.in‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
#!/bin/sh
22
EXEC="exec"
33

4-
iftest x$1 = x--debug;then
4+
iftest x"$1" = x--debug;then
55
DEBUG=--debug
66
shift
77
fi
88

9-
iftest x$1 = x--gdb;then
9+
iftest x"$1" = x--gdb;then
1010
shift
1111
EXEC="gdb --eval-command=run --args"
1212
fi
1313

14-
iftest x$1 = x--valgrind;then
14+
iftest x"$1" = x--valgrind;then
1515
shift
1616
EXEC="valgrind$VALGRIND_OPTIONS"
1717
fi
1818

1919
MONO_GC_OPTIONS=@mono_gc_options@
20-
iftest x$1 = x--gc=boehm;then
20+
iftest x"$1" = x--gc=boehm;then
2121
shift
2222
MONO_GC_OPTIONS=--gc=boehm
2323
fi
@@ -27,4 +27,4 @@ fi
2727
# location of the default FSharp install in order to find the FSharp compiler binaries (see
2828
# fsharpbinding/MonoDevelop.FSharpBinding/Services/CompilerLocationUtils.fs). That's a pretty unfortunate
2929
# way of finding those binaries. And really should be changed.
30-
$EXEC mono$DEBUG$MONO_OPTIONS$MONO_GC_OPTIONS @DIR@/@TOOL@$@
30+
$EXEC mono$DEBUG$MONO_OPTIONS$MONO_GC_OPTIONS @DIR@/@TOOL@"$@"

‎src/FSharpSource.targets‎

Lines changed: 226 additions & 24 deletions
Large diffs are not rendered by default.

‎src/assemblyinfo/assemblyinfo.FSharp.Build.dll.fs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
namespaceMicrosoft.FSharp
33
openSystem.Reflection
44
[<assembly:AssemblyDescription("FSharp.Build.dll")>]
5-
[<assembly:AssemblyCompany("Microsoft Corporation")>]
65
[<assembly:AssemblyTitle("FSharp.Build.dll")>]
7-
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
8-
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
6+
[<assembly:AssemblyCopyright("\169 Microsoft Corporation and other contributors. Apache 2.0 License.")>]
7+
[<assembly:AssemblyProduct("F# (open source edition)")>]
98
do()
109

1110
#if NO_STRONG_NAMES

‎src/assemblyinfo/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
namespaceMicrosoft.FSharp
33
openSystem.Reflection
44
[<assembly:AssemblyDescription("FSharp.Compiler.Interactive.Settings.dll")>]
5-
[<assembly:AssemblyCompany("Microsoft Corporation")>]
65
[<assembly:AssemblyTitle("FSharp.Compiler.Interactive.Settings.dll")>]
7-
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
8-
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
6+
[<assembly:AssemblyCopyright("\169 Microsoft Corporation and other contributors. Apache 2.0 License.")>]
7+
[<assembly:AssemblyProduct("F# (open source edition)")>]
98

109
#if NO_STRONG_NAMES
1110
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]

‎src/assemblyinfo/assemblyinfo.FSharp.Compiler.Server.Shared.dll.fs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ namespace Microsoft.FSharp
33
openSystem.Reflection
44

55
[<assembly:AssemblyDescription("FSharp.Compiler.Server.Shared.dll")>]
6-
[<assembly:AssemblyCompany("Microsoft Corporation")>]
76
[<assembly:AssemblyTitle("FSharp.Compiler.Server.Shared.dll")>]
8-
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
9-
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
7+
[<assembly:AssemblyCopyright("\169 Microsoft Corporation and other contributors. Apache 2.0 License.")>]
8+
[<assembly:AssemblyProduct("F# (open source edition)")>]
109

1110
#if NO_STRONG_NAMES
1211
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("fsi")>]

‎src/assemblyinfo/assemblyinfo.FSharp.Compiler.Silverlight.dll.fs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ namespace Microsoft.FSharp
33
openSystem.Reflection
44

55
[<assembly:AssemblyDescription("FSharp.Compiler.Silverlight.dll")>]
6-
[<assembly:AssemblyCompany("Microsoft Corporation")>]
76
[<assembly:AssemblyTitle("FSharp.Compiler.Silverlight.dll")>]
8-
[<assembly:AssemblyCopyright("\169 Microsoft Corporation. Apache 2.0 License.")>]
9-
[<assembly:AssemblyProduct("Microsoft\174 F#")>]
7+
[<assembly:AssemblyCopyright("\169 Microsoft Corporation and other contributors. Apache 2.0 License.")>]
8+
[<assembly:AssemblyProduct("F# (open source edition)")>]
109

1110
// Note: internals visible to unit test DLLs in Retail (and all) builds.
1211
[<assembly:System.Runtime.CompilerServices.InternalsVisibleTo("Salsa")>]

0 commit comments

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