Browse Source

Add Boo.InterpreterAddIn and SubversionAddIn.

Use separate directory for storing settings.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1140 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
872563323d
  1. 28
      src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/CodeCompletionData.boo
  2. 33
      src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/AssemblyInfo.cs
  3. 2
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs
  4. 3
      src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs
  5. 2
      src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs
  6. 4
      src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs
  7. 3
      src/Main/StartUp/Project/SharpDevelopMain.cs
  8. 16
      src/SharpDevelop.sln
  9. 2
      src/clean.bat
  10. 2
      src/debugbuild.bat
  11. 2
      src/releasebuild.bat

28
src/AddIns/BackendBindings/Boo/Boo.InterpreterAddIn/Project/CodeCompletionData.boo

@ -96,31 +96,7 @@ internal class CodeCompletionData(AbstractCompletionData): @@ -96,31 +96,7 @@ internal class CodeCompletionData(AbstractCompletionData):
def AddEntity(entity as IEntity):
_entities.Add(entity)
abstract internal class AbstractCompletionDataProvider(ICompletionDataProvider):
ImageList as System.Windows.Forms.ImageList:
get:
return ClassBrowserIconService.ImageList
PreSelection as string:
get:
return null
DefaultIndex:
get:
return -1
insertSpace = false
public InsertSpace as bool:
get:
return insertSpace
set:
insertSpace = value
abstract def GenerateCompletionData(fileName as string, textArea as TextArea, charTyped as System.Char) as (ICompletionData):
pass
internal class GlobalsCompletionDataProvider(AbstractCompletionDataProvider):
internal class GlobalsCompletionDataProvider(ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.AbstractCompletionDataProvider):
_interpreter as InteractiveInterpreter
class GlobalCompletionData(AbstractCompletionData):
@ -157,7 +133,7 @@ internal class GlobalsCompletionDataProvider(AbstractCompletionDataProvider): @@ -157,7 +133,7 @@ internal class GlobalsCompletionDataProvider(AbstractCompletionDataProvider):
return data
internal class CodeCompletionDataProvider(AbstractCompletionDataProvider):
internal class CodeCompletionDataProvider(ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.AbstractCompletionDataProvider):
_codeCompletion as (IEntity)

33
src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/AssemblyInfo.cs

@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Daniel Grunwald" email="daniel@danielgrunwald.de"/>
// <version>$Revision$</version>
// </file>
using System.Reflection;
using System.Runtime.CompilerServices;
// Information about this assembly is defined by the following
// attributes.
//
// change them to the information which is associated with the assembly
// you compile.
[assembly: AssemblyTitle("BooBinding")]
[assembly: AssemblyDescription("Boo language binding for #develop")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("ic#code")]
[assembly: AssemblyProduct("SharpDevelop")]
[assembly: AssemblyCopyright("2005-2006 AlphaSierraPapa")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// The assembly version has following format :
//
// Major.Minor.Build.Revision
//
// You can specify all values by your own or you can build default build and revision
// numbers with the '*' character (the default):
[assembly: AssemblyVersion("2.0.0.1")]

2
src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Options.cs

@ -83,7 +83,7 @@ namespace HtmlHelp2.OptionsPanel @@ -83,7 +83,7 @@ namespace HtmlHelp2.OptionsPanel
node.AppendChild(cdata);
xmldoc.DocumentElement.AppendChild(node);
xmldoc.Save(PropertyService.ConfigDirectory + help2EnvironmentFile);
xmldoc.Save(Path.Combine(PropertyService.ConfigDirectory, help2EnvironmentFile));
LoggingService.Info("Help 2.0: new configuration saved");
}

3
src/AddIns/Misc/HtmlHelp2/Project/src/Service/HtmlHelp2Service.cs

