Permalink
Browse files

Support for MonoDevelop 2.8 and Windows

  • Loading branch information...
1 parent 1532fb2 commit 5c2aa9b140f8b9bb1f6f88b6f2bbef4c23e4b7b7 @ovatsus ovatsus committed Oct 19, 2011
View
@@ -5,5 +5,5 @@ repository/*
*.suo
*.pidb
*.userprefs
+*.user
Makefile
-src/FSharp.MonoDevelop.fsproj
View
@@ -0,0 +1,5 @@
+@echo off
+set MSBUILD=%WINDIR%\Microsoft.NET\Framework64\v4.0.30319\MSBuild.exe
+%MSBUILD% src\FSharp.MonoDevelop.sln
+set MDROOT="%ProgramFiles(x86)%\MonoDevelop"
+copy bin\FSharpBinding.* %MDROOT%\AddIns\BackendBindings
@@ -159,5 +159,6 @@
<Project>{FD0D1033-9145-48E5-8ED8-E2365252878C}</Project>
</ProjectReference>
</ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" />
+ <Import Project="$(MSBuildExtensionsPath32)\FSharp\1.0\Microsoft.FSharp.Targets" Condition="!Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll')" />
+ <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft F#\v4.0\Microsoft.FSharp.Targets" Condition="Exists('$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll')" />
</Project>
View
@@ -1,32 +1,29 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{4925A630-B079-445d-BCD4-3A9C94FE9307}") = "FSharp.MonoDevelop", "FSharp.MonoDevelop.fsproj", "{4c10f8f9-3816-4647-ba6e-85f5de39883a}"
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.MonoDevelop", "FSharp.MonoDevelop.fsproj", "{4C10F8F9-3816-4647-BA6E-85F5DE39883A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharp.MonoDevelop.Gui", "Gui\FSharp.MonoDevelop.Gui.csproj", "{FD0D1033-9145-48E5-8ED8-E2365252878C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
- DebugInstall|Any CPU = DebugInstall|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4c10f8f9-3816-4647-ba6e-85f5de39883a}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4c10f8f9-3816-4647-ba6e-85f5de39883a}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4c10f8f9-3816-4647-ba6e-85f5de39883a}.DebugInstall|Any CPU.ActiveCfg = DebugInstall|Any CPU
- {4c10f8f9-3816-4647-ba6e-85f5de39883a}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4C10F8F9-3816-4647-BA6E-85F5DE39883A}.Release|Any CPU.Build.0 = Release|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugInstall|Any CPU.ActiveCfg = Debug|Any CPU
- {FD0D1033-9145-48E5-8ED8-E2365252878C}.DebugInstall|Any CPU.Build.0 = Debug|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD0D1033-9145-48E5-8ED8-E2365252878C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = FSharp.MonoDevelop.fsproj
- EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = FSharp.MonoDevelop.fsproj
+ EndGlobalSection
EndGlobal
@@ -9,7 +9,6 @@ open MonoDevelop.Ide
open MonoDevelop.Ide.Gui.Content
open MonoDevelop.Projects
open Microsoft.FSharp.Compiler
-open Mono.Addins
type FSharpLanguageBinding() =
static let LanguageName = "F#"
@@ -82,7 +81,4 @@ type FSharpLanguageBinding() =
member x.GetSupportedClrVersions() =
[| ClrVersion.Net_2_0; ClrVersion.Net_4_0 |]
- member x.GetImplicitAssemblyReferences() =
- Seq.singleton (AddinManager.CurrentAddin.GetFilePath("FSharp.Core.dll"))
-
member x.ProjectStockIcon = "md-fs-project"
View
@@ -25,7 +25,7 @@ type FSharpSyntaxMode() as this =
this.matches <- baseMode.Matches
this.prevMarker <- baseMode.PrevMarker
this.SemanticRules <- new ResizeArray<_>(baseMode.SemanticRules)
- this.table <- baseMode.Table
+ //this.table <- baseMode.Table
this.properties <- baseMode.Properties
// Do we need this? Or can we create "chunker"?
@@ -5,8 +5,8 @@
<target-gtk-version>2.12</target-gtk-version>
</configuration>
<import>
- <widget-library name="../../../../../monodevelop-2.4/monodevelop/main/build/bin/Mono.TextEditor.dll" />
- <widget-library name="MonoDevelop.Ide, Version=2.4.0.0, Culture=neutral" />
+ <widget-library name="../../../../../monodevelop-2.8/monodevelop/main/build/bin/Mono.TextEditor.dll" />
+ <widget-library name="MonoDevelop.Ide, Version=2.8.0.0, Culture=neutral" />
<widget-library name="../../bin/FSharpBinding.Gui.dll" internal="true" />
</import>
<widget class="Gtk.Bin" id="FSharp.MonoDevelop.Gui.FSharpCompilerOptionsWidget" design-size="300 300">
@@ -1,6 +1,6 @@
<Addin id="FSharpBinding" namespace="MonoDevelop" name="F# Language Binding"
author="Community" copyright="???" url="http://www.fsharp.net"
- description="F# Language Binding" category="Language bindings" version="2.6">
+ description="F# Language Binding" category="Language bindings" version="2.8">
<Runtime>
<Import assembly="FSharpBinding.dll" />
@@ -17,9 +17,9 @@
</Runtime>
<Dependencies>
- <Addin id="Core" version="2.6"/>
- <Addin id="Ide" version="2.6"/>
- <Addin id="SourceEditor2" version="2.6"/>
+ <Addin id="Core" version="2.8"/>
+ <Addin id="Ide" version="2.8"/>
+ <Addin id="SourceEditor2" version="2.8"/>
</Dependencies>
<Extension path="/MonoDevelop/ProjectModel/MSBuildItemTypes">
@@ -74,7 +74,7 @@ module Reflection =
/// Wrapper type for the 'FSharp.Compiler.dll' assembly - expose types we use
type FSharpCompiler private () =
- static let asm = Assembly.Load("FSharp.Compiler, Version=4.0.0.0")
+ static let asm = Assembly.Load("FSharp.Compiler, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a19089b1c74d0809")
static member InteractiveChecker = asm.GetType("Microsoft.FSharp.Compiler.SourceCodeServices.InteractiveChecker")
static member IsResultObsolete = asm.GetType("Microsoft.FSharp.Compiler.SourceCodeServices.IsResultObsolete")
static member CheckOptions = asm.GetType("Microsoft.FSharp.Compiler.SourceCodeServices.CheckOptions")
@@ -84,7 +84,7 @@ module Reflection =
/// Wrapper type for the 'FSharp.Compiler.Server.Shared.dll' assembly - expose types we use
type FSharpCompilerServerShared private () =
- static let asm = Assembly.Load("FSharp.Compiler.Server.Shared, Version=4.0.0.0")
+ static let asm = Assembly.Load("FSharp.Compiler.Server.Shared, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a19089b1c74d0809")
static member InteractiveServer = asm.GetType("Microsoft.FSharp.Compiler.Server.Shared.FSharpInteractiveServer")
// --------------------------------------------------------------------------------------
View
@@ -42,6 +42,18 @@ type FSharpCompilerParameters() =
[<field:ItemProperty("CustomCommandLine"); DefaultValue>]
val mutable private customCommandLine : string
+ override x.AddDefineSymbol(symbol) =
+ if x.definedSymbols = "" || x.definedSymbols = null then
+ x.definedSymbols <- symbol
+ else
+ x.definedSymbols <- x.definedSymbols + ";" + symbol
+
+ override x.RemoveDefineSymbol(symbol) =
+ if x.definedSymbols = symbol then
+ x.definedSymbols <- null
+ elif x.definedSymbols <> null then
+ x.definedSymbols <- x.definedSymbols.Replace(";" + symbol, null)
+
member x.DefinedSymbols
with get() = if x.definedSymbols = null then "" else x.definedSymbols
and set(value) = x.definedSymbols <- value
View
@@ -1,4 +1,4 @@
-<AddinProject appVersion="2.4">
+<AddinProject appVersion="2.8">
<Project platforms="Mac Linux">
<AddinFile>bin/FSharpBinding.dll</AddinFile>
<BuildFile>FSharp.MonoDevelop.sln</BuildFile>

0 comments on commit 5c2aa9b

Please sign in to comment.