pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Upgrade to F# version 1.9.6.2 which includes an msbuild task, so we can remove our custom task. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3651 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Robert Pickering 17 years ago
parent
91af16cfeb
commit
7755f80fe8
5 changed files with 77 additions and 91 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
  2. 146
      src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
  3. 12
      src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
  4. 6
      src/Setup/Files.wxs
  5. 2
      src/Setup/Setup.wxs

2
src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.addin
Unescape View File

@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
<SyntaxMode id = "F# Syntax Mode"
name = "F#"
extensions = ".fs;.fsi"
resource = "FSharpBindings.Resources.FS-Mode.xshd" />
resource = "FS-Mode.xshd" />
</Path>
<Path name = "/SharpDevelop/MSBuildEngine/CompileTaskNames">

146
src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/FSharpBinding.fsproj
Unescape View File

@ -1,69 +1,41 @@ @@ -1,69 +1,41 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{99BAE3A2-C40D-40D2-A7B4-EBB4798F36E4}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{a7e6c2fe-6933-44a2-a420-aa6a38d421e9}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>FSharpBindings</RootNamespace>
<RootNamespace>FSharpBinding</RootNamespace>
<AssemblyName>FSharpBinding</AssemblyName>
<Standalone>True</Standalone>
<NoMLLib>True</NoMLLib>
<CheckIfFscNotInstalled>True</CheckIfFscNotInstalled>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Name>FShapBinding</Name>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>..\..\..\..\..\..\AddIns\AddIns\BackendBindings\FSharpBinding\</OutputPath>
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\..\..\..\AddIns\AddIns\BackendBindings\FSharpBinding</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>3</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>..\..\..\..\..\..\AddIns\AddIns\BackendBindings\FSharpBinding\</OutputPath>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
<Optimize>True</Optimize>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\..\..\..\AddIns\AddIns\BackendBindings\FSharpBinding</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>3</WarningLevel>
</PropertyGroup>
<Import Project="$(FSharpBuildTasksPath)\SharpDevelop.Build.Fsc.Targets" />
<ItemGroup>
<Reference Include="FSharp.Build.Tasks">
<HintPath>..\..\RequiredLibraries\FSharp.Build.Tasks.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\..\..\..\Libraries\log4net\log4net.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Build.Engine, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.Build.Framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
<Private>False</Private>
</Reference>
<Reference Include="Mono.Cecil">
<HintPath>..\..\..\..\..\Libraries\Mono.Cecil\Mono.Cecil.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Configuration">
<Private>False</Private>
</Reference>
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
<Private>False</Private>
</Reference>
<Reference Include="System.Security">
<Private>False</Private>
</Reference>
<Compile Include="Src\project.fs" />
<Compile Include="Src\languagebinding.fs" />
<Compile Include="Src\fsi.fs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\FS-Mode.xshd" />
<EmbeddedResource Include="Resources\FsOptions.xfrm" />
<None Include="..\..\RequiredLibraries\SharpDevelop.Build.Fsc.targets">
<Link>SharpDevelop.Build.Fsc.targets</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="FSharpBinding.addin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@ -75,50 +47,72 @@ @@ -75,50 +47,72 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj">
<Project>{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}</Project>
<Name>WinFormsUI</Name>
<Private>False</Private>
</ProjectReference>
<Reference Include="Microsoft.Build.Engine, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>Microsoft.Build.Engine</Name>
<AssemblyName>Microsoft.Build.Engine.dll</AssemblyName>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>System.Configuration</Name>
<AssemblyName>System.configuration.dll</AssemblyName>
</Reference>
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>System.Drawing</Name>
<AssemblyName>System.Drawing.dll</AssemblyName>
</Reference>
<Reference Include="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<Name>System.Windows.Forms</Name>
<AssemblyName>System.Windows.Forms.dll</AssemblyName>
</Reference>
<Reference Include="System.Xml, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<Name>System.Xml</Name>
<AssemblyName>System.XML.dll</AssemblyName>
</Reference>
<ProjectReference Include="..\..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
<Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
<Name>ICSharpCode.TextEditor</Name>
<Private>False</Private>
<Project>{2d18be89-d210-49eb-a9dd-2246fbb3df6d}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Libraries\NRefactory\Project\NRefactory.csproj">
<Project>{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}</Project>
<Name>NRefactory</Name>
<Private>False</Private>
<Project>{3a9ae6aa-bc07-4a2f-972c-581e3ae2f195}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
<Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>
<Name>ICSharpCode.SharpDevelop</Name>
<Private>False</Private>
<Project>{2748ad25-9c63-4e12-877b-4dce96fbed54}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\Core\Project\ICSharpCode.Core.csproj">
<Project>{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}</Project>
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj">
<Project>{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}</Project>
<Name>ICSharpCode.Core.WinForms</Name>
<Private>False</Private>
<Project>{35cef10f-2d4c-45f2-9dd1-161e0fec583c}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.BuildWorker\ICSharpCode.SharpDevelop.BuildWorker.csproj">
<Project>{C3CBC8E3-81D8-4C5B-9941-DCCD12D50B1F}</Project>
<Name>ICSharpCode.SharpDevelop.BuildWorker</Name>
<Private>False</Private>
<Project>{c3cbc8e3-81d8-4c5b-9941-dccd12d50b1f}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
<Project>{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}</Project>
<Name>ICSharpCode.SharpDevelop.Dom</Name>
<Private>False</Private>
<Project>{924ee450-603d-49c1-a8e5-4afaa31ce6f3}</Project>
<Private>True</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj">
<Project>{8035765F-D51F-4A0C-A746-2FD100E19419}</Project>
<Name>ICSharpCode.SharpDevelop.Widgets</Name>
<Private>False</Private>
<Project>{8035765f-d51f-4a0c-a746-2fd100e19419}</Project>
<Private>True</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\FSharp\1.0\Microsoft.FSharp.Targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

