[Pkg-cli-apps-commits] [fsharp] 01/05: use correct FSharp.Core in proto

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to tag 3.1.1
in repository fsharp.

commit 2e9f5f3297034b503dd1a7c9600d2f64247cf01f
Author: Don Syme <donsyme at fastmail.fm>
Date:   Mon Dec 30 12:32:37 2013 +0100

    use correct FSharp.Core in proto
---
 .gitignore                                         | 40 ++++++++++++++++++++++
 README.md                                          |  5 +--
 .../FSharp.Build-proto/FSharp.Build-proto.fsproj   |  4 ++-
 .../FSharp.Compiler-proto.fsproj                   |  4 ++-
 src/fsharp/Fsc-proto/Fsc-proto.fsproj              |  5 ++-
 src/fsharp/Fsc/Fsc.fsproj                          |  4 +--
 6 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad0f9a5..7efd4b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,43 @@ tests/projects/Sample_VS2012_FSharp_ConsoleApp_net45_with_resource/Sample_VS2012
 obj
 src/fsharp/FSharp.Data.TypeProviders/FSData.resx
 src/fsharp/fsiAnyCpu/FSIstrings.resx
+*.actual
+*.mdb
+*test.txt
+tests/fsharp/optimize/stats/*
+tests/fsharp/core/printing/*
+tests/fsharp/core/csfromfs/*
+tests/fsharp/core/control*/*
+tests/fsharp/core/unicode/*
+tests/fsharp/optimize/*/*
+tests/fsharp/typeProviders/builtin/*
+tests/*.log
+tests/fsharp/core/fsfromcs/*
+tests/fsharp/core/load-script/out.txt
+test.fs
+*.resx
+Vagrantfile
+.vagrant
+out
+fsharp/FSharp.Compiler.Silverlight/FSComp.resx
+fsharp/Script2.fsx
+fsharp/Script3.fsx
+tests/fsharp/core/resources/Resources.resources
+test*.il
+test*.res
+tmptest*.ml
+tmptest*.mli
+*.csdl
+*.ssdl
+_UNATTENDEDLOG
+test.ok
+build.ok
+*.dll.config
+*.exe.config
+*.pdb
+*.exe
+*.dll
+*.err
+*.diff
+*.vsdiff
+*.vserr
diff --git a/README.md b/README.md
index 996f30b..7e5c452 100644
--- a/README.md
+++ b/README.md
@@ -54,8 +54,9 @@ You can also build these independently using:
 ```
 cd src
 msbuild fsharp-proto-build.proj
-msbuild fsharp-library-build.proj /p:TargetFramework=net40 /p:Configuration=Release
-msbuild fsharp-compiler-build.proj /p:TargetFramework=net40 /p:Configuration=Release
+ngen install ..\lib\proto\fsc-proto.exe 
+msbuild fsharp-library-build.proj /p:Configuration=Release
+msbuild fsharp-compiler-build.proj /p:Configuration=Release
 ```
 
 You can also build the FSharp.Core for .NET 2.0, Xamarin Android, Xamarin iOS, 
diff --git a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
index 3562310..6314299 100755
--- a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
+++ b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj
@@ -43,7 +43,9 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core" />
+    <Reference Include="FSharp.Core">
+      <HintPath>$(FSharpSourcesRoot)\..\lib\bootstrap\4.0\FSharp.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Numerics" Condition="'$(TargetFramework)' == 'net40'" />
     <Reference Include="Microsoft.Build.Engine" />
diff --git a/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj b/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
index 546f38f..d0761db 100644
--- a/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
+++ b/src/fsharp/FSharp.Compiler-proto/FSharp.Compiler-proto.fsproj
@@ -422,7 +422,9 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core" />
+    <Reference Include="FSharp.Core">
+      <HintPath>$(FSharpSourcesRoot)\..\lib\bootstrap\4.0\FSharp.Core.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Drawing" />
diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj
index b33acee..280740c 100755
--- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj
+++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj
@@ -31,7 +31,10 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
-    <Reference Include="FSharp.Core" />
+    <Reference Include="FSharp.Core">
+      <HintPath>$(FSharpSourcesRoot)\..\lib\bootstrap\4.0\FSharp.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Runtime.Remoting" />
diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj
index 9c77566..49d1c7e 100644
--- a/src/fsharp/Fsc/Fsc.fsproj
+++ b/src/fsharp/Fsc/Fsc.fsproj
@@ -27,10 +27,10 @@
       <Link>Resources/assemblyinfo.fsc.exe.fs</Link>
     </Compile>
     <Compile Include="..\fscmain.fs">
-      <Link>Driver/fscmain.fs</Link>
+      <Link>fscmain.fs</Link>
     </Compile>
     <None Include="fsc.exe.config">
-      <Link>Driver/fsc.exe.config</Link>
+      <Link>fsc.exe.config</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git