Browse Source

Update to Boo 0.7.6.2160.

Update translations.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1204 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
67bdeee0dd
  1. BIN
      data/resources/StringResources.cz.resources
  2. BIN
      data/resources/StringResources.de.resources
  3. BIN
      data/resources/StringResources.hu.resources
  4. BIN
      data/resources/StringResources.it.resources
  5. BIN
      data/resources/StringResources.kr.resources
  6. BIN
      data/resources/StringResources.nl.resources
  7. BIN
      data/resources/StringResources.no.resources
  8. BIN
      data/resources/StringResources.pl.resources
  9. BIN
      data/resources/StringResources.pt-br.resources
  10. BIN
      data/resources/StringResources.se.resources
  11. BIN
      data/resources/StringResources.tr.resources
  12. 2
      data/resources/languages/LanguageDefinition.xml
  13. 42
      src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/Boo.Microsoft.Build.Tasks.booproj
  14. 354
      src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/Booc.boo
  15. 42
      src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/CreateBooManifestResourceName.boo
  16. 67
      src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/Project.booproj
  17. 70
      src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/Properties/AssemblyInfo.boo
  18. 4
      src/AddIns/BackendBindings/Boo/BooBinding.sln
  19. 4
      src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin
  20. 11
      src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj
  21. 6
      src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.addin
  22. 1
      src/Libraries/NRefactory/Project/Src/Output/SpecialNodesInserter.cs
  23. 16
      src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs
  24. 12
      src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs
  25. 3
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/ErrorDrawer.cs
  26. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

BIN
data/resources/StringResources.cz.resources

Binary file not shown.

BIN
data/resources/StringResources.de.resources

Binary file not shown.

BIN
data/resources/StringResources.hu.resources

Binary file not shown.

BIN
data/resources/StringResources.it.resources

Binary file not shown.

BIN
data/resources/StringResources.kr.resources

Binary file not shown.

BIN
data/resources/StringResources.nl.resources

Binary file not shown.

BIN
data/resources/StringResources.no.resources

Binary file not shown.

BIN
data/resources/StringResources.pl.resources

Binary file not shown.

BIN
data/resources/StringResources.pt-br.resources

Binary file not shown.

BIN
data/resources/StringResources.se.resources

Binary file not shown.

BIN
data/resources/StringResources.tr.resources

Binary file not shown.

2
data/resources/languages/LanguageDefinition.xml

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
<Languages name="Hungarian" code="hu" page="" icon="hungary.png" />
<Languages name="Italian" code="it" page="" icon="italy.png" />
<Languages name="Japanese" code="jp" page="" icon="japan.png" />
<!--<Languages name="Korean" code="kr" page="" icon="south_korea.png" />-->
<Languages name="Korean" code="kr" page="" icon="south_korea.png" />
<!--<Languages name="Lithuanian" code="lt" page="" icon="lithuania.png" />-->
<Languages name="Norwegian" code="no" page="" icon="norway.png" />
<Languages name="Polish" code="pl" page="" icon="poland.png" />

42
src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/Boo.Microsoft.Build.Tasks.booproj

@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>Boo.Microsoft.Build.Tasks</RootNamespace>
<AssemblyName>Boo.Microsoft.Build.Tasks</AssemblyName>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{366B4AFE-C4E9-46DF-9CFF-57C62D414D4A}</ProjectGuid>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath>
<Optimize>False</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>bin\Release\</OutputPath>
<Optimize>True</Optimize>
<DefineConstants>TRACE</DefineConstants>
<DebugSymbols>False</DebugSymbols>
<DebugType>None</DebugType>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Build.Framework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Utilities, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</ItemGroup>
<ItemGroup>
<Compile Include="Booc.boo" />
<Compile Include="Properties\AssemblyInfo.boo" />
<Compile Include="CreateBooManifestResourceName.boo" />
</ItemGroup>
<ItemGroup>
<Content Include="Project.booproj" />
<Content Include="..\RequiredLibraries\Boo.Microsoft.Build.targets">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Link>Boo.Microsoft.Build.targets</Link>
</Content>
</ItemGroup>
<Import Project="$(BooBinPath)\Boo.Microsoft.Build.targets" />
</Project>

354
src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/Booc.boo