12
src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
Unescape View File

@ -31,7 +31,7 @@ open ICSharpCode.SharpDevelop.Gui @@ -31,7 +31,7 @@ open ICSharpCode.SharpDevelop.Gui
open ICSharpCode.SharpDevelop.Gui.OptionPanels
type FSharpProject = class
inherit CompilableProject as base
inherit CompilableProject
new (engineProvider : IMSBuildEngineProvider, fileName : string, projectName : string ) as x =
{ inherit CompilableProject(engineProvider) } then
base.Name <- projectName
@ -41,9 +41,9 @@ type FSharpProject = class @@ -41,9 +41,9 @@ type FSharpProject = class
x.Create(info)
base.AddImport(@"$(FSharpBuildTasksPath)\SharpDevelop.Build.Fsc.Targets", null)
override x.GetDefaultItemType(fileName : string) =
if string.Equals(".fs", Path.GetExtension(fileName), StringComparison.InvariantCultureIgnoreCase) then
if String.Equals(".fs", Path.GetExtension(fileName), StringComparison.InvariantCultureIgnoreCase) then
ItemType.Compile
else if string.Equals(".fsi", Path.GetExtension(fileName), StringComparison.InvariantCultureIgnoreCase) then
else if String.Equals(".fsi", Path.GetExtension(fileName), StringComparison.InvariantCultureIgnoreCase) then
ItemType.Compile
else
base.GetDefaultItemType(fileName)
@ -61,7 +61,7 @@ type FSharpProjectNode = class @@ -61,7 +61,7 @@ type FSharpProjectNode = class
{ inherit ProjectNode(project) }
member x.AddParentFolder((virtualName : string), (relativeDirectoryPath : string), (directoryNodeList :Dictionary<string, DirectoryNode>)) =
if (relativeDirectoryPath.Length = 0
|| string.Compare(virtualName, 0, relativeDirectoryPath, 0, relativeDirectoryPath.Length, StringComparison.InvariantCultureIgnoreCase) = 0) then
|| String.Compare(virtualName, 0, relativeDirectoryPath, 0, relativeDirectoryPath.Length, StringComparison.InvariantCultureIgnoreCase) = 0) then
let pos = virtualName.IndexOf('/', relativeDirectoryPath.Length + 1)
if (pos > 0) then
let subFolderName = virtualName.Substring(relativeDirectoryPath.Length, pos - relativeDirectoryPath.Length);
@ -83,7 +83,7 @@ type FSharpProjectNode = class @@ -83,7 +83,7 @@ type FSharpProjectNode = class
if (x.RelativePath.Length > 0) then
(x.RelativePath.Replace('\\', '/')) + "/"
else
string.Empty
String.Empty
for item in x.Project.Items do
match item with
@ -95,7 +95,7 @@ type FSharpProjectNode = class @@ -95,7 +95,7 @@ type FSharpProjectNode = class
else
virtualName
let fileName = Path.GetFileName(virtualName)
if (not (string.Equals(virtualName, relativeDirectoryPath + fileName, StringComparison.InvariantCultureIgnoreCase))) then
if (not (String.Equals(virtualName, relativeDirectoryPath + fileName, StringComparison.InvariantCultureIgnoreCase))) then
x.AddParentFolder(virtualName, relativeDirectoryPath, directoryNodeList);
//continue;