@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
namespace HtmlHelp2.Environment
{
using System;
using System.IO;
using System.Windows.Forms;
using System.Xml;
using ICSharpCode.Core;
@ -88,7 +89,7 @@ namespace HtmlHelp2.Environment @@ -88,7 +89,7 @@ namespace HtmlHelp2.Environment
try
{
XmlDocument xmldoc = new XmlDocument();
xmldoc.Load(PropertyService.ConfigDirectory + help2EnvironmentFile);
xmldoc.Load(Path.Combine(PropertyService.ConfigDirectory, help2EnvironmentFile));
XmlNode node = xmldoc.SelectSingleNode("/help2environment/collection");
if (node != null) {

2
src/Main/Base/Project/Src/Gui/Workbench/DefaultWorkbench.cs

@ -293,7 +293,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -293,7 +293,7 @@ namespace ICSharpCode.SharpDevelop.Gui
return;
}
string directory = PropertyService.ConfigDirectory + "temp";
string directory = Path.Combine(PropertyService.ConfigDirectory, "temp");
if (!Directory.Exists(directory)) {
Directory.CreateDirectory(directory);
}

4
src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs

@ -295,7 +295,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -295,7 +295,7 @@ namespace ICSharpCode.SharpDevelop.Project
static string GetPreferenceFileName(string projectFileName)
{
string directory = PropertyService.ConfigDirectory + "preferences";
string directory = Path.Combine(PropertyService.ConfigDirectory, "preferences");
string fileName = projectFileName.Substring(3).Replace('/', '.').Replace('\\', '.').Replace(Path.DirectorySeparatorChar, '.');
string fullFileName = Path.Combine(directory, fileName + ".xml");
return fullFileName;
@ -305,7 +305,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -305,7 +305,7 @@ namespace ICSharpCode.SharpDevelop.Project
{
if (openSolution == null)
return;
string directory = PropertyService.ConfigDirectory + "preferences";
string directory = Path.Combine(PropertyService.ConfigDirectory, "preferences");
if (!Directory.Exists(directory)) {
Directory.CreateDirectory(directory);
}

3
src/Main/StartUp/Project/SharpDevelopMain.cs

@ -168,7 +168,8 @@ namespace ICSharpCode.SharpDevelop @@ -168,7 +168,8 @@ namespace ICSharpCode.SharpDevelop
FileUtility.ApplicationRootPath = Path.Combine(Path.GetDirectoryName(exe.Location), "..");
CoreStartup c = new CoreStartup("SharpDevelop");
c.ConfigDirectory = FileUtility.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ".ICSharpCode", "SharpDevelop2") + Path.DirectorySeparatorChar;
c.ConfigDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
".ICSharpCode/SharpDevelop2.1");
LoggingService.Info("Starting core services...");
c.StartCoreServices();

16
src/SharpDevelop.sln

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.1054
# SharpDevelop 2.0.0.1128
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
@ -30,6 +30,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FE @@ -30,6 +30,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Backends", "Backends", "{FE
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{A33008B1-5DAC-44D5-9060-242E3B6E38F2}") = "Boo.InterpreterAddIn", "AddIns\BackendBindings\Boo\Boo.InterpreterAddIn\Project\Boo.InterpreterAddIn.booproj", "{928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "AddIns\BackendBindings\Boo\NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "AddIns\BackendBindings\Boo\BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
@ -44,6 +46,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6 @@ -44,6 +46,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{CE5B42B7-6
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubversionAddIn", "AddIns\Misc\SubversionAddIn\Project\SubversionAddIn.csproj", "{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "HtmlHelp2JScriptGlobals", "AddIns\Misc\HtmlHelp2\JScriptGlobals\HtmlHelp2JScriptGlobals.vbproj", "{E54A5AD2-418D-4A85-BA5E-CD803DE38715}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTesting", "AddIns\Misc\UnitTesting\UnitTesting.csproj", "{1F261725-6318-4434-A1B1-6C70CE4CD324}"
@ -270,6 +274,14 @@ Global @@ -270,6 +274,14 @@ Global
{E54A5AD2-418D-4A85-BA5E-CD803DE38715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E54A5AD2-418D-4A85-BA5E-CD803DE38715}.Release|Any CPU.Build.0 = Release|Any CPU
{E54A5AD2-418D-4A85-BA5E-CD803DE38715}.Release|Any CPU.ActiveCfg = Release|Any CPU
{928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}.Release|Any CPU.Build.0 = Release|Any CPU
{928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.Build.0 = Release|Any CPU
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
@ -288,6 +300,7 @@ Global @@ -288,6 +300,7 @@ Global
{6e59af58-f635-459a-9a35-c9ac41c00339} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
{4AC2D5F1-F671-480C-A075-6BF62B3721B2} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
{DBCF20A1-BA13-4582-BFA9-74DE4D987B73} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
{928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
{4B8F0F98-8BE1-402B-AA8B-C8D548577B38} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{7D5C266F-D6FF-4D14-B315-0C0FC6C4EF51} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{64A3E5E6-90BF-47F6-94DF-68C94B62C817} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
@ -304,6 +317,7 @@ Global @@ -304,6 +317,7 @@ Global
{08ce9972-283b-44f4-82fa-966f7dfa6b7a} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{1F261725-6318-4434-A1B1-6C70CE4CD324} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{E54A5AD2-418D-4A85-BA5E-CD803DE38715} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{17F4D7E0-6933-4C2E-8714-FD7E98D625D5} = {CE5B42B7-6E8C-4385-9E97-F4023FC16BF2}
{B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}

2
src/clean.bat

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
%windir%\microsoft.net\framework\v2.0.50727\msbuild /t:clean SharpDevelop.sln
%windir%\microsoft.net\framework\v2.0.50727\msbuild /t:clean SharpDevelop.sln /p:BooBinPath=%CD%\AddIns\BackendBindings\Boo\RequiredLibraries
@IF %ERRORLEVEL% NEQ 0 PAUSE

2
src/debugbuild.bat

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
%windir%\microsoft.net\framework\v2.0.50727\msbuild SharpDevelop.sln
%windir%\microsoft.net\framework\v2.0.50727\msbuild SharpDevelop.sln /p:BooBinPath=%CD%\AddIns\BackendBindings\Boo\RequiredLibraries
@IF %ERRORLEVEL% NEQ 0 PAUSE

2
src/releasebuild.bat

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
%windir%\microsoft.net\framework\v2.0.50727\msbuild /property:Configuration=Release SharpDevelop.sln
%windir%\microsoft.net\framework\v2.0.50727\msbuild /property:Configuration=Release SharpDevelop.sln /p:BooBinPath=%CD%\AddIns\BackendBindings\Boo\RequiredLibraries
@IF %ERRORLEVEL% NEQ 0 PAUSE
Loading…
Cancel
Save