@ -1,354 +0,0 @@ @@ -1,354 +0,0 @@
#region license
// Copyright (c) 2003, 2004, 2005 Rodrigo B. de Oliveira (rbo@acm.org)
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Rodrigo B. de Oliveira nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endregion
namespace Boo.Microsoft.Build.Tasks
import Microsoft.Build.Framework
import Microsoft.Build.Tasks
import Microsoft.Build.Utilities
import System
import System.Diagnostics
import System.IO
import System.Globalization
import System.Text.RegularExpressions
import System.Threading
class Booc(ManagedCompiler):
"""
Represents the Boo compiler MSBuild task.
Authors:
Sorin Ionescu (sorin.ionescu@gmail.com)
"""
Pipelines:
"""
Gets/sets the aditional pipelines to add to the compiler process.
"""
get:
return Bag['Pipelines'] as (string)
set:
Bag['Pipelines'] = value
Verbosity:
"""
Gets/sets the verbosity level.
"""
get:
return Bag['Verbosity'] as string
set:
Bag['Verbosity'] = value
Culture:
"""
Gets/sets the culture.
"""
get:
return Bag['Culture'] as string
set:
Bag['Culture'] = value
SourceDirectory:
"""
Gets/sets the source directory.
"""
get:
return Bag['Source Directory'] as string
set:
Bag['Source Directory'] = value
ToolName:
"""
Gets the tool name.
"""
get:
return "Booc.exe"
override def Execute():
"""
Executes the task.
Returns:
true if the task completed successfully; otherwise, false.
"""
boocCommandLine = CommandLineBuilderExtension()
AddResponseFileCommands(boocCommandLine)
warningPattern = regex(
'^(?<file>.*?)\\((?<line>\\d+),(?<column>\\d+)\\):' +
' (?<code>BCW\\d{4}): WARNING: (?<message>.*)$',
RegexOptions.Compiled)
# Captures the file, line, column, code, and message from a BOO warning
# in the form of: Program.boo(1,1): BCW0000: WARNING: This is a warning.
errorPattern = regex(
'^(((?<file>.*?)\\((?<line>\\d+),(?<column>\\d+)\\): )?' +
'(?<code>BCE\\d{4})|(?<errorType>Fatal) error):' +
'( Boo.Lang.Compiler.CompilerError:)?' +
' (?<message>.*?)($| --->)',
RegexOptions.Compiled |
RegexOptions.ExplicitCapture |
RegexOptions.Multiline)
/*
* Captures the file, line, column, code, error type, and message from a
* BOO error of the form of:
* 1. Program.boo(1,1): BCE0000: This is an error.
* 2. Program.boo(1,1): BCE0000: Boo.Lang.Compiler.CompilerError:
* This is an error. ---> Program.boo:4:19: This is an error
* 3. BCE0000: This is an error.
* 4. Fatal error: This is an error.
*
* The second line of the following error format is not cought because
* .NET does not support if|then|else in regular expressions,
* and the regex will be horrible complicated.
* The second line is as worthless as the first line.
* Therefore, it is not worth implementing it.
*
* Fatal error: This is an error.
* Parameter name: format.
*/
buildSuccess = true
outputLine = String.Empty
errorLine = String.Empty
readingDoneEvents = (ManualResetEvent(false), ManualResetEvent(false))
boocProcessStartInfo = ProcessStartInfo(
FileName: GenerateFullPathToTool(),
Arguments: boocCommandLine.ToString(),
ErrorDialog: false,
CreateNoWindow: true,
RedirectStandardError: true,
RedirectStandardInput: false,
RedirectStandardOutput: true,
UseShellExecute: false)
boocProcess = Process(StartInfo: boocProcessStartInfo)
parseOutput = def(line as string):
warningPatternMatch = warningPattern.Match(line)
errorPatternMatch = errorPattern.Match(line)
if warningPatternMatch.Success:
Log.LogWarning(
null,
warningPatternMatch.Groups['code'].Value,
null,
warningPatternMatch.Groups['file'].Value,
int.Parse(warningPatternMatch.Groups['line'].Value),
int.Parse(warningPatternMatch.Groups['column'].Value),
0,
0,
warningPatternMatch.Groups['message'].Value)
elif errorPatternMatch.Success:
code = errorPatternMatch.Groups['code'].Value
code = 'BCE0000' if string.IsNullOrEmpty(code)
file = errorPatternMatch.Groups['file'].Value
file = 'BOOC' if string.IsNullOrEmpty(file)
try:
lineNumber = int.Parse(
errorPatternMatch.Groups['line'].Value,
NumberStyles.Integer)
except FormatException:
lineNumber = 0
try:
columnNumber = int.Parse(
errorPatternMatch.Groups['column'].Value,
NumberStyles.Integer)
except FormatException:
columnNumber = 0
Log.LogError(
errorPatternMatch.Groups['errorType'].Value.ToLower(),
code,
null,
file,
lineNumber,
columnNumber,
0,
0,
errorPatternMatch.Groups['message'].Value)
buildSuccess = false
else:
Log.LogMessage(MessageImportance.Low, line)
readStandardOutput = def():
while true:
outputLine = boocProcess.StandardOutput.ReadLine()
if outputLine:
parseOutput(outputLine)
else:
readingDoneEvents[0].Set()
break
readStandardError = def():
while true:
errorLine = boocProcess.StandardError.ReadLine()
if errorLine:
parseOutput(errorLine)
else:
readingDoneEvents[1].Set()
break
standardOutputReadingThread = Thread(readStandardOutput as ThreadStart)
standardErrorReadingThread = Thread(readStandardError as ThreadStart)
# Two threads are required (MSDN); otherwise, a deadlock WILL occur.
try:
boocProcess.Start()
Log.LogMessage(
MessageImportance.High,
"${ToolName} ${boocProcess.StartInfo.Arguments}",
null)
standardOutputReadingThread.Start()
standardErrorReadingThread.Start()
WaitHandle.WaitAny((readingDoneEvents[0],))
WaitHandle.WaitAny((readingDoneEvents[1],))
# MSBuild runs on an STA thread, and WaitHandle.WaitAll()
# is not supported.
except e as Exception:
Log.LogErrorFromException(e)
buildSuccess = false
ensure:
boocProcess.Close()
return buildSuccess
protected override def AddCommandLineCommands(
commandLine as CommandLineBuilderExtension):
"""
Adds command line commands.
Remarks:
It prevents <ManagedCompiler> from adding the standard commands.
"""
pass
protected override def AddResponseFileCommands(
commandLine as CommandLineBuilderExtension):
"""
Generates the Boo compiler command line.
Returns:
The Boo compiler command line.
"""
commandLine.AppendSwitchIfNotNull('-t:', TargetType)
commandLine.AppendSwitchIfNotNull('-o:', OutputAssembly)
commandLine.AppendSwitchIfNotNull('-c:', Culture)
commandLine.AppendSwitchIfNotNull('-srcdir:', SourceDirectory)
if Pipelines:
for pipeline in Pipelines:
commandLine.AppendSwitchIfNotNull('-p:', pipeline)
if References:
for reference in References:
commandLine.AppendSwitchIfNotNull('-r:', reference)
if Resources:
for resource in Resources:
commandLine.AppendSwitchIfNotNull('-resource:', resource)
if Verbosity:
if string.Compare(
Verbosity,
'Normal',
StringComparison.InvariantCultureIgnoreCase) == 0:
pass
elif string.Compare(
Verbosity,
'Warning',
StringComparison.InvariantCultureIgnoreCase) == 0:
commandLine.AppendSwitch('-v')
elif string.Compare(
Verbosity,
'Info',
StringComparison.InvariantCultureIgnoreCase) == 0:
commandLine.AppendSwitch('-vv')
elif string.Compare(
Verbosity,
'Verbose',
StringComparison.InvariantCultureIgnoreCase) == 0:
commandLine.AppendSwitch('-vvv')
else:
Log.LogErrorWithCodeFromResources(
'Vbc.EnumParameterHasInvalidValue',
'Verbosity',
Verbosity,
'Normal, Warning, Info, Verbose')
commandLine.AppendFileNamesIfNotNull(Sources, ' ')
protected override def GenerateFullPathToTool():
"""
Generats the full path to booc.exe.
"""
toolPath as string = ToolPath
if toolPath is not null:
path = Path.Combine(toolPath, ToolName)
if path is null or not File.Exists(path):
path = Path.Combine(
Path.GetDirectoryName(typeof(Booc).Assembly.Location),
ToolName)
unless File.Exists(path):
path = ToolLocationHelper.GetPathToDotNetFrameworkFile(
ToolName,
TargetDotNetFrameworkVersion.Version20)
unless File.Exists(path):
Log.LogErrorWithCodeFromResources(
"General.FrameworksFileNotFound",
ToolName,
ToolLocationHelper.GetDotNetFrameworkVersionFolderPrefix(
TargetDotNetFrameworkVersion.Version20))
return path

