[Pkg-cli-apps-commits] [fsharp] 10/71: Minor adjustments to align source code and compile portable profile libraries
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Fri Jan 17 05:18:09 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to tag 3.1.0
in repository fsharp.
commit 3a50d911b642a8a286a8acd276543157dbf75589
Author: Don Syme <donsyme at fastmail.fm>
Date: Thu Oct 3 13:27:49 2013 +0100
Minor adjustments to align source code and compile portable profile libraries
---
README.md | 20 +++++++++++++++++---
src/absil/ilwrite.fs | 2 +-
src/fsharp-compiler-unittests-build.proj | 4 +---
.../FSharp.Compiler-proto.fsproj | 10 ----------
src/fsharp/FSharp.Core/FSharp.Core.fsproj | 10 ----------
src/fsharp/FSharp.Core/printf.fs | 6 +++++-
src/fsharp/ReferenceResolution.fs | 2 +-
src/fsharp/ilxgen.fs | 1 +
8 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/README.md b/README.md
index 6c1ebf9..258bc7c 100644
--- a/README.md
+++ b/README.md
@@ -48,12 +48,13 @@ msbuild fsharp-compiler-build.proj /p:Configuration=Release
You can also build the FSharp.Core for .NET 2.0, Mono 2.1, MonoTouch, 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:
```
msbuild fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release
-msbuild fsharp-library-build.proj /p:TargetFramework=mono21 /p:Configuration=Release
-msbuild fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net45+sl5+win8 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=portable-net4+sl4+wp71+win8 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=portable-windows8+net45 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release
+
+msbuild fsharp-library-build.proj /p:TargetFramework=mono21 /p:Configuration=Release
+msbuild fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=wp7 /p:Configuration=Release
msbuild fsharp-library-build.proj /p:TargetFramework=net40-xna40-xbox360 /p:Configuration=Release
```
@@ -64,8 +65,21 @@ msbuild fsharp-compiler-build.proj /p:TargetFramework=sl5-compiler /p:Configurat
```
Change to ``` /p:Configuration=Debug``` for debug binaries.
-Change to ``` /p:FSharpCoreBackVersion=3.0``` to build a back version of FSharp.Core.dll with a
+Add ``` /p:FSharpCoreBackVersion=3.0``` to build a back version of FSharp.Core.dll with a
version number suitable for use when building libaries that have usable with both F# 3.0 and F 3.1 libraries.
+```
+msbuild fsharp-library-build.proj /p:TargetFramework=net20 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+msbuild fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+msbuild fsharp-library-build.proj /p:TargetFramework=portable-net45+sl5+win8 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+msbuild fsharp-library-build.proj /p:TargetFramework=portable-net4+sl4+wp71+win8 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+msbuild fsharp-library-build.proj /p:TargetFramework=portable-windows8+net45 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+msbuild fsharp-library-build.proj /p:TargetFramework=sl5 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+
+msbuild fsharp-library-build.proj /p:TargetFramework=mono21 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+msbuild fsharp-library-build.proj /p:TargetFramework=monotouch /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+msbuild fsharp-library-build.proj /p:TargetFramework=wp7 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+msbuild fsharp-library-build.proj /p:TargetFramework=net40-xna40-xbox360 /p:Configuration=Release /p:FSharpCoreBackVersion=3.0
+```
### On Windows, using xbuild (e.g. if no .NET is installed and only Mono 3.0 is installed):
diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs
index df626d4..67174d8 100755
--- a/src/absil/ilwrite.fs
+++ b/src/absil/ilwrite.fs
@@ -4614,7 +4614,7 @@ type options =
let WriteILBinary outfile (args: options) modul noDebugData =
- ignore (writeBinaryAndReportMappings (outfile, args.ilg, args.pdbfile, args.signer, args.fixupOverlappingSequencePoints, args.emitTailcalls, args.showTimes, args.dumpDebugInfo) modul noDebugData)
+ ignore (writeBinaryAndReportMappings (outfile, args.ilg, args.pdbfile, args.signer, args.fixupOverlappingSequencePoints, args.emitTailcalls, args.showTimes, args.dumpDebugInfo) modul noDebugData)
diff --git a/src/fsharp-compiler-unittests-build.proj b/src/fsharp-compiler-unittests-build.proj
index 1f626ab..c5d2a9f 100755
--- a/src/fsharp-compiler-unittests-build.proj
+++ b/src/fsharp-compiler-unittests-build.proj
@@ -11,9 +11,7 @@
<!-- Compiler: .NET 2.0 and 4.0 only -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net20' or
- '$(TargetFramework)' == 'net40' or
- '$(TargetFramework)' == 'mono20' or
- '$(TargetFramework)' == 'mono40'">
+ '$(TargetFramework)' == 'net40'">
<ProjectFiles Include="fsharp/Unittests/Unittests.fsproj"/>
</ItemGroup>
diff --git a/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj b/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
index 9fe60a4..40e5e01 100644
--- a/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
+++ b/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
@@ -1,14 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
-# Copyright (c) 2002-2011 Microsoft Corporation.
-#
-#
-#
-#
-#
-#
-# You must not remove this notice, or any other, from this software.
--->
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
index 256a4cf..2e187b1 100644
--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -1,14 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--
-# Copyright (c) 2002-2011 Microsoft Corporation.
-#
-#
-#
-#
-#
-#
-# You must not remove this notice, or any other, from this software.
--->
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
diff --git a/src/fsharp/FSharp.Core/printf.fs b/src/fsharp/FSharp.Core/printf.fs
index 4b11324..0f861df 100755
--- a/src/fsharp/FSharp.Core/printf.fs
+++ b/src/fsharp/FSharp.Core/printf.fs
@@ -1185,7 +1185,11 @@ module internal PrintfImpl =
)
#endif
- [<DefaultValue; ThreadStatic>]
+ [<DefaultValue>]
+#if FX_NO_THREAD_STATIC
+#else
+ [<ThreadStatic>]
+#endif
static val mutable private last : string * CachedItem<'T, 'State, 'Residue, 'Result>
static member Get(key : Format<'T, 'State, 'Residue, 'Result>) =
diff --git a/src/fsharp/ReferenceResolution.fs b/src/fsharp/ReferenceResolution.fs
index 08f02f4..3f2cc66 100644
--- a/src/fsharp/ReferenceResolution.fs
+++ b/src/fsharp/ReferenceResolution.fs
@@ -1,4 +1,4 @@
-namespace Viz
+namespace Viz
/// This type exists to have a concrete 'Target' type for a DebuggerVisualizerAttribute.
/// Ideally it would be out in its own assembly, but then the compiler would need to take a dependency on that assembly, so instead we
diff --git a/src/fsharp/ilxgen.fs b/src/fsharp/ilxgen.fs
index 646bbfe..3b380bc 100755
--- a/src/fsharp/ilxgen.fs
+++ b/src/fsharp/ilxgen.fs
@@ -4809,6 +4809,7 @@ and GenBindAfterSequencePoint cenv cgbuf eenv sp (TBind(vspec,rhsExpr,_)) =
let ilFieldDef =
{ ilFieldDef with
CustomAttrs = mkILCustomAttrs (ilAttribs @ [ cenv.g.ilg.mkDebuggerBrowsableNeverAttribute() ]) }
+
[ (fspec.EnclosingTypeRef, ilFieldDef) ]
let ilTypeRefForProperty = ilTyForProperty.TypeRef
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git
More information about the Pkg-cli-apps-commits
mailing list