Browse Source

Merge 3.0 to trunk.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5081 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 16 years ago
parent
commit
dbb48e866c
  1. 4
      data/templates/project/CSharp/WPFApplication.xpt
  2. 4
      data/templates/project/CSharp/WPFNavigationApplication.xpt
  3. 2
      src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/fsi.fs
  4. 13
      src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs
  5. 3
      src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj
  6. 6
      src/AddIns/BackendBindings/Python/PyWalker/ResolveWalker.cs
  7. 3
      src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj
  8. 4
      src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Src/PythonCompiler.cs
  9. 3
      src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj
  10. 6
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Lib/__future__.py
  11. 4
      src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin
  12. 5
      src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj
  13. 41
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IProcessRunner.cs
  14. 16
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonAstWalker.cs
  15. 12
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeDeserializer.cs
  16. 6
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonComponentWalker.cs
  17. 6
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControlFieldExpression.cs
  18. 16
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonProcessRunner.cs
  19. 10
      src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonVariableResolver.cs
  20. 21
      src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs
  21. 10
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/PythonConsoleHomeKeyTestFixture.cs
  22. 17
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertCSharpToPythonMenuCommandTestFixture.cs
  23. 16
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs
  24. 2
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs
  25. 11
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/InvalidCastInPythonParserTestFixture.cs
  26. 4
      src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj
  27. 132
      src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProcessRunner.cs
  28. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.Modules.dll
  29. 1119
      src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.Modules.xml
  30. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.dll
  31. 6790
      src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.xml
  32. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Dynamic.dll
  33. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Core.dll
  34. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Debugging.dll
  35. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.ExtensionAttribute.dll
  36. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.dll
  37. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/ipy.exe
  38. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/ipy64.exe
  39. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw.exe
  40. BIN
      src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw64.exe
  41. 5
      src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs
  42. 2
      src/AddIns/Misc/Debugger/Debugger.Tests/Project/Debugger.Tests.csproj
  43. 4
      src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs
  44. 14
      src/AddIns/Misc/UnitTesting/Src/TestClass.cs
  45. 104
      src/AddIns/Misc/UnitTesting/Test/Project/TwoBaseClassesWithTestMethodsTestFixture.cs
  46. 1
      src/AddIns/Misc/UnitTesting/Test/UnitTesting.Tests.csproj
  47. 14
      src/Automated.proj
  48. 12
      src/Setup/Files.wxs
  49. 7
      src/Setup/Setup.wxs
  50. 3
      src/Tools/UpdateSetupInfo/UpdateSetupInfo.csproj

4
data/templates/project/CSharp/WPFApplication.xpt

@ -63,10 +63,6 @@ namespace ${StandardNamespace} @@ -63,10 +63,6 @@ namespace ${StandardNamespace}
/// </summary>
public partial class App : Application
{
public App()
{
InitializeComponent();
}
}
}]]></File>
<File name="Window1.xaml" buildAction="Page" language="XML"><![CDATA[<Window x:Class="${StandardNamespace}.Window1"

4
data/templates/project/CSharp/WPFNavigationApplication.xpt

@ -64,10 +64,6 @@ namespace ${StandardNamespace} @@ -64,10 +64,6 @@ namespace ${StandardNamespace}
/// </summary>
public partial class App : Application
{
public App()
{
InitializeComponent();
}
}
}]]></File>
<File name="Page1.xaml" language="XML" buildAction="Page"><![CDATA[<Page x:Class="${StandardNamespace}.Page1"

2
src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/fsi.fs

@ -53,7 +53,7 @@ module TheControl = @@ -53,7 +53,7 @@ module TheControl =
else
let path = Environment.GetEnvironmentVariable("PATH")
let paths = path.Split([|';'|])
let path = paths |> Array.tryfind (fun x -> try File.Exists(Path.Combine(x, "fsi.exe")) with _ -> false)
let path = paths |> Array.tryFind (fun x -> try File.Exists(Path.Combine(x, "fsi.exe")) with _ -> false)
match path with
| Some x ->
fsiProcess.StartInfo.FileName <- Path.Combine(x, "fsi.exe")

13
src/AddIns/BackendBindings/FSharp/FSharpBinding/Project/Src/project.fs

@ -174,18 +174,19 @@ module ProjectHelpers = @@ -174,18 +174,19 @@ module ProjectHelpers =
doc.Load(project.FileName)
let nsmgr = new XmlNamespaceManager(doc.NameTable)
nsmgr.AddNamespace("proj", "http://schemas.microsoft.com/developer/msbuild/2003")
let d = new Dictionary<FileNode,XmlNode>()
nodes |> forEachFileNode
(fun node ->
let docNode = doc.SelectSingleNode(Printf.sprintf @"//proj:Compile[@Include=""%s""]" (Path.GetFileName(node.FileName)), nsmgr)
docNode.ParentNode.RemoveChild(docNode) |> ignore)
if docNode <> null then
d.[node] <- docNode
docNode.ParentNode.RemoveChild(docNode) |> ignore)
let itemNode = doc.SelectSingleNode("//proj:ItemGroup", nsmgr)
nodes |> forEachFileNode
(fun node ->
let xmlElem = doc.CreateElement("", "Compile", "http://schemas.microsoft.com/developer/msbuild/2003")
let xmlAttr = doc.CreateAttribute("Include")
xmlAttr.InnerText <- Path.GetFileName(node.FileName)
xmlElem.Attributes.Append(xmlAttr) |> ignore
itemNode.AppendChild(xmlElem) |> ignore)
let found, xmlElem = d.TryGetValue(node)
if found then
itemNode.AppendChild(xmlElem) |> ignore)
doc.Save(project.FileName)

3
src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj

@ -43,6 +43,9 @@ @@ -43,6 +43,9 @@
<Reference Include="IronPython.Modules">
<HintPath>..\RequiredLibraries\IronPython.Modules.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Dynamic">
<HintPath>..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting">
<HintPath>..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
</Reference>

6
src/AddIns/BackendBindings/Python/PyWalker/ResolveWalker.cs

@ -78,10 +78,10 @@ namespace PyWalker @@ -78,10 +78,10 @@ namespace PyWalker
public override bool Walk(ClassDefinition node)
{
if (node.Bases.Length > 0) {
writer.WriteLine("Class: " + node.Name.ToString() + " BaseTypes: " + GetBaseTypes(node.Bases));
if (node.Bases.Count > 0) {
writer.WriteLine("Class: " + node.Name + " BaseTypes: " + GetBaseTypes(node.Bases));
} else {
writer.WriteLine("Class: " + node.Name.ToString());
writer.WriteLine("Class: " + node.Name);
}
return base.Walk(node);
}

3
src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj

@ -49,6 +49,9 @@ @@ -49,6 +49,9 @@
<Reference Include="Microsoft.Build.Utilities.v3.5">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Microsoft.Dynamic">
<HintPath>..\..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting">
<HintPath>..\..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
</Reference>

4
src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Src/PythonCompiler.cs

@ -96,8 +96,8 @@ namespace ICSharpCode.Python.Build.Tasks @@ -96,8 +96,8 @@ namespace ICSharpCode.Python.Build.Tasks
// Compile the source files to a dll first.
ScriptEngine engine = IronPython.Hosting.Python.CreateEngine();
PythonDictionary dictionary = new PythonDictionary();
dictionary.setdefault("mainModule", mainFile);
Dictionary<string, object> dictionary = new Dictionary<string, object>();
dictionary.Add("mainModule", mainFile);
string outputAssemblyDll = Path.ChangeExtension(outputAssembly, ".dll");
ClrModule.CompileModules(DefaultContext.Default, outputAssemblyDll, dictionary, ToStringArray(sourceFiles));

3
src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj

@ -47,6 +47,9 @@ @@ -47,6 +47,9 @@
<Reference Include="Microsoft.Build.Utilities.v3.5">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Microsoft.Dynamic">
<HintPath>..\..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting">
<HintPath>..\..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
</Reference>

6
src/AddIns/BackendBindings/Python/PythonBinding/Project/Lib/__future__.py

@ -13,7 +13,13 @@ @@ -13,7 +13,13 @@
#
#####################################################################################
all_feature_names = ['nested_scopes', 'generators', 'division',
'absolute_import', 'with_statement', 'print_function',
'unicode_literals']
division=1
with_statement=1
generators=1
absolute_import=1
print_function=1
unicode_literals=1

4
src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.addin

@ -12,9 +12,7 @@ @@ -12,9 +12,7 @@
<Runtime>
<Import assembly=":ICSharpCode.SharpDevelop"/>
<Import assembly="$ICSharpCode.FormsDesigner/FormsDesigner.dll"/>
<Import assembly="PythonBinding.dll">
<ConditionEvaluator name="IsPythonRunning" class="ICSharpCode.PythonBinding.IsPythonRunningCondition"/>
</Import>
<Import assembly="PythonBinding.dll"/>
</Runtime>
<Path name="/SharpDevelop/ViewContent/DefaultTextEditor/SyntaxModes">

5
src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj

@ -46,6 +46,9 @@ @@ -46,6 +46,9 @@
<Reference Include="IronPython.Modules">
<HintPath>..\..\RequiredLibraries\IronPython.Modules.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Dynamic">
<HintPath>..\..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting">
<HintPath>..\..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
</Reference>
@ -76,7 +79,6 @@ @@ -76,7 +79,6 @@
<Compile Include="Src\IComponentCreator.cs" />
<Compile Include="Src\IMemberProvider.cs" />
<Compile Include="Src\IPadDescriptor.cs" />
<Compile Include="Src\IProcessRunner.cs" />
<Compile Include="Src\ITextEditor.cs" />
<Compile Include="Src\NRefactoryToPythonConverter.cs" />
<Compile Include="Src\PythonAstWalker.cs" />
@ -106,7 +108,6 @@ @@ -106,7 +108,6 @@
<Compile Include="Src\PythonOutputStream.cs" />
<Compile Include="Src\PythonOutputWindowPadDescriptor.cs" />
<Compile Include="Src\PythonParser.cs" />
<Compile Include="Src\PythonProcessRunner.cs" />
<Compile Include="Src\PythonProject.cs" />
<Compile Include="Src\PythonPropertyValueAssignment.cs" />
<Compile Include="Src\PythonResolver.cs" />

41
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/IProcessRunner.cs

@ -1,41 +0,0 @@ @@ -1,41 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using ICSharpCode.SharpDevelop.Util;
namespace ICSharpCode.PythonBinding
{
/// <summary>
/// Process runner interface.
/// </summary>
public interface IProcessRunner
{
/// <summary>
/// Triggered when a line of text is read from the standard output.
/// </summary>
event LineReceivedEventHandler OutputLineReceived;
/// <summary>
/// Triggered when the process has exited.
/// </summary>
event EventHandler ProcessExited;
/// <summary>
/// Starts the process.
/// </summary>
/// <param name="command">The process filename.</param>
/// <param name="arguments">The command line arguments to
/// pass to the command.</param>
void Start(string command, string arguments);
/// <summary>
/// Kills the running process.
/// </summary>
void Kill();
}
}

16
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonAstWalker.cs

@ -79,6 +79,10 @@ namespace ICSharpCode.PythonBinding @@ -79,6 +79,10 @@ namespace ICSharpCode.PythonBinding
/// </summary>
public override bool Walk(FunctionDefinition node)
{
if (node.Body == null) {
return true;
}
bool ignoreFirstMethodParameter = true;
IClass c = currentClass;
if (currentClass == null) {
@ -89,7 +93,7 @@ namespace ICSharpCode.PythonBinding @@ -89,7 +93,7 @@ namespace ICSharpCode.PythonBinding
}
// Create method.
string methodName = node.Name.ToString();
string methodName = node.Name;
DomRegion bodyRegion = GetBodyRegion(node.Body, node.Header);
DomRegion region = GetMethodRegion(node);
@ -167,7 +171,7 @@ namespace ICSharpCode.PythonBinding @@ -167,7 +171,7 @@ namespace ICSharpCode.PythonBinding
NameExpression nameExpression = expression as NameExpression;
MemberExpression memberExpression = expression as MemberExpression;
if (nameExpression != null) {
AddBaseType(c, nameExpression.Name.ToString());
AddBaseType(c, nameExpression.Name);
} else if (memberExpression != null) {
AddBaseType(c, PythonControlFieldExpression.GetMemberName(memberExpression));
}
@ -187,7 +191,7 @@ namespace ICSharpCode.PythonBinding @@ -187,7 +191,7 @@ namespace ICSharpCode.PythonBinding
/// </summary>
/// <remarks>If the parameters belong to a class method then the first
/// "self" parameter can be ignored.</remarks>
IParameter[] ConvertParameters(Parameter[] parameters, bool ignoreFirstParameter)
IParameter[] ConvertParameters(IList<Parameter> parameters, bool ignoreFirstParameter)
{
List<IParameter> convertedParameters = new List<IParameter>();
@ -196,8 +200,8 @@ namespace ICSharpCode.PythonBinding @@ -196,8 +200,8 @@ namespace ICSharpCode.PythonBinding
startingIndex = 1;
}
for (int i = startingIndex; i < parameters.Length; ++i) {
DefaultParameter parameter = new DefaultParameter(parameters[i].Name.ToString(), null, new DomRegion());
for (int i = startingIndex; i < parameters.Count; ++i) {
DefaultParameter parameter = new DefaultParameter(parameters[i].Name, null, new DomRegion());
convertedParameters.Add(parameter);
}
return convertedParameters.ToArray();
@ -209,7 +213,7 @@ namespace ICSharpCode.PythonBinding @@ -209,7 +213,7 @@ namespace ICSharpCode.PythonBinding
/// </summary>
string GetFullyQualifiedClassName(ClassDefinition classDef)
{
return String.Concat(ns, ".", classDef.Name.ToString());
return String.Concat(ns, ".", classDef.Name);
}
/// <summary>

12
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonCodeDeserializer.cs

@ -129,7 +129,7 @@ namespace ICSharpCode.PythonBinding @@ -129,7 +129,7 @@ namespace ICSharpCode.PythonBinding
/// </summary>
object Deserialize(NameExpression nameExpression)
{
string name = nameExpression.Name.ToString();
string name = nameExpression.Name;
if ("self" == name.ToLowerInvariant()) {
return componentCreator.RootComponent;
} else {
@ -157,8 +157,8 @@ namespace ICSharpCode.PythonBinding @@ -157,8 +157,8 @@ namespace ICSharpCode.PythonBinding
ListExpression list = callExpression.Args[0].Expression as ListExpression;
MemberExpression arrayTypeMemberExpression = target.Index as MemberExpression;
Type arrayType = componentCreator.GetType(PythonControlFieldExpression.GetMemberName(arrayTypeMemberExpression));
Array array = Array.CreateInstance(arrayType, list.Items.Length);
for (int i = 0; i < list.Items.Length; ++i) {
Array array = Array.CreateInstance(arrayType, list.Items.Count);
for (int i = 0; i < list.Items.Count; ++i) {
Expression listItemExpression = list.Items[i];
ConstantExpression constantExpression = listItemExpression as ConstantExpression;
MemberExpression memberExpression = listItemExpression as MemberExpression;
@ -167,10 +167,10 @@ namespace ICSharpCode.PythonBinding @@ -167,10 +167,10 @@ namespace ICSharpCode.PythonBinding
if (constantExpression != null) {
array.SetValue(constantExpression.Value, i);
} else if (memberExpression != null) {
string name = PythonControlFieldExpression.GetVariableName(memberExpression.Name.ToString());
string name = PythonControlFieldExpression.GetVariableName(memberExpression.Name);
array.SetValue(componentCreator.GetComponent(name), i);
} else if (nameExpression != null) {
array.SetValue(componentCreator.GetInstance(nameExpression.Name.ToString()), i);
array.SetValue(componentCreator.GetInstance(nameExpression.Name), i);
} else if (listItemCallExpression != null) {
object instance = componentCreator.CreateInstance(arrayType, GetArguments(listItemCallExpression), null, false);
array.SetValue(instance, i);
@ -191,7 +191,7 @@ namespace ICSharpCode.PythonBinding @@ -191,7 +191,7 @@ namespace ICSharpCode.PythonBinding
if (type != null) {
foreach (MethodInfo method in type.GetMethods(BindingFlags.Public | BindingFlags.Static)) {
if (method.Name == field.MemberName) {
if (method.GetParameters().Length == callExpression.Args.Length) {
if (method.GetParameters().Length == callExpression.Args.Count) {
return method.Invoke(null, GetArguments(callExpression).ToArray());
}
}

6
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonComponentWalker.cs

@ -61,12 +61,12 @@ namespace ICSharpCode.PythonBinding @@ -61,12 +61,12 @@ namespace ICSharpCode.PythonBinding
/// </summary>
public static string GetBaseClassName(ClassDefinition classDefinition)
{
if (classDefinition.Bases.Length > 0) {
if (classDefinition.Bases.Count > 0) {
Expression baseClassExpression = classDefinition.Bases[0];
NameExpression nameExpression = baseClassExpression as NameExpression;
MemberExpression memberExpression = baseClassExpression as MemberExpression;
if (nameExpression != null) {
return nameExpression.Name.ToString();
return nameExpression.Name;
}
return PythonControlFieldExpression.GetMemberName(memberExpression);
}
@ -76,7 +76,7 @@ namespace ICSharpCode.PythonBinding @@ -76,7 +76,7 @@ namespace ICSharpCode.PythonBinding
public override bool Walk(ClassDefinition node)
{
classDefinition = node;
componentName = node.Name.ToString();
componentName = node.Name;
if (node.Body != null) {
node.Body.Walk(this);
}

6
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonControlFieldExpression.cs

@ -164,13 +164,13 @@ namespace ICSharpCode.PythonBinding @@ -164,13 +164,13 @@ namespace ICSharpCode.PythonBinding
{
List<string> names = new List<string>();
while (expression != null) {
names.Insert(0, expression.Name.ToString());
names.Insert(0, expression.Name);
NameExpression nameExpression = expression.Target as NameExpression;
expression = expression.Target as MemberExpression;
if (expression == null) {
if (nameExpression != null) {
names.Insert(0, nameExpression.Name.ToString());
names.Insert(0, nameExpression.Name);
}
}
}
@ -273,7 +273,7 @@ namespace ICSharpCode.PythonBinding @@ -273,7 +273,7 @@ namespace ICSharpCode.PythonBinding
object component = GetComponent(componentCreator);
PropertyDescriptor property = GetProperty(component, memberName);
if (property != null) {
string name = nameExpression.Name.ToString();
string name = nameExpression.Name;
if (property.PropertyType != typeof(bool)) {
object instance = componentCreator.GetInstance(name);
if (instance != null) {

16
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonProcessRunner.cs

@ -1,16 +0,0 @@ @@ -1,16 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using ICSharpCode.SharpDevelop.Util;
namespace ICSharpCode.PythonBinding
{
public class PythonProcessRunner : ProcessRunner, IProcessRunner
{
}
}

10
src/AddIns/BackendBindings/Python/PythonBinding/Project/Src/PythonVariableResolver.cs

@ -73,7 +73,7 @@ namespace ICSharpCode.PythonBinding @@ -73,7 +73,7 @@ namespace ICSharpCode.PythonBinding
public override bool Walk(NameExpression node)
{
if (currentAssignStatement != null) {
string nodeName = node.Name.ToString();
string nodeName = node.Name;
if (nodeName == variableName) {
foundVariableAssignment = true;
}
@ -119,14 +119,14 @@ namespace ICSharpCode.PythonBinding @@ -119,14 +119,14 @@ namespace ICSharpCode.PythonBinding
do {
nameExpression = node as NameExpression;
MemberExpression memberExpression = node as MemberExpression;
SymbolId symbol = new SymbolId(0);
string name = String.Empty;
if (memberExpression != null) {
symbol = memberExpression.Name;
name = memberExpression.Name;
node = memberExpression.Target;
} else if (nameExpression != null) {
symbol = nameExpression.Name;
name = nameExpression.Name;
}
names.Add(symbol.ToString());
names.Add(name);
} while (nameExpression == null);
// Create the fully qualified type name by adding the names

21
src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs

@ -38,7 +38,6 @@ namespace PythonBinding.Tests @@ -38,7 +38,6 @@ namespace PythonBinding.Tests
Codon projectBindingCodon;
Codon projectFileFilterCodon;
Codon codeCompletionBindingCodon;
LazyConditionEvaluator isPythonRunningConditionEvaluator;
Codon applicationSettingsOptionsCodon;
Codon buildEventsCodon;
Codon compilingOptionsCodon;
@ -89,13 +88,7 @@ namespace PythonBinding.Tests @@ -89,13 +88,7 @@ namespace PythonBinding.Tests
// Get the PythonBinding runtime.
foreach (Runtime runtime in addin.Runtimes) {
if (runtime.Assembly == "PythonBinding.dll") {
pythonBindingRuntime = runtime;
foreach (LazyConditionEvaluator conditionEvaluator in runtime.DefinedConditionEvaluators) {
if (conditionEvaluator.Name == "IsPythonRunning") {
isPythonRunningConditionEvaluator = conditionEvaluator;
}
}
pythonBindingRuntime = runtime;
} else if (runtime.Assembly == "$ICSharpCode.FormsDesigner/FormsDesigner.dll") {
formsDesignerRuntime = runtime;
}
@ -141,18 +134,6 @@ namespace PythonBinding.Tests @@ -141,18 +134,6 @@ namespace PythonBinding.Tests
Assert.IsNotNull(pythonBindingRuntime);
}
[Test]
public void IsPythonRunningConditionExists()
{
Assert.IsNotNull(isPythonRunningConditionEvaluator);
}
[Test]
public void IsPythonRunningConditionClassName()
{
Assert.AreEqual("ICSharpCode.PythonBinding.IsPythonRunningCondition", isPythonRunningConditionEvaluator.ClassName);
}
[Test]
public void FileFilterExists()
{

10
src/AddIns/BackendBindings/Python/PythonBinding/Test/Console/PythonConsoleHomeKeyTestFixture.cs

@ -41,5 +41,15 @@ namespace PythonBinding.Tests.Console @@ -41,5 +41,15 @@ namespace PythonBinding.Tests.Console
int expectedColumn = prompt.Length;
Assert.AreEqual(expectedColumn, textEditor.Column);
}
[Test]
public void HomeKeyPressedWhenTextInConsole()
{
textEditor.RaiseKeyPressEvent('a');
textEditor.RaiseDialogKeyPressEvent(Keys.Home);
int expectedColumn = prompt.Length;
Assert.AreEqual(expectedColumn, textEditor.Column);
}
}
}

17
src/AddIns/BackendBindings/Python/PythonBinding/Test/Converter/ConvertCSharpToPythonMenuCommandTestFixture.cs

@ -62,6 +62,23 @@ namespace PythonBinding.Tests.Converter @@ -62,6 +62,23 @@ namespace PythonBinding.Tests.Converter
Assert.AreEqual("Python", language);
}
[Test]
public void TabIndent()
{
MockTextEditorProperties properties = new MockTextEditorProperties();
properties.ConvertTabsToSpaces = false;
Assert.AreEqual("\t", NRefactoryToPythonConverter.GetIndentString(properties));
}
[Test]
public void TwoChaSpaceIndent()
{
MockTextEditorProperties properties = new MockTextEditorProperties();
properties.ConvertTabsToSpaces = true;
properties.IndentationSize = 2;
Assert.AreEqual(" ", NRefactoryToPythonConverter.GetIndentString(properties));
}
protected override void NewFile(string defaultName, string language, string content)
{
defaultFileName = defaultName;

16
src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GeneratorMergeFindsInitializeComponentsTestFixture.cs

@ -123,21 +123,5 @@ namespace PythonBinding.Tests.Designer @@ -123,21 +123,5 @@ namespace PythonBinding.Tests.Designer
"\tdef InitializeComponents(self):\r\n" +
"\t\tpass\r\n";
}
string GetPythonCode()
{
return "from System.Windows.Forms import Form\r\n" +
"\r\n" +
"class MainForm(Form):\r\n" +
"\tdef __init__(self):\r\n" +
"\t\tself.InitializeComponent()\r\n" +
"\t\r\n" +
"\tdef InitializeComponent(self):\r\n" +
"\t\tself.SuspendLayout()\r\n" +
"\t\tself.ClientSize = System.Drawing.Size(499, 309)\r\n" +
"\t\tself.Name = 'MainForm'\r\n" +
"\t\tself.ResumeLayout(False)\r\n" +
"\t\tself.PerformLayout()\r\n";
}
}
}

2
src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/MissingInitializeComponentMethodTestFixture.cs

@ -53,7 +53,7 @@ namespace PythonBinding.Tests.Designer @@ -53,7 +53,7 @@ namespace PythonBinding.Tests.Designer
[Test]
public void ClassWithNoBody()
{
ClassDefinition classDef = new ClassDefinition(new SymbolId(10), null, null);
ClassDefinition classDef = new ClassDefinition("classWithNoBody", null, null);
PythonComponentWalker walker = new PythonComponentWalker(this);
walker.Walk(classDef);
}

11
src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/InvalidCastInPythonParserTestFixture.cs

@ -16,7 +16,7 @@ using PythonBinding.Tests; @@ -16,7 +16,7 @@ using PythonBinding.Tests;
namespace PythonBinding.Tests.Parsing
{
/// <summary>
/// The IronPython parser will throw an invalid cast exception for the following code:
/// The IronPython 2.0.2 parser will throw an invalid cast exception for the following code:
///
/// class Project(id):
/// def __init__ Project_ID():
@ -32,6 +32,8 @@ namespace PythonBinding.Tests.Parsing @@ -32,6 +32,8 @@ namespace PythonBinding.Tests.Parsing
/// at IronPython.Compiler.Parser.ParseStmt()
/// at IronPython.Compiler.Parser.ParseFile(Boolean makeModule)
/// at ICSharpCode.PythonBinding.PythonParser.CreateAst(String fileName, String fileContent)
///
/// This test just ensures that this bug is fixed with IronPython 2.6
/// </summary>
[TestFixture]
public class InvalidCastInPythonParserTestFixture
@ -41,11 +43,10 @@ namespace PythonBinding.Tests.Parsing @@ -41,11 +43,10 @@ namespace PythonBinding.Tests.Parsing
" #i\r\n";
/// <summary>
/// Check that IronPython bug still exists.
/// Check that IronPython bug has been fixed exists.
/// </summary>
[Test]
[ExpectedException(typeof(InvalidCastException))]
public void CreateAstShouldThrowInvalidCastException()
public void CreateAstShouldNotThrowInvalidCastException()
{
PythonParser parser = new PythonParser();
PythonAst ast = parser.CreateAst(@"d:\projects\test\test.py", new StringTextBuffer(code));
@ -56,7 +57,7 @@ namespace PythonBinding.Tests.Parsing @@ -56,7 +57,7 @@ namespace PythonBinding.Tests.Parsing
{
PythonParser parser = new PythonParser();
ICompilationUnit unit = parser.Parse(new DefaultProjectContent(), @"d:\projects\test\test.py", code);
Assert.AreEqual(0, unit.Classes.Count);
Assert.AreEqual(1, unit.Classes.Count);
}
}
}

4
src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj

@ -45,6 +45,9 @@ @@ -45,6 +45,9 @@
</Reference>
<Reference Include="Microsoft.Build" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Dynamic">
<HintPath>..\..\RequiredLibraries\Microsoft.Dynamic.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Scripting">
<HintPath>..\..\RequiredLibraries\Microsoft.Scripting.dll</HintPath>
</Reference>
@ -369,7 +372,6 @@ @@ -369,7 +372,6 @@
<Compile Include="Utils\MockMethod.cs" />
<Compile Include="Utils\MockOpenedFile.cs" />
<Compile Include="Utils\MockPadDescriptor.cs" />
<Compile Include="Utils\MockProcessRunner.cs" />
<Compile Include="Utils\MockProject.cs" />
<Compile Include="Utils\MockProjectContent.cs" />
<Compile Include="Utils\MockPropertyDescriptor.cs" />

132
src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/MockProcessRunner.cs

@ -1,132 +0,0 @@ @@ -1,132 +0,0 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using System;
using System.IO;
using ICSharpCode.PythonBinding;
using ICSharpCode.SharpDevelop.Util;
namespace PythonBinding.Tests.Utils
{
/// <summary>
/// Dummy IProcessRunner class.
/// </summary>
public class MockProcessRunner : IProcessRunner
{
string commandLine = String.Empty;
string outputText;
bool killCalled;
/// <summary>
/// Triggered when a line of text is read from the standard output.
/// </summary>
public event LineReceivedEventHandler OutputLineReceived;
/// <summary>
/// Triggered when the process has exited.
/// </summary>
public event EventHandler ProcessExited;
public MockProcessRunner()
{
}
/// <summary>
/// Starts the process.
/// </summary>
/// <param name="command">The process filename.</param>
/// <param name="arguments">The command line arguments to
/// pass to the command.</param>
public void Start(string command, string arguments)
{
commandLine = String.Concat(command, " ", arguments);
if (outputText != null) {
OnOutputLineReceived();
}
}
/// <summary>
/// Kills the running process.
/// </summary>
public void Kill()
{
killCalled = true;
}
/// <summary>
/// Gets the full command line used with the process runner.
/// </summary>
public string CommandLine {
get {
return commandLine;
}
}
/// <summary>
/// The string will be sent to any OutputLineReceived event
/// handler when the Start method is called.
/// </summary>
public string OutputText {
set {
outputText = value;
}
}
/// <summary>
/// Raises the ProcessExited event.
/// </summary>
public void RaiseExitEvent()
{
OnProcessExited(new EventArgs());
}
/// <summary>
/// Indicates whether the Kill method was called.
/// </summary>
public bool KillCalled {
get {
return killCalled;
}
}
/// <summary>
/// Raises the ProcessExited event.
/// </summary>
void OnProcessExited(EventArgs e)
{
if (ProcessExited != null) {
ProcessExited(this, e);
}
}
/// <summary>
/// Raises the OutputLineReceived event.
/// </summary>
void OnOutputLineReceived(LineReceivedEventArgs e)
{
if (OutputLineReceived != null) {
OutputLineReceived(this, e);
}
}
/// <summary>
/// Raises an event for each line in the output text.
/// </summary>
void OnOutputLineReceived()
{
using (StringReader reader = new StringReader(outputText)) {
string line;
do {
line = reader.ReadLine();
if (line != null) {
OnOutputLineReceived(new LineReceivedEventArgs(line));
}
} while (line != null);
}
}
}
}

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.Modules.dll

Binary file not shown.

1119
src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.Modules.xml

File diff suppressed because it is too large Load Diff

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.dll

Binary file not shown.

6790
src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.xml

File diff suppressed because it is too large Load Diff

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Dynamic.dll

Binary file not shown.

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Core.dll

Binary file not shown.

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Debugging.dll

Binary file not shown.

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.ExtensionAttribute.dll

Binary file not shown.

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.dll

Binary file not shown.

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/ipy.exe

Binary file not shown.

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/ipy64.exe

Binary file not shown.

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw.exe

Binary file not shown.

BIN
src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw64.exe

Binary file not shown.

5
src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Internal/ManagedCallback.cs

@ -275,7 +275,10 @@ namespace Debugger @@ -275,7 +275,10 @@ namespace Debugger
"Project -> Project Options -> Compiling -> Target CPU = 32-bit Intel";
}
System.Windows.Forms.MessageBox.Show(errorText);
if (Environment.UserInteractive)
System.Windows.Forms.MessageBox.Show(errorText);
else
throw new DebuggerException(errorText);
try {
pauseOnNextExit = true;

2
src/AddIns/Misc/Debugger/Debugger.Tests/Project/Debugger.Tests.csproj

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<NoStdLib>False</NoStdLib>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugType>Full</DebugType>

4
src/AddIns/Misc/Debugger/Debugger.Tests/Project/Src/DebuggerTestsBase.cs

@ -346,7 +346,7 @@ namespace Debugger.Tests @@ -346,7 +346,7 @@ namespace Debugger.Tests
string path = Path.GetTempPath();
path = Path.Combine(path, "SharpDevelop");
path = Path.Combine(path, "DebuggerTests");
path = Path.Combine(path, "DebuggerTestsX86");
path = Path.Combine(path, testName + "." + md5);
Directory.CreateDirectory(path);
@ -368,7 +368,7 @@ namespace Debugger.Tests @@ -368,7 +368,7 @@ namespace Debugger.Tests
compParams.IncludeDebugInformation = true;
compParams.ReferencedAssemblies.Add("System.dll");
compParams.OutputAssembly = exeFilename;
compParams.CompilerOptions = "/unsafe /target:winexe";
compParams.CompilerOptions = "/unsafe /platform:x86 /target:winexe";
compParams.ReferencedAssemblies.Add(typeof(TestFixtureAttribute).Assembly.Location);
CSharpCodeProvider compiler = new CSharpCodeProvider();

14
src/AddIns/Misc/UnitTesting/Src/TestClass.cs

@ -323,16 +323,18 @@ namespace ICSharpCode.UnitTesting @@ -323,16 +323,18 @@ namespace ICSharpCode.UnitTesting
}
// Add base class test methods.
if (c.BaseClass != null) {
IClass declaringType = c;
while (c.BaseClass != null) {
foreach (IMethod method in c.BaseClass.Methods) {
if (TestMethod.IsTestMethod(method)) {
BaseTestMethod baseTestMethod = new BaseTestMethod(c, method);
BaseTestMethod baseTestMethod = new BaseTestMethod(declaringType, method);
TestMethod testMethod = new TestMethod(c.BaseClass.Name, baseTestMethod);
if (!testMethods.Contains(testMethod.Name)) {
testMethods.Add(testMethod);
}
}
}
c = c.BaseClass;
}
return testMethods;
}
@ -381,10 +383,14 @@ namespace ICSharpCode.UnitTesting @@ -381,10 +383,14 @@ namespace ICSharpCode.UnitTesting
TestMethod GetPrefixedTestMethod(string testResultName)
{
IClass baseClass = c.BaseClass;
if (baseClass != null) {
while (baseClass != null) {
string methodName = TestMethod.GetMethodName(testResultName);
string actualMethodName = String.Concat(baseClass.Name, ".", methodName);
return GetTestMethod(actualMethodName);
TestMethod method = GetTestMethod(actualMethodName);
if (method != null) {
return method;
}
baseClass = baseClass.BaseClass;
}
return null;
}

104
src/AddIns/Misc/UnitTesting/Test/Project/TwoBaseClassesWithTestMethodsTestFixture.cs

@ -0,0 +1,104 @@ @@ -0,0 +1,104 @@
// <file>
// <copyright see="prj:///doc/copyright.txt"/>
// <license see="prj:///doc/license.txt"/>
// <owner name="Matthew Ward" email="mrward@users.sourceforge.net"/>
// <version>$Revision$</version>
// </file>
using ICSharpCode.SharpDevelop.Dom;
using ICSharpCode.SharpDevelop.Project;
using ICSharpCode.UnitTesting;
using NUnit.Framework;
using System;
using UnitTesting.Tests.Utils;
namespace UnitTesting.Tests.Project
{
/// <summary>
/// Tests that the test methods of a second parent base class are detected:
///
/// class BaseBaseTestFixture { [Test] public void BaseBaseTest() ... }
/// class BaseTestFixture : BaseBaseTestFixture ...
/// class TestFixture : BaseTestFixture
/// </summary>
[TestFixture]
public class TwoBaseClassesWithTestMethodsTestFixture
{
TestClass testClass;
MockClass c;
[SetUp]
public void SetUp()
{
MockProjectContent projectContent = new MockProjectContent();
projectContent.Language = LanguageProperties.None;
// Create the top base test class.
MockClass baseBaseClass = new MockClass("ICSharpCode.SharpDevelop.Tests.BaseBaseTestFixture");
baseBaseClass.ProjectContent = projectContent;
MockMethod baseMethod = new MockMethod("BaseBaseTest");
baseMethod.Attributes.Add(new MockAttribute("Test"));
baseMethod.DeclaringType = baseBaseClass;
baseBaseClass.Methods.Add(baseMethod);
// Create the next level test class.
MockClass baseClass = new MockClass("ICSharpCode.SharpDevelop.Tests.BaseTestFixture");
baseClass.ProjectContent = projectContent;
baseMethod = new MockMethod("BaseTest");
baseMethod.Attributes.Add(new MockAttribute("Test"));
baseMethod.DeclaringType = baseClass;
baseClass.Methods.Add(baseMethod);
// Create the derived test class.
c = new MockClass("ICSharpCode.SharpDevelop.Tests.MainTestFixture");
c.Attributes.Add(new MockAttribute("TestFixture"));
c.ProjectContent = projectContent;
projectContent.Classes.Add(c);
// Set the base class for each class in the hierarchy.
c.BaseClass = baseClass;
baseClass.BaseClass = baseBaseClass;
// Create TestClass.
testClass = new TestClass(c);
}
[Test]
public void BaseBaseTestMethodExists()
{
Assert.IsTrue(testClass.TestMethods.Contains("BaseBaseTestFixture.BaseBaseTest"));
}
[Test]
public void BaseMethodExists()
{
Assert.IsTrue(testClass.TestMethods.Contains("BaseTestFixture.BaseTest"));
}
/// <summary>
/// The TestMethod.Method property should return an IMethod
/// that returns the derived class from the DeclaringType property
/// and not the base class. This ensures that the correct
/// test is run when selected in the unit test tree.
/// </summary>
[Test]
public void BaseBaseMethodDeclaringTypeIsDerivedClass()
{
TestMethod method = testClass.TestMethods["BaseBaseTestFixture.BaseBaseTest"];
Assert.AreEqual(c, method.Method.DeclaringType);
}
[Test]
public void UpdateTestResult()
{
TestClassCollection testClasses = new TestClassCollection();
testClasses.Add(testClass);
TestResult testResult = new TestResult("ICSharpCode.SharpDevelop.Tests.MainTestFixture.BaseBaseTest");
testResult.IsFailure = true;
testClasses.UpdateTestResult(testResult);
Assert.AreEqual(TestResultType.Failure, testClass.Result);
}
}
}

1
src/AddIns/Misc/UnitTesting/Test/UnitTesting.Tests.csproj

@ -70,6 +70,7 @@ @@ -70,6 +70,7 @@
<Compile Include="Project\InnerClassTestFixtureAttributeRemovedTestFixture.cs" />
<Compile Include="Project\InnerClassTestFixtureBase.cs" />
<Compile Include="Project\RemovedClassesTestFixture.cs" />
<Compile Include="Project\TwoBaseClassesWithTestMethodsTestFixture.cs" />
<Compile Include="TestableConditionTests.cs" />
<Compile Include="Tree\MultipleTestProjectsTestFixture.cs" />
<Compile Include="Tree\TreeNodeContextMenuTestFixture.cs" />

14
src/Automated.proj

@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\Tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
<ArtefactPrefix>SharpDevelop_4.0.0.</ArtefactPrefix>
<NUnitToolPath>$(MSBuildProjectDirectory)\Tools\NUnit</NUnitToolPath>
<NUnitTempToolPath>$(SharpDevelopBin)\Tools\x86NUnit</NUnitTempToolPath>
<ProfilerSrc>$(SharpDevelopSrc)\AddIns\Misc\Profiler</ProfilerSrc>
<!-- we cannot use <MSBuild> to build a solution because -->
@ -84,11 +85,22 @@ @@ -84,11 +85,22 @@
<Output TaskParameter="Include" ItemName="UnitTestAssemblies"/>
</CreateItem>
<!-- HACK: we cannot make the NUnit task run the x86 version; so instead we make a copy
of NUnit and rename nunit-console-x86 to nunit-console
-->
<CreateItem Include="$(NUnitToolPath)\lib\*.dll">
<Output TaskParameter="Include" ItemName="NUnitLibFiles"/>
</CreateItem>
<Copy SourceFiles="@(NUnitLibFiles)" DestinationFolder="$(NUnitTempToolPath)\lib"/>
<Copy SourceFiles="$(NUnitToolPath)\nunit.framework.dll" DestinationFolder="$(NUnitTempToolPath)"/>
<Copy SourceFiles="$(NUnitToolPath)\nunit-console-x86.exe" DestinationFiles="$(NUnitTempToolPath)\nunit-console.exe"/>
<Copy SourceFiles="$(NUnitToolPath)\nunit-console-x86.exe.config" DestinationFiles="$(NUnitTempToolPath)\nunit-console.exe.config"/>
<!-- the %() portion is important; otherwise a single NUnit-console process is used for all tests -->
<NUnit Assemblies="@(UnitTestAssemblies)"
OutputXmlFile="$(TestReportsDir)\%(UnitTestAssemblies.FileName).xml"
WorkingDirectory="$(SharpDevelopBin)\UnitTests"
ToolPath="$(NUnitToolPath)"/>
ToolPath="$(NUnitTempToolPath)"/>
</Target>
<!-- Yes, apparently we really need two identical clean tasks. MSBuild won't run the same task twice. -->

12
src/Setup/Files.wxs

@ -1237,6 +1237,18 @@ @@ -1237,6 +1237,18 @@
<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\Lib\__future__.py" Name="__future__.py" Id="__future__.py" KeyPath="yes" />
</Component>
</Directory>
<Component Guid="694B49D9-3EDA-4B3E-AE21-C4462A99ED0D" Id="IronPythonModulesXml" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\IronPython.Modules.xml" Name="IronPython.Modules.xml" Id="IronPython.Modules.xml" KeyPath="yes" />
</Component>
<Component Guid="0234CFCB-0064-4D59-B39F-0C33735C9B5B" Id="IronPythonXml" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\IronPython.xml" Name="IronPython.xml" Id="IronPython.xml" KeyPath="yes" />
</Component>
<Component Guid="6E1D93BF-A105-4526-8BA0-13B69EEB1360" Id="MicrosoftDynamicDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\Microsoft.Dynamic.dll" Name="Microsoft.Dynamic.dll" Id="Microsoft.Dynamic.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Dynamic.dll" AssemblyManifest="Microsoft.Dynamic.dll" />
</Component>
<Component Guid="8A1A4691-E6BD-451F-AA5D-BE9C716D56A0" Id="MicrosoftScriptingDebuggingDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\BackendBindings\PythonBinding\Microsoft.Scripting.Debugging.dll" Name="Microsoft.Scripting.Debugging.dll" Id="Microsoft.Scripting.Debugging.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="Microsoft.Scripting.Debugging.dll" AssemblyManifest="Microsoft.Scripting.Debugging.dll" />
</Component>
</Directory>
<!--<Directory Id="FSharpBinding" Name="FSharpBinding">
<Component Guid="6B4F28AF-133C-4FEB-98DB-67A5405AEB12" Id="FSharpBindingAddin" DiskId="1">

7
src/Setup/Setup.wxs

@ -390,7 +390,8 @@ @@ -390,7 +390,8 @@
<ComponentRef Id="PartCoverExe"/>
<ComponentRef Id="PartCoverExeConfig"/>
<ComponentRef Id="PartCoverFrameworkDll"/>
<ComponentRef Id="PartCoverToNCoverXslt"/>
<ComponentRef Id="PartCoverToNCoverXslt"/>
<ComponentRef Id="PythonConsoleProjectTemplate"/>
<ComponentRef Id="PythonEmptyClassTemplate"/>
<ComponentRef Id="PythonEmptyFormTemplate"/>
@ -400,9 +401,13 @@ @@ -400,9 +401,13 @@
<ComponentRef Id="PythonLibraryProjectTemplate"/>
<ComponentRef Id="IpyExe"/>
<ComponentRef Id="IronPythonModulesDll"/>
<ComponentRef Id="IronPythonModulesXml"/>
<ComponentRef Id="IronPythonDll"/>
<ComponentRef Id="IronPythonXml"/>
<ComponentRef Id="MicrosoftDynamicDll"/>
<ComponentRef Id="MicrosoftScriptingDll"/>
<ComponentRef Id="MicrosoftScriptingCoreDll"/>
<ComponentRef Id="MicrosoftScriptingDebuggingDll"/>
<ComponentRef Id="MicrosoftScriptingExtensionAttributeDll"/>
<ComponentRef Id="PythonBuildTasksDll"/>
<ComponentRef Id="PythonBindingAddin"/>

3
src/Tools/UpdateSetupInfo/UpdateSetupInfo.csproj

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>4194304</BaseAddress>
<PlatformTarget>AnyCPU</PlatformTarget>
<PlatformTarget>x86</PlatformTarget>
<FileAlignment>4096</FileAlignment>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
@ -28,7 +28,6 @@ @@ -28,7 +28,6 @@
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
<IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
<Optimize>True</Optimize>
<DefineConstants>TRACE</DefineConstants>

Loading…
Cancel
Save