6
src/Setup/Files.wxs
Unescape View File

@ -1310,18 +1310,12 @@ @@ -1310,18 +1310,12 @@
</Component>
</Directory>
<Directory Id="FSharpBinding" Name="FSharpBinding">
<Component Guid="7C6826BE-C03E-43A4-AD27-17A9325C70DD" Id="FSharpBuildTasksDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\FSharpBinding\FSharp.Build.Tasks.dll" Name="FSharp.Build.Tasks.dll" Id="FSharp.Build.Tasks.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="FSharp.Build.Tasks.dll" AssemblyManifest="FSharp.Build.Tasks.dll" />
</Component>
<Component Guid="6B4F28AF-133C-4FEB-98DB-67A5405AEB12" Id="FSharpBindingAddin" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\FSharpBinding\FSharpBinding.addin" Name="FSharpBinding.addin" Id="FSharpBinding.addin" KeyPath="yes" />
</Component>
<Component Guid="810CE373-569B-41C3-ADDA-D2F0E0EFD5DE" Id="FSharpBindingDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\FSharpBinding\FSharpBinding.dll" Name="FSharpBinding.dll" Id="FSharpBinding.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="FSharpBinding.dll" AssemblyManifest="FSharpBinding.dll" />
</Component>
<Component Guid="0E893CB2-9662-4507-9745-156CC7B96FBA" Id="SharpDevelopBuildFscTargets" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\FSharpBinding\SharpDevelop.Build.Fsc.targets" Name="SharpDevelop.Build.Fsc.targets" Id="SharpDevelop.Build.Fsc.targets" KeyPath="yes" />
</Component>
<Directory Id="FSharpBindingTemplates" Name="Templates">
<Component Guid="37A7695A-BA60-45A6-9BDB-FAE663D7A4C0" Id="FSharpConsoleProjectTemplate" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\FSharpBinding\Templates\ConsoleProject.xpt" Name="ConsoleProject.xpt" Id="Templates.ConsoleProject1.xpt" KeyPath="yes" />

2
src/Setup/Setup.wxs
Unescape View File

@ -429,8 +429,6 @@ @@ -429,8 +429,6 @@
<ComponentRef Id="FSharpBindingDll"/>
<ComponentRef Id="FSharpBindingAddin"/>
<ComponentRef Id="FSharpBuildTasksDll"/>
<ComponentRef Id="SharpDevelopBuildFscTargets"/>
<ComponentRef Id="FSharpConsoleProjectTemplate"/>
<ComponentRef Id="FSharpEmptyClassTemplate"/>

Write Preview
Loading…
Cancel
Save