[Pkg-cli-apps-commits] [fsharp] 29/71: use virtual directories in compiler project files
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Fri Jan 17 05:18:13 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 e726272dba5b245d59038f04a8ff5653e4736d90
Author: Don Syme <donsyme at fastmail.fm>
Date: Fri Nov 29 12:03:18 2013 +0000
use virtual directories in compiler project files
---
src/fsharp/FSharp.Build/FSharp.Build.fsproj | 24 +-
.../FSharp.Compiler.Interactive.Settings.fsproj | 14 +-
src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj | 414 +++++++++++----------
src/fsharp/FSharp.Core/FSharp.Core.fsproj | 110 +++---
src/fsharp/Fsc/Fsc.fsproj | 5 +-
src/fsharp/fsi/Fsi.fsproj | 12 +-
6 files changed, 299 insertions(+), 280 deletions(-)
diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
index 27f0015..7375382 100644
--- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj
+++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj
@@ -17,22 +17,32 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' " />
<ItemGroup>
<FsSrGen Include="FSBuild.txt">
- <Link>FSBuild.txt</Link>
+ <Link>Utilities/FSBuild.txt</Link>
</FsSrGen>
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs">
- <Link>assemblyinfo.FSharp.Build.dll.fs</Link>
+ <Link>Utilities/assemblyinfo.FSharp.Build.dll.fs</Link>
</Compile>
<Compile Include="..\..\utils\CompilerLocationUtils.fs">
- <Link>CompilerLocationUtils.fs</Link>
+ <Link>Utilities/CompilerLocationUtils.fs</Link>
+ </Compile>
+ <Compile Include="Fsc.fsi" >
+ <Link>BuildTasks/Fsc.fsi</Link>
+ </Compile>
+ <Compile Include="Fsc.fs" >
+ <Link>BuildTasks/Fsc.fs</Link>
+ </Compile>
+ <Compile Include="CreateFSharpManifestResourceName.fsi" >
+ <Link>BuildTasks/CreateFSharpManifestResourceName.fsi</Link>
+ </Compile>
+ <Compile Include="CreateFSharpManifestResourceName.fs" >
+ <Link>BuildTasks/CreateFSharpManifestResourceName.fs</Link>
</Compile>
- <Compile Include="Fsc.fsi" />
- <Compile Include="Fsc.fs" />
- <Compile Include="CreateFSharpManifestResourceName.fsi" />
- <Compile Include="CreateFSharpManifestResourceName.fs" />
<None Include="Microsoft.FSharp.Targets">
+ <Link>Microsoft.FSharp.Targets</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Microsoft.Portable.FSharp.Targets">
+ <Link>Microsoft.Portable.FSharp.Targets</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
index ea957f1..a16260f 100644
--- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
+++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
@@ -19,19 +19,19 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' " />
<ItemGroup>
<FsSrGen Include="..\FSInteractiveSettings.txt">
- <Link>FSInteractiveSettings.txt</Link>
+ <Link>Utilities/FSInteractiveSettings.txt</Link>
</FsSrGen>
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs">
- <Link>assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs</Link>
+ <Link>Utilities/assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs</Link>
+ </Compile>
+ <Compile Include="..\fsiattrs.fs">
+ <Link>Utilities/fsiattrs.fs</Link>
</Compile>
<Compile Include="..\fsiaux.fsi">
- <Link>fsiaux.fsi</Link>
+ <Link>InteractiveSettings/fsiaux.fsi</Link>
</Compile>
<Compile Include="..\fsiaux.fs">
- <Link>fsiaux.fs</Link>
- </Compile>
- <Compile Include="..\fsiattrs.fs">
- <Link>fsiattrs.fs</Link>
+ <Link>InteractiveSettings/fsiaux.fs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
diff --git a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
index dedf037..7318fed 100644
--- a/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
+++ b/src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
@@ -21,204 +21,207 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' " />
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' " />
<ItemGroup>
+ <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.dll.fs">
+ <Link>assemblyinfo.FSharp.Compiler.dll.fs</Link>
+ </Compile>
<FsSrGen Include="..\FSComp.txt">
- <Link>FSComp.txt</Link>
+ <Link>ErrorText/FSComp.txt</Link>
</FsSrGen>
<EmbeddedResource Include="..\FSStrings.resx">
- <Link>FSStrings.resx</Link>
+ <Link>ErrorText/FSStrings.resx</Link>
</EmbeddedResource>
- <Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.dll.fs">
- <Link>assemblyinfo.FSharp.Compiler.dll.fs</Link>
- </Compile>
- <FsLex Include="..\lex.fsl">
- <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
- <Link>lex.fsl</Link>
- </FsLex>
- <FsLex Include="..\..\absil\illex.fsl">
- <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
- <Link>illex.fsl</Link>
- </FsLex>
- <FsYacc Include="..\pars.fsy">
- <Module>Microsoft.FSharp.Compiler.Parser</Module>
- <Open>Microsoft.FSharp.Compiler</Open>
- <OtherFlags>--internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
- <Link>pars.fsy</Link>
- </FsYacc>
- <FsYacc Include="..\..\absil\ilpars.fsy">
- <Module>Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser</Module>
- <Open>Microsoft.FSharp.Compiler.AbstractIL</Open>
- <OtherFlags>--internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
- <Link>ilpars.fsy</Link>
- </FsYacc>
- <Compile Include="..\ExtensibleDumper.fsi">
- <Link>ExtensibleDumper.fsi</Link>
- </Compile>
- <Compile Include="..\ExtensibleDumper.fs">
- <Link>ExtensibleDumper.fs</Link>
- </Compile>
<Compile Include="..\..\utils\sformat.fsi">
- <Link>sformat.fsi</Link>
+ <Link>ErrorText/sformat.fsi</Link>
</Compile>
<Compile Include="..\..\utils\sformat.fs">
- <Link>sformat.fs</Link>
+ <Link>ErrorText/sformat.fs</Link>
</Compile>
<Compile Include="..\sr.fsi">
- <Link>sr.fsi</Link>
+ <Link>ErrorText/sr.fsi</Link>
</Compile>
<Compile Include="..\sr.fs">
- <Link>sr.fs</Link>
+ <Link>ErrorText/sr.fs</Link>
</Compile>
<Compile Include="..\..\utils\prim-lexing.fsi">
- <Link>prim-lexing.fsi</Link>
+ <Link>LexYaccRuntime/prim-lexing.fsi</Link>
</Compile>
<Compile Include="..\..\utils\prim-lexing.fs">
- <Link>prim-lexing.fs</Link>
+ <Link>LexYaccRuntime/prim-lexing.fs</Link>
</Compile>
<Compile Include="..\..\utils\prim-parsing.fsi">
- <Link>prim-parsing.fsi</Link>
+ <Link>LexYaccRuntime/prim-parsing.fsi</Link>
</Compile>
<Compile Include="..\..\utils\prim-parsing.fs">
- <Link>prim-parsing.fs</Link>
+ <Link>LexYaccRuntime/prim-parsing.fs</Link>
+ </Compile>
+ <Compile Include="..\ExtensibleDumper.fsi">
+ <Link>Utilities/ExtensibleDumper.fsi</Link>
+ </Compile>
+ <Compile Include="..\ExtensibleDumper.fs">
+ <Link>Utilities/ExtensibleDumper.fs</Link>
</Compile>
<Compile Include="..\..\utils\resizearray.fsi">
- <Link>resizearray.fsi</Link>
+ <Link>Utilities/resizearray.fsi</Link>
</Compile>
<Compile Include="..\..\utils\resizearray.fs">
- <Link>resizearray.fs</Link>
+ <Link>Utilities/resizearray.fs</Link>
</Compile>
<Compile Include="..\..\utils\HashMultiMap.fsi">
- <Link>HashMultiMap.fsi</Link>
+ <Link>Utilities/HashMultiMap.fsi</Link>
</Compile>
<Compile Include="..\..\utils\HashMultiMap.fs">
- <Link>HashMultiMap.fs</Link>
+ <Link>Utilities/HashMultiMap.fs</Link>
</Compile>
<Compile Include="..\..\utils\TaggedCollections.fsi">
- <Link>TaggedCollections.fsi</Link>
+ <Link>Utilities/TaggedCollections.fsi</Link>
</Compile>
<Compile Include="..\..\utils\TaggedCollections.fs">
- <Link>TaggedCollections.fs</Link>
+ <Link>Utilities/TaggedCollections.fs</Link>
</Compile>
<Compile Include="..\FlatList.fs">
- <Link>FlatList.fs</Link>
+ <Link>Utilities/FlatList.fs</Link>
</Compile>
<Compile Include="..\..\absil\illib.fs">
- <Link>illib.fs</Link>
+ <Link>Utilities/illib.fs</Link>
</Compile>
<Compile Include="..\..\utils\filename.fsi">
- <Link>filename.fsi</Link>
+ <Link>Utilities/filename.fsi</Link>
</Compile>
<Compile Include="..\..\utils\filename.fs">
- <Link>filename.fs</Link>
+ <Link>Utilities/filename.fs</Link>
</Compile>
<Compile Include="..\..\absil\zmap.fsi">
- <Link>zmap.fsi</Link>
+ <Link>Utilities/zmap.fsi</Link>
</Compile>
<Compile Include="..\..\absil\zmap.fs">
- <Link>zmap.fs</Link>
+ <Link>Utilities/zmap.fs</Link>
</Compile>
<Compile Include="..\..\absil\zset.fsi">
- <Link>zset.fsi</Link>
+ <Link>Utilities/zset.fsi</Link>
</Compile>
<Compile Include="..\..\absil\zset.fs">
- <Link>zset.fs</Link>
+ <Link>Utilities/zset.fs</Link>
</Compile>
<Compile Include="..\..\absil\bytes.fsi">
- <Link>bytes.fsi</Link>
+ <Link>Utilities/bytes.fsi</Link>
</Compile>
<Compile Include="..\..\absil\bytes.fs">
- <Link>bytes.fs</Link>
+ <Link>Utilities/bytes.fs</Link>
</Compile>
<Compile Include="..\..\absil\ildiag.fsi">
- <Link>ildiag.fsi</Link>
+ <Link>Utilities/ildiag.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ildiag.fs">
- <Link>ildiag.fs</Link>
+ <Link>Utilities/ildiag.fs</Link>
+ </Compile>
+ <Compile Include="..\InternalCollections.fsi">
+ <Link>Utilities/InternalCollections.fsi</Link>
+ </Compile>
+ <Compile Include="..\InternalCollections.fs">
+ <Link>Utilities/InternalCollections.fs</Link>
+ </Compile>
+ <Compile Include="..\QueueList.fs">
+ <Link>Utilities/QueueList.fs</Link>
+ </Compile>
+ <Compile Include="..\lib.fs">
+ <Link>Utilities/lib.fs</Link>
+ </Compile>
+ <Compile Include="..\InternalFileSystemUtils.fsi">
+ <Link>Utilities/InternalFileSystemUtils.fsi</Link>
+ </Compile>
+ <Compile Include="..\InternalFileSystemUtils.fs">
+ <Link>Utilities/InternalFileSystemUtils.fs</Link>
+ </Compile>
+ <Compile Include="..\TraceCall.fsi">
+ <Link>Utilities/TraceCall.fsi</Link>
+ </Compile>
+ <Compile Include="..\TraceCall.fs">
+ <Link>Utilities/TraceCall.fs</Link>
+ </Compile>
+ <Compile Include="..\range.fsi">
+ <Link>ErrorLogging/range.fsi</Link>
+ </Compile>
+ <Compile Include="..\range.fs">
+ <Link>ErrorLogging/range.fs</Link>
+ </Compile>
+ <Compile Include="..\ErrorLogger.fs">
+ <Link>ErrorLogging/ErrorLogger.fs</Link>
</Compile>
<Compile Include="..\ReferenceResolution.fs">
<Link>ReferenceResolution.fs</Link>
</Compile>
+ <FsLex Include="..\..\absil\illex.fsl">
+ <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
+ <Link>AbsIL/illex.fsl</Link>
+ </FsLex>
+ <FsYacc Include="..\..\absil\ilpars.fsy">
+ <Module>Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser</Module>
+ <Open>Microsoft.FSharp.Compiler.AbstractIL</Open>
+ <OtherFlags>--internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
+ <Link>AbsIL/ilpars.fsy</Link>
+ </FsYacc>
<Compile Include="..\..\absil\il.fsi">
- <Link>il.fsi</Link>
+ <Link>AbsIL/il.fsi</Link>
</Compile>
<Compile Include="..\..\absil\il.fs">
- <Link>il.fs</Link>
+ <Link>AbsIL/il.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilx.fsi">
- <Link>ilx.fsi</Link>
+ <Link>AbsIL/ilx.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilx.fs">
- <Link>ilx.fs</Link>
+ <Link>AbsIL/ilx.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilascii.fsi">
- <Link>ilascii.fsi</Link>
+ <Link>AbsIL/ilascii.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilascii.fs">
- <Link>ilascii.fs</Link>
+ <Link>AbsIL/ilascii.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilprint.fsi">
- <Link>ilprint.fsi</Link>
+ <Link>AbsIL/ilprint.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilprint.fs">
- <Link>ilprint.fs</Link>
+ <Link>AbsIL/ilprint.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilmorph.fsi">
- <Link>ilmorph.fsi</Link>
+ <Link>AbsIL/ilmorph.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilmorph.fs">
- <Link>ilmorph.fs</Link>
+ <Link>AbsIL/ilmorph.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilsupp.fsi">
- <Link>ilsupp.fsi</Link>
+ <Link>AbsIL/ilsupp.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilsupp.fs">
- <Link>ilsupp.fs</Link>
- </Compile>
- <Compile Include="ilpars.fs" />
- <Compile Include="illex.fs" />
- <Compile Include="..\..\absil\ilbinary.fsi">
- <Link>ilbinary.fsi</Link>
- </Compile>
- <Compile Include="..\..\absil\ilbinary.fs">
- <Link>ilbinary.fs</Link>
- </Compile>
- <Compile Include="..\lib.fs">
- <Link>lib.fs</Link>
- </Compile>
- <Compile Include="..\range.fsi">
- <Link>range.fsi</Link>
- </Compile>
- <Compile Include="..\range.fs">
- <Link>range.fs</Link>
+ <Link>AbsIL/ilsupp.fs</Link>
</Compile>
- <Compile Include="..\ErrorLogger.fs">
- <Link>ErrorLogger.fs</Link>
- </Compile>
- <Compile Include="..\tainted.fsi">
- <Link>tainted.fsi</Link>
+ <Compile Include="ilpars.fs" >
+ <Link>AbsIL/ilpars.fs</Link>
</Compile>
- <Compile Include="..\tainted.fs">
- <Link>tainted.fs</Link>
+ <Compile Include="illex.fs" >
+ <Link>AbsIL/illex.fs</Link>
</Compile>
- <Compile Include="..\InternalCollections.fsi">
- <Link>InternalCollections.fsi</Link>
+ <Compile Include="..\..\absil\ilbinary.fsi">
+ <Link>AbsIL/ilbinary.fsi</Link>
</Compile>
- <Compile Include="..\InternalCollections.fs">
- <Link>InternalCollections.fs</Link>
+ <Compile Include="..\..\absil\ilbinary.fs">
+ <Link>AbsIL/ilbinary.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilread.fsi">
- <Link>ilread.fsi</Link>
+ <Link>AbsIL/ilread.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilread.fs">
- <Link>ilread.fs</Link>
+ <Link>AbsIL/ilread.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fsi">
- <Link>ilwrite.fsi</Link>
+ <Link>AbsIL/ilwrite.fsi</Link>
</Compile>
<Compile Include="..\..\absil\ilwrite.fs">
- <Link>ilwrite.fs</Link>
+ <Link>AbsIL/ilwrite.fs</Link>
</Compile>
<Compile Include="..\..\absil\ilreflect.fs">
- <Link>ilreflect.fs</Link>
+ <Link>AbsIL/ilreflect.fs</Link>
</Compile>
<Compile Include="..\..\utils\CompilerLocationUtils.fs">
<Link>CompilerLocationUtils.fs</Link>
@@ -227,258 +230,263 @@
<Link>PrettyNaming.fs</Link>
</Compile>
<Compile Include="..\..\ilx\ilxsettings.fs">
- <Link>ilxsettings.fs</Link>
+ <Link>ILXErase/ilxsettings.fs</Link>
</Compile>
<Compile Include="..\..\ilx\pubclo.fsi">
- <Link>pubclo.fsi</Link>
+ <Link>ILXErase/pubclo.fsi</Link>
</Compile>
<Compile Include="..\..\ilx\pubclo.fs">
- <Link>pubclo.fs</Link>
+ <Link>ILXErase/pubclo.fs</Link>
</Compile>
<Compile Include="..\..\ilx\cu_erase.fsi">
- <Link>cu_erase.fsi</Link>
+ <Link>ILXErase/cu_erase.fsi</Link>
</Compile>
<Compile Include="..\..\ilx\cu_erase.fs">
- <Link>cu_erase.fs</Link>
- </Compile>
- <Compile Include="..\InternalFileSystemUtils.fsi">
- <Link>InternalFileSystemUtils.fsi</Link>
- </Compile>
- <Compile Include="..\InternalFileSystemUtils.fs">
- <Link>InternalFileSystemUtils.fs</Link>
+ <Link>ILXErase/cu_erase.fs</Link>
</Compile>
+ <FsLex Include="..\lex.fsl">
+ <OtherFlags>--lexlib Internal.Utilities.Text.Lexing</OtherFlags>
+ <Link>ParserAndUntypedAST/lex.fsl</Link>
+ </FsLex>
+ <FsYacc Include="..\pars.fsy">
+ <Module>Microsoft.FSharp.Compiler.Parser</Module>
+ <Open>Microsoft.FSharp.Compiler</Open>
+ <OtherFlags>--internal --lexlib Internal.Utilities.Text.Lexing --parslib Internal.Utilities.Text.Parsing</OtherFlags>
+ <Link>ParserAndUntypedAST/pars.fsy</Link>
+ </FsYacc>
<Compile Include="..\unilex.fsi">
- <Link>unilex.fsi</Link>
+ <Link>ParserAndUntypedAST/unilex.fsi</Link>
</Compile>
<Compile Include="..\unilex.fs">
- <Link>unilex.fs</Link>
+ <Link>ParserAndUntypedAST/unilex.fs</Link>
</Compile>
<Compile Include="..\layout.fsi">
- <Link>layout.fsi</Link>
+ <Link>ParserAndUntypedAST/layout.fsi</Link>
</Compile>
<Compile Include="..\layout.fs">
- <Link>layout.fs</Link>
+ <Link>ParserAndUntypedAST/layout.fs</Link>
</Compile>
<Compile Include="..\ast.fs">
- <Link>ast.fs</Link>
- </Compile>
- <Compile Include="..\est.fsi">
- <Link>est.fsi</Link>
+ <Link>ParserAndUntypedAST/ast.fs</Link>
</Compile>
- <Compile Include="..\est.fs">
- <Link>est.fs</Link>
+ <Compile Include="pars.fs" >
+ <Link>ParserAndUntypedAST/pars.fs</Link>
</Compile>
- <Compile Include="pars.fs" />
<Compile Include="..\lexhelp.fsi">
- <Link>lexhelp.fsi</Link>
+ <Link>ParserAndUntypedAST/lexhelp.fsi</Link>
</Compile>
<Compile Include="..\lexhelp.fs">
- <Link>lexhelp.fs</Link>
+ <Link>ParserAndUntypedAST/lexhelp.fs</Link>
+ </Compile>
+ <Compile Include="lex.fs" >
+ <Link>ParserAndUntypedAST/lex.fs</Link>
+ </Compile>
+ <Compile Include="..\lexfilter.fs">
+ <Link>ParserAndUntypedAST/lexfilter.fs</Link>
+ </Compile>
+ <Compile Include="..\tainted.fsi">
+ <Link>TypedAST/tainted.fsi</Link>
+ </Compile>
+ <Compile Include="..\tainted.fs">
+ <Link>TypedAST/tainted.fs</Link>
+ </Compile>
+ <Compile Include="..\est.fsi">
+ <Link>TypedAST/est.fsi</Link>
+ </Compile>
+ <Compile Include="..\est.fs">
+ <Link>TypedAST/est.fs</Link>
</Compile>
- <Compile Include="lex.fs" />
<Compile Include="..\sreflect.fsi">
- <Link>sreflect.fsi</Link>
+ <Link>TypedAST/sreflect.fsi</Link>
</Compile>
<Compile Include="..\sreflect.fs">
- <Link>sreflect.fs</Link>
- </Compile>
- <Compile Include="..\QueueList.fs">
- <Link>QueueList.fs</Link>
+ <Link>TypedAST/sreflect.fs</Link>
</Compile>
<Compile Include="..\tast.fs">
- <Link>tast.fs</Link>
+ <Link>TypedAST/tast.fs</Link>
</Compile>
<Compile Include="..\env.fs">
- <Link>env.fs</Link>
+ <Link>TypedAST/env.fs</Link>
</Compile>
<Compile Include="..\tastops.fsi">
- <Link>tastops.fsi</Link>
+ <Link>TypedAST/tastops.fsi</Link>
</Compile>
<Compile Include="..\tastops.fs">
- <Link>tastops.fs</Link>
+ <Link>TypedAST/tastops.fs</Link>
</Compile>
<Compile Include="..\pickle.fsi">
- <Link>pickle.fsi</Link>
+ <Link>TypedAST/pickle.fsi</Link>
</Compile>
<Compile Include="..\pickle.fs">
- <Link>pickle.fs</Link>
- </Compile>
- <Compile Include="..\lexfilter.fs">
- <Link>lexfilter.fs</Link>
+ <Link>TypedAST/pickle.fs</Link>
</Compile>
<Compile Include="..\import.fsi">
- <Link>import.fsi</Link>
+ <Link>Logic/import.fsi</Link>
</Compile>
<Compile Include="..\import.fs">
- <Link>import.fs</Link>
+ <Link>Logic/import.fs</Link>
</Compile>
<Compile Include="..\infos.fs">
- <Link>infos.fs</Link>
+ <Link>Logic/infos.fs</Link>
</Compile>
<Compile Include="..\NicePrint.fs">
- <Link>NicePrint.fs</Link>
+ <Link>Logic/NicePrint.fs</Link>
</Compile>
<Compile Include="..\augment.fsi">
- <Link>augment.fsi</Link>
+ <Link>Logic/augment.fsi</Link>
</Compile>
<Compile Include="..\augment.fs">
- <Link>augment.fs</Link>
+ <Link>Logic/augment.fs</Link>
</Compile>
<Compile Include="..\outcome.fsi">
- <Link>outcome.fsi</Link>
+ <Link>Logic/outcome.fsi</Link>
</Compile>
<Compile Include="..\outcome.fs">
- <Link>outcome.fs</Link>
+ <Link>Logic/outcome.fs</Link>
</Compile>
<Compile Include="..\nameres.fsi">
- <Link>nameres.fsi</Link>
+ <Link>Logic/nameres.fsi</Link>
</Compile>
<Compile Include="..\nameres.fs">
- <Link>nameres.fs</Link>
+ <Link>Logic/nameres.fs</Link>
</Compile>
<Compile Include="..\typrelns.fs">
- <Link>typrelns.fs</Link>
+ <Link>Logic/typrelns.fs</Link>
</Compile>
<Compile Include="..\patcompile.fsi">
- <Link>patcompile.fsi</Link>
+ <Link>Logic/patcompile.fsi</Link>
</Compile>
<Compile Include="..\patcompile.fs">
- <Link>patcompile.fs</Link>
+ <Link>Logic/patcompile.fs</Link>
</Compile>
<Compile Include="..\csolve.fsi">
- <Link>csolve.fsi</Link>
+ <Link>Logic/csolve.fsi</Link>
</Compile>
<Compile Include="..\csolve.fs">
- <Link>csolve.fs</Link>
+ <Link>Logic/csolve.fs</Link>
</Compile>
<Compile Include="..\formats.fsi">
- <Link>formats.fsi</Link>
+ <Link>Logic/formats.fsi</Link>
</Compile>
<Compile Include="..\formats.fs">
- <Link>formats.fs</Link>
+ <Link>Logic/formats.fs</Link>
</Compile>
<Compile Include="..\unsolved.fs">
- <Link>unsolved.fs</Link>
+ <Link>Logic/unsolved.fs</Link>
</Compile>
<Compile Include="..\creflect.fsi">
- <Link>creflect.fsi</Link>
+ <Link>Logic/creflect.fsi</Link>
</Compile>
<Compile Include="..\creflect.fs">
- <Link>creflect.fs</Link>
+ <Link>Logic/creflect.fs</Link>
</Compile>
<Compile Include="..\check.fsi">
- <Link>check.fsi</Link>
+ <Link>Logic/check.fsi</Link>
</Compile>
<Compile Include="..\check.fs">
- <Link>check.fs</Link>
+ <Link>Logic/check.fs</Link>
</Compile>
<Compile Include="..\tc.fsi">
- <Link>tc.fsi</Link>
+ <Link>Logic/tc.fsi</Link>
</Compile>
<Compile Include="..\tc.fs">
- <Link>tc.fs</Link>
+ <Link>Logic/tc.fs</Link>
</Compile>
<Compile Include="..\opt.fsi">
- <Link>opt.fsi</Link>
+ <Link>Optimize/opt.fsi</Link>
</Compile>
<Compile Include="..\opt.fs">
- <Link>opt.fs</Link>
+ <Link>Optimize/opt.fs</Link>
</Compile>
<Compile Include="..\detuple.fsi">
- <Link>detuple.fsi</Link>
+ <Link>Optimize/detuple.fsi</Link>
</Compile>
<Compile Include="..\detuple.fs">
- <Link>detuple.fs</Link>
+ <Link>Optimize/detuple.fs</Link>
</Compile>
<Compile Include="..\tlr.fsi">
- <Link>tlr.fsi</Link>
+ <Link>Optimize/tlr.fsi</Link>
</Compile>
<Compile Include="..\tlr.fs">
- <Link>tlr.fs</Link>
+ <Link>Optimize/tlr.fs</Link>
</Compile>
<Compile Include="..\lowertop.fs">
- <Link>lowertop.fs</Link>
+ <Link>Optimize/lowertop.fs</Link>
</Compile>
<Compile Include="..\ilxgen.fsi">
- <Link>ilxgen.fsi</Link>
+ <Link>CodeGen/ilxgen.fsi</Link>
</Compile>
<Compile Include="..\ilxgen.fs">
- <Link>ilxgen.fs</Link>
- </Compile>
- <Compile Include="..\TraceCall.fsi">
- <Link>TraceCall.fsi</Link>
- </Compile>
- <Compile Include="..\TraceCall.fs">
- <Link>TraceCall.fs</Link>
+ <Link>CodeGen/ilxgen.fs</Link>
</Compile>
<Compile Include="..\build.fsi">
- <Link>build.fsi</Link>
+ <Link>Driver/build.fsi</Link>
</Compile>
<Compile Include="..\build.fs">
- <Link>build.fs</Link>
+ <Link>Driver/build.fs</Link>
</Compile>
<Compile Include="..\fscopts.fsi">
- <Link>fscopts.fsi</Link>
+ <Link>Driver/fscopts.fsi</Link>
</Compile>
<Compile Include="..\fscopts.fs">
- <Link>fscopts.fs</Link>
+ <Link>Driver/fscopts.fs</Link>
</Compile>
<Compile Include="..\vs\IncrementalBuild.fsi">
- <Link>IncrementalBuild.fsi</Link>
+ <Link>Driver/IncrementalBuild.fsi</Link>
</Compile>
<Compile Include="..\vs\IncrementalBuild.fs">
- <Link>IncrementalBuild.fs</Link>
+ <Link>Driver/IncrementalBuild.fs</Link>
</Compile>
<Compile Include="..\fsc.fs">
- <Link>fsc.fs</Link>
+ <Link>Driver/fsc.fs</Link>
</Compile>
<Compile Include="..\vs\Reactor.fsi">
- <Link>Reactor.fsi</Link>
+ <Link>Service/Reactor.fsi</Link>
</Compile>
<Compile Include="..\vs\Reactor.fs">
- <Link>Reactor.fs</Link>
+ <Link>Service/Reactor.fs</Link>
</Compile>
<Compile Include="..\vs\ServiceLexing.fsi">
- <Link>ServiceLexing.fsi</Link>
+ <Link>Service/ServiceLexing.fsi</Link>
</Compile>
<Compile Include="..\vs\ServiceLexing.fs">
- <Link>ServiceLexing.fs</Link>
+ <Link>Service/ServiceLexing.fs</Link>
</Compile>
<Compile Include="..\vs\ServiceConstants.fs">
- <Link>ServiceConstants.fs</Link>
+ <Link>Service/ServiceConstants.fs</Link>
</Compile>
<Compile Include="..\vs\ServiceParseTreeWalk.fs">
- <Link>ServiceParseTreeWalk.fs</Link>
+ <Link>Service/ServiceParseTreeWalk.fs</Link>
</Compile>
<Compile Include="..\vs\ServiceNavigation.fsi">
- <Link>ServiceNavigation.fsi</Link>
+ <Link>Service/ServiceNavigation.fsi</Link>
</Compile>
<Compile Include="..\vs\ServiceNavigation.fs">
- <Link>ServiceNavigation.fs</Link>
+ <Link>Service/ServiceNavigation.fs</Link>
</Compile>
<Compile Include="..\vs\ServiceParamInfoLocations.fsi">
- <Link>ServiceParamInfoLocations.fsi</Link>
+ <Link>Service/ServiceParamInfoLocations.fsi</Link>
</Compile>
<Compile Include="..\vs\ServiceParamInfoLocations.fs">
- <Link>ServiceParamInfoLocations.fs</Link>
+ <Link>Service/ServiceParamInfoLocations.fs</Link>
</Compile>
<Compile Include="..\vs\ServiceUntypedParse.fsi">
- <Link>ServiceUntypedParse.fsi</Link>
+ <Link>Service/ServiceUntypedParse.fsi</Link>
</Compile>
<Compile Include="..\vs\ServiceUntypedParse.fs">
- <Link>ServiceUntypedParse.fs</Link>
+ <Link>Service/ServiceUntypedParse.fs</Link>
</Compile>
<Compile Include="..\vs\ServiceDeclarations.fsi">
- <Link>ServiceDeclarations.fsi</Link>
+ <Link>Service/ServiceDeclarations.fsi</Link>
</Compile>
<Compile Include="..\vs\ServiceDeclarations.fs">
- <Link>ServiceDeclarations.fs</Link>
+ <Link>Service/ServiceDeclarations.fs</Link>
</Compile>
<Compile Include="..\vs\service.fsi">
- <Link>service.fsi</Link>
+ <Link>Service/service.fsi</Link>
</Compile>
<Compile Include="..\vs\service.fs">
- <Link>service.fs</Link>
+ <Link>Service/service.fs</Link>
</Compile>
<!--
<Compile Include="..\vs\SimpleServices.fs">
diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
index 77a0b92..ec3cc0a 100644
--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -28,169 +28,169 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' " />
<ItemGroup>
<EmbeddedResource Include="FSCore.resx">
- <Link>FSCore.resx</Link>
+ <Link>Primitives/FSCore.resx</Link>
</EmbeddedResource>
<Compile Include="prim-types-prelude.fsi">
- <Link>prim-types-prelude.fsi</Link>
+ <Link>Primitives/prim-types-prelude.fsi</Link>
</Compile>
<Compile Include="prim-types-prelude.fs">
- <Link>prim-types-prelude.fs</Link>
+ <Link>Primitives/prim-types-prelude.fs</Link>
</Compile>
<Compile Include="SR.fs">
- <Link>SR.fs</Link>
+ <Link>Primitives/SR.fs</Link>
</Compile>
<Compile Include="prim-types.fsi">
- <Link>prim-types.fsi</Link>
+ <Link>Primitives/prim-types.fsi</Link>
</Compile>
<Compile Include="prim-types.fs">
- <Link>prim-types.fs</Link>
+ <Link>Primitives/prim-types.fs</Link>
</Compile>
<Compile Include="local.fsi">
- <Link>local.fsi</Link>
+ <Link>Collections/local.fsi</Link>
</Compile>
<Compile Include="local.fs">
- <Link>local.fs</Link>
+ <Link>Collections/local.fs</Link>
</Compile>
<Compile Include="array2.fsi">
- <Link>array2.fsi</Link>
+ <Link>Collections/array2.fsi</Link>
</Compile>
<Compile Include="array2.fs">
- <Link>array2.fs</Link>
+ <Link>Collections/array2.fs</Link>
</Compile>
<Compile Include="option.fsi">
- <Link>option.fsi</Link>
+ <Link>Collections/option.fsi</Link>
</Compile>
<Compile Include="option.fs">
- <Link>option.fs</Link>
+ <Link>Collections/option.fs</Link>
</Compile>
<Compile Include="collections.fsi">
- <Link>collections.fsi</Link>
+ <Link>Collections/collections.fsi</Link>
</Compile>
<Compile Include="collections.fs">
- <Link>collections.fs</Link>
+ <Link>Collections/collections.fs</Link>
</Compile>
<Compile Include="seq.fsi">
- <Link>seq.fsi</Link>
+ <Link>Collections/seq.fsi</Link>
</Compile>
<Compile Include="seq.fs">
- <Link>seq.fs</Link>
+ <Link>Collections/seq.fs</Link>
</Compile>
<Compile Include="string.fsi">
- <Link>string.fsi</Link>
+ <Link>Collections/string.fsi</Link>
</Compile>
<Compile Include="string.fs">
- <Link>string.fs</Link>
+ <Link>Collections/string.fs</Link>
</Compile>
<Compile Include="list.fsi">
- <Link>list.fsi</Link>
+ <Link>Collections/list.fsi</Link>
</Compile>
<Compile Include="list.fs">
- <Link>list.fs</Link>
+ <Link>Collections/list.fs</Link>
</Compile>
<Compile Include="array.fsi">
- <Link>array.fsi</Link>
+ <Link>Collections/array.fsi</Link>
</Compile>
<Compile Include="array.fs">
- <Link>array.fs</Link>
+ <Link>Collections/array.fs</Link>
</Compile>
<Compile Include="array3.fsi">
- <Link>array3.fsi</Link>
+ <Link>Collections/array3.fsi</Link>
</Compile>
<Compile Include="array3.fs">
- <Link>array3.fs</Link>
+ <Link>Collections/array3.fs</Link>
</Compile>
<Compile Include="map.fsi">
- <Link>map.fsi</Link>
+ <Link>Collections/map.fsi</Link>
</Compile>
<Compile Include="map.fs">
- <Link>map.fs</Link>
+ <Link>Collections/map.fs</Link>
</Compile>
<Compile Include="set.fsi">
- <Link>set.fsi</Link>
+ <Link>Collections/set.fsi</Link>
</Compile>
<Compile Include="set.fs">
- <Link>set.fs</Link>
+ <Link>Collections/set.fs</Link>
</Compile>
<Compile Include="reflect.fsi">
- <Link>reflect.fsi</Link>
+ <Link>Reflection/reflect.fsi</Link>
</Compile>
<Compile Include="reflect.fs">
- <Link>reflect.fs</Link>
+ <Link>Reflection/reflect.fs</Link>
</Compile>
<Compile Include="event.fsi">
- <Link>event.fsi</Link>
+ <Link>Event/event.fsi</Link>
</Compile>
<Compile Include="event.fs">
- <Link>event.fs</Link>
+ <Link>Event/event.fs</Link>
</Compile>
<Compile Include="..\..\utils\sformat.fsi">
- <Link>sformat.fsi</Link>
+ <Link>Printf/sformat.fsi</Link>
</Compile>
<Compile Include="..\..\utils\sformat.fs">
- <Link>sformat.fs</Link>
+ <Link>Printf/sformat.fs</Link>
</Compile>
<Compile Include="printf.fsi">
- <Link>printf.fsi</Link>
+ <Link>Printf/printf.fsi</Link>
</Compile>
<Compile Include="printf.fs">
- <Link>printf.fs</Link>
+ <Link>Printf/printf.fs</Link>
</Compile>
<Compile Include="quotations.fsi">
- <Link>quotations.fsi</Link>
+ <Link>Quotations/quotations.fsi</Link>
</Compile>
<Compile Include="quotations.fs">
- <Link>quotations.fs</Link>
+ <Link>Quotations/quotations.fs</Link>
</Compile>
<Compile Include="nativeptr.fsi">
- <Link>nativeptr.fsi</Link>
+ <Link>NativeInterop/nativeptr.fsi</Link>
</Compile>
<Compile Include="nativeptr.fs">
- <Link>nativeptr.fs</Link>
+ <Link>NativeInterop/nativeptr.fs</Link>
</Compile>
<Compile Include="control.fsi">
- <Link>control.fsi</Link>
+ <Link>Async/control.fsi</Link>
</Compile>
<Compile Include="control.fs">
- <Link>control.fs</Link>
+ <Link>Async/control.fs</Link>
</Compile>
<Compile Include="Linq.fsi">
- <Link>Linq.fsi</Link>
+ <Link>Queries/Linq.fsi</Link>
</Compile>
<Compile Include="Linq.fs">
- <Link>Linq.fs</Link>
+ <Link>Queries/Linq.fs</Link>
</Compile>
<Compile Include="MutableTuple.fs">
- <Link>MutableTuple.fs</Link>
+ <Link>Queries/MutableTuple.fs</Link>
</Compile>
<Compile Include="QueryExtensions.fs">
- <Link>QueryExtensions.fs</Link>
+ <Link>Queries/QueryExtensions.fs</Link>
</Compile>
<Compile Include="Query.fsi">
- <Link>Query.fsi</Link>
+ <Link>Queries/Query.fsi</Link>
</Compile>
<Compile Include="Query.fs">
- <Link>Query.fs</Link>
+ <Link>Queries/Query.fs</Link>
</Compile>
<Compile Include="SI.fs">
- <Link>SI.fs</Link>
+ <Link>Units/SI.fs</Link>
</Compile>
<Compile Include="math\n.fsi">
- <Link>n.fsi</Link>
+ <Link>Numerics/n.fsi</Link>
</Compile>
<Compile Include="math\n.fs">
- <Link>n.fs</Link>
+ <Link>Numerics/n.fs</Link>
</Compile>
<Compile Include="math\z.fsi">
- <Link>z.fsi</Link>
+ <Link>Numerics/z.fsi</Link>
</Compile>
<Compile Include="math\z.fs">
- <Link>z.fs</Link>
+ <Link>Numerics/z.fs</Link>
</Compile>
<Compile Include="fslib-extra-pervasives.fsi">
- <Link>fslib-extra-pervasives.fsi</Link>
+ <Link>Extras/fslib-extra-pervasives.fsi</Link>
</Compile>
<Compile Include="fslib-extra-pervasives.fs">
- <Link>fslib-extra-pervasives.fs</Link>
+ <Link>Extras/fslib-extra-pervasives.fs</Link>
</Compile>
<Compile Include="..\..\assemblyinfo\assemblyinfo.FSharp.Core.dll.fs">
<Link>assemblyinfo.FSharp.Core.dll.fs</Link>
diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj
index 9fd352e..9c77566 100644
--- a/src/fsharp/Fsc/Fsc.fsproj
+++ b/src/fsharp/Fsc/Fsc.fsproj
@@ -24,12 +24,13 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' " />
<ItemGroup>
<Compile Include="..\..\assemblyinfo\assemblyinfo.fsc.exe.fs">
- <Link>assemblyinfo.fsc.exe.fs</Link>
+ <Link>Resources/assemblyinfo.fsc.exe.fs</Link>
</Compile>
<Compile Include="..\fscmain.fs">
- <Link>fscmain.fs</Link>
+ <Link>Driver/fscmain.fs</Link>
</Compile>
<None Include="fsc.exe.config">
+ <Link>Driver/fsc.exe.config</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj
index 17c9c18..142f1d7 100644
--- a/src/fsharp/fsi/Fsi.fsproj
+++ b/src/fsharp/fsi/Fsi.fsproj
@@ -25,22 +25,22 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' " />
<ItemGroup>
<FsSrGen Include="FSIstrings.txt">
- <Link>FSIstrings.txt</Link>
+ <Link>Utilities/FSIstrings.txt</Link>
</FsSrGen>
<Compile Include="..\..\assemblyinfo\assemblyinfo.fsi.exe.fs">
- <Link>assemblyinfo.fsi.exe.fs</Link>
+ <Link>Utilities/assemblyinfo.fsi.exe.fs</Link>
</Compile>
<Compile Include="..\InternalCollections.fsi">
- <Link>InternalCollections.fsi</Link>
+ <Link>Utilities/InternalCollections.fsi</Link>
</Compile>
<Compile Include="..\InternalCollections.fs">
- <Link>InternalCollections.fs</Link>
+ <Link>Utilities/InternalCollections.fs</Link>
</Compile>
<Compile Include="console.fs">
- <Link>console.fs</Link>
+ <Link>Console/console.fs</Link>
</Compile>
<Compile Include="fsi.fs">
- <Link>fsi.fs</Link>
+ <Link>InteractiveSession/fsi.fs</Link>
</Compile>
<Compile Include="fsimain.fs">
<Link>fsimain.fs</Link>
--
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