42
src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/CreateBooManifestResourceName.boo

@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
#region license
// Copyright (c) 2003, 2004, 2005 Rodrigo B. de Oliveira (rbo@acm.org)
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Rodrigo B. de Oliveira nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endregion
namespace Boo.Microsoft.Build.Tasks
import Microsoft.Build.Tasks
class CreateBooManifestResourceName(CreateCSharpManifestResourceName):
"""
Creates the manifest resource name.
Authors:
Sorin Ionescu (sorin.ionescu@gmail.com)
"""
def constructor():
super()

67
src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/Project.booproj

@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
<Project
DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid></ProjectGuid>
<!-- OutputType: Exe|WinExe|Library -->
<OutputType>Exe</OutputType>
<AssemblyName>Company.Project</AssemblyName>
<RootNamespace>Company.Project</RootNamespace>
<!-- BoocVerbosity: Normal|Warning|Info|Verbose -->
<BoocVerbosity>Normal</BoocVerbosity>
<!-- Assembly culture. -->
<AssemblyCulture></AssemblyCulture>
<!-- Source directory. -->
<SourceDirectory></SourceDirectory>
<!--
Set this property if Boo is not installed in the
.NET Framework directory.
BoocToolPath: C:\Program Files\Boo\bin
-->
<BoocToolPath></BoocToolPath>
</PropertyGroup>
<!-- Only debug builds are currently supported. -->
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<OutputPath>bin\Debug\</OutputPath>
</PropertyGroup>
<!-- FOR FUTURE USE
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>bin\Relase\</OutputPath>
</PropertyGroup>
-->
<!-- Additional pipelines to use. -->
<ItemGroup>
<Pipeline Include="Pipeline.boo" />
</ItemGroup>
<!-- Assembly references. -->
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<!-- Files to compile. -->
<ItemGroup>
<Compile Include="Program.boo" />
</ItemGroup>
<!-- Resources to embed. -->
<ItemGroup>
<Resource Include="Resources.resx" />
</ItemGroup>
<Import Project="$(BoocToolPath)\Boo.Microsoft.Build.targets" Condition="$(BoocToolPath) != ''" />
<Import Project="$(MSBuildBinPath)\Boo.Microsoft.Build.targets" Condition="'$(BoocToolPath)' == ''"/>
</Project>

70
src/AddIns/BackendBindings/Boo/Boo.Microsoft.Build.Tasks/Properties/AssemblyInfo.boo

@ -1,70 +0,0 @@ @@ -1,70 +0,0 @@
#region license
// Copyright (c) 2003, 2004, 2005 Rodrigo B. de Oliveira (rbo@acm.org)
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of Rodrigo B. de Oliveira nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#endregion
namespace Boo.Microsoft.Build.Tasks.Properties
"""
Author:
Sorin Ionescu (sorin.ionescu@gmail.com)
"""
import System.Reflection
import System.Runtime.CompilerServices
import System.Runtime.InteropServices
# General Information about an assembly is controlled through the following
# set of attributes. Change these attribute values to modify the information
# associated with an assembly.
[assembly: AssemblyTitle('Boo.Microsoft.Build.Tasks')]
[assembly: AssemblyDescription('Contains Microsoft Build tasks for BOO code.')]
[assembly: AssemblyConfiguration('')]
[assembly: AssemblyCompany('')]
[assembly: AssemblyProduct('Boo.Microsoft.Build.Tasks')]
[assembly: AssemblyCopyright('Copyright (C) 2005')]
[assembly: AssemblyTrademark('')]
[assembly: AssemblyCulture('')]
# Setting ComVisible to false makes the types in this assembly not visible
# to COM componenets. If you need to access a type in this assembly from
# COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
# The following GUID is for the ID of the typelib if this project is exposed
# to COM.
# [assembly: Guid('')]
# Version information for an assembly consists of the following four values:
#
# Major Version
# Minor Version
# Build Number
# Revision
#
# You can specify all the values or you can default the Revision and
# Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion('1.0.0.0')]
[assembly: AssemblyFileVersion('1.0.0.0')]

4
src/AddIns/BackendBindings/Boo/BooBinding.sln

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.1057
# SharpDevelop 2.0.0.1199
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter", "NRefactoryToBooConverter\Project\NRefactoryToBooConverter.csproj", "{DBCF20A1-BA13-4582-BFA9-74DE4D987B73}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactoryToBooConverter.Tests", "NRefactoryToBooConverter\Test\NRefactoryToBooConverter.Tests.csproj", "{C9DE556D-325C-4544-B29F-16A9EB7C9830}"
@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneConverter", "Stan @@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StandaloneConverter", "Stan
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooBinding", "BooBinding\Project\BooBinding.csproj", "{4AC2D5F1-F671-480C-A075-6BF62B3721B2}"
EndProject
Project("{A33008B1-5DAC-44D5-9060-242E3B6E38F2}") = "Boo.Microsoft.Build.Tasks", "Boo.Microsoft.Build.Tasks\Boo.Microsoft.Build.Tasks.booproj", "{366B4AFE-C4E9-46DF-9CFF-57C62D414D4A}"
EndProject
Project("{A33008B1-5DAC-44D5-9060-242E3B6E38F2}") = "Boo.InterpreterAddIn", "Boo.InterpreterAddIn\Project\Boo.InterpreterAddIn.booproj", "{928E34B2-5E46-4A4D-8E4D-2CA2CCDB905A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "..\..\..\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"

4
src/AddIns/BackendBindings/Boo/BooBinding/Project/BooBinding.addin

@ -102,9 +102,9 @@ @@ -102,9 +102,9 @@
<!--<DialogPanel id = "ReferencePaths"
label = "Reference Paths"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.ReferencePaths"/>-->
<!--<DialogPanel id = "Signing"
<DialogPanel id = "Signing"
label = "Signing"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>-->
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.Signing"/>
<DialogPanel id = "BuildEvents"
label = "Build Events"
class = "ICSharpCode.SharpDevelop.Gui.OptionPanels.BuildEvents"/>

11
src/AddIns/BackendBindings/Boo/BooBinding/Project/PostBuildEvent.proj

@ -1,15 +1,4 @@ @@ -1,15 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- REM binary is in repository, no need to always run booc
goto copyFiles
pushd "%1\..\..\RequiredLibraries"
booc Boo.Microsoft.Build.Tasks.boo -t:library -o:Boo.Microsoft.Build.Tasks.dll -r:Microsoft.Build.Framework -r:Microsoft.Build.Tasks -r:Microsoft.Build.Utilities
@IF %ERRORLEVEL% NEQ 0 GOTO BooPostBuildEventEnd
popd
:copyFiles
copy "%1\..\..\RequiredLibraries\booc.*" .
copy "%1\..\..\Boo.Microsoft.Build.Tasks\*.targets" .
copy "%1\..\..\RequiredLibraries\Boo.Microsoft.Build.Tasks.dll" .
:BooPostBuildEventEnd-->
<PropertyGroup>
<PrepareForRunDependsOn>$(PrepareForRunDependsOn);MyPostBuildTarget</PrepareForRunDependsOn>
</PropertyGroup>

6
src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportAddin.addin

@ -77,9 +77,9 @@ @@ -77,9 +77,9 @@
class="SharpReportAddin.Commands.ToogleOrder"/>
</Path>
<Path name = "/SharpDevelop/Workbench/MainMenu/Tools">
<MenuItem id = "neuaddinPad"
label = "ReportGenerator"
<Path name = "/Workspace/Tools">
<MenuItem id = "ReportGeneratorPad"
label = "${res:SharpReport.ReportGenerator}"
shortcut = "Control|Alt|T"
class = "SharpReportAddin.Commands.RunSharpReport"/>

1
src/Libraries/NRefactory/Project/Src/Output/SpecialNodesInserter.cs

@ -131,6 +131,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter @@ -131,6 +131,7 @@ namespace ICSharpCode.NRefactory.PrettyPrinter
SpecialNodesInserter sni = new SpecialNodesInserter(specials, new SpecialOutputVisitor(outputVisitor.OutputFormatter));
outputVisitor.NodeTracker.NodeVisiting += sni.AcceptNodeStart;
outputVisitor.NodeTracker.NodeVisited += sni.AcceptNodeEnd;
outputVisitor.NodeTracker.NodeChildrenVisited += sni.AcceptNodeEnd;
return sni;
}
}

16
src/Main/Base/Project/Src/Commands/VBConverter/CSharpConvertBuffer.cs

@ -36,24 +36,18 @@ namespace ICSharpCode.SharpDevelop.Commands @@ -36,24 +36,18 @@ namespace ICSharpCode.SharpDevelop.Commands
p.Parse();
if (p.Errors.count > 0) {
MessageService.ShowError("Correct source code errors first (only correct source code would convert).");
return;
}
ICSharpCode.NRefactory.PrettyPrinter.CSharpOutputVisitor vbv = new ICSharpCode.NRefactory.PrettyPrinter.CSharpOutputVisitor();
ICSharpCode.NRefactory.PrettyPrinter.CSharpOutputVisitor output = new ICSharpCode.NRefactory.PrettyPrinter.CSharpOutputVisitor();
List<ISpecial> specials = p.Lexer.SpecialTracker.CurrentSpecials;
PreProcessingDirective.VBToCSharp(specials);
new VBNetToCSharpConvertVisitor().Visit(p.CompilationUnit, null);
SpecialNodesInserter sni = new SpecialNodesInserter(specials,
new SpecialOutputVisitor(vbv.OutputFormatter));
vbv.NodeTracker.NodeVisiting += sni.AcceptNodeStart;
vbv.NodeTracker.NodeVisited += sni.AcceptNodeEnd;
vbv.NodeTracker.NodeChildrenVisited += sni.AcceptNodeEnd;
vbv.Visit(p.CompilationUnit, null);
sni.Finish();
using (SpecialNodesInserter.Install(specials, output)) {
output.Visit(p.CompilationUnit, null);
}
FileService.NewFile("Generated.CS", "C#", vbv.Text);
FileService.NewFile("Generated.CS", "C#", output.Text);
}
}
}

12
src/Main/Base/Project/Src/Commands/VBConverter/ConvertBuffer.cs

@ -41,18 +41,14 @@ namespace ICSharpCode.SharpDevelop.Commands @@ -41,18 +41,14 @@ namespace ICSharpCode.SharpDevelop.Commands
return;
}
ICSharpCode.NRefactory.PrettyPrinter.VBNetOutputVisitor vbv = new ICSharpCode.NRefactory.PrettyPrinter.VBNetOutputVisitor();
VBNetOutputVisitor vbv = new VBNetOutputVisitor();
List<ISpecial> specials = p.Lexer.SpecialTracker.CurrentSpecials;
PreProcessingDirective.CSharpToVB(specials);
new CSharpToVBNetConvertVisitor().Visit(p.CompilationUnit, null);
SpecialNodesInserter sni = new SpecialNodesInserter(specials,
new SpecialOutputVisitor(vbv.OutputFormatter));
vbv.NodeTracker.NodeVisiting += sni.AcceptNodeStart;
vbv.NodeTracker.NodeVisited += sni.AcceptNodeEnd;
vbv.NodeTracker.NodeChildrenVisited += sni.AcceptNodeEnd;
vbv.Visit(p.CompilationUnit, null);
sni.Finish();
using (SpecialNodesInserter.Install(specials, vbv)) {
vbv.Visit(p.CompilationUnit, null);
}
FileService.NewFile("Generated.VB", "VBNET", vbv.Text);
}

3
src/Main/Base/Project/Src/TextEditor/Gui/Editor/ErrorDrawer.cs

@ -160,7 +160,8 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -160,7 +160,8 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
}
}
}
int startOffset = offset;//Math.Min(textEditor.Document.TextLength, TextUtilities.FindWordStart(textEditor.Document, offset));
offset = Math.Min(offset, textEditor.Document.TextLength);
int startOffset = offset;
int endOffset = Math.Max(1, TextUtilities.FindWordEnd(textEditor.Document, offset));
textEditor.Document.MarkerStrategy.AddMarker(new VisualError(startOffset, endOffset - startOffset + 1, task));
if (refresh) {

BIN
src/Main/StartUp/Project/Resources/StringResources.resources

Binary file not shown.
Loading…
Cancel
Save