diff options
Diffstat (limited to 'lang/boo/files')
| -rw-r--r-- | lang/boo/files/patch-aa | 150 | ||||
| -rw-r--r-- | lang/boo/files/patch-default.build | 19 |
2 files changed, 10 insertions, 159 deletions
diff --git a/lang/boo/files/patch-aa b/lang/boo/files/patch-aa deleted file mode 100644 index 1c88ffbdd65f..000000000000 --- a/lang/boo/files/patch-aa +++ /dev/null @@ -1,150 +0,0 @@ -$FreeBSD$ - -This patch was checked-out from the boo SVN repository, r3468. -It prevents build failures if an older lang/boo is already installed, more details at: -http://jira.codehaus.org/browse/BOO-1282 - -Index: src/Boo.Lang.Compiler/Compilation.cs -=================================================================== ---- src/Boo.Lang.Compiler/Compilation.cs (révision 3467) -+++ src/Boo.Lang.Compiler/Compilation.cs (révision 3468) -@@ -87,16 +87,26 @@ - return compiler.Run(unit);
- }
-
-+ public static CompilerContext compile_(CompileUnit unit, params ICompileUnit[] references)
-+ {
-+ return NewCompilerWithReferences(references).Run(unit);
-+ }
-+
- private static BooCompiler NewCompilerWithReferences(IEnumerable<ICompileUnit> references)
- {
-- BooCompiler compiler = NewCompiler();
-+ BooCompiler compiler = NewCompiler(false);
- compiler.Parameters.References.AddAll(references);
- return compiler;
- }
-
- private static BooCompiler NewCompiler()
- {
-- BooCompiler compiler = new BooCompiler();
-+ return NewCompiler(true);
-+ }
-+
-+ private static BooCompiler NewCompiler(bool loadDefaultReferences)
-+ {
-+ BooCompiler compiler = new BooCompiler(new CompilerParameters(loadDefaultReferences));
- compiler.Parameters.OutputType = CompilerOutputType.Auto;
- compiler.Parameters.Pipeline = new Boo.Lang.Compiler.Pipelines.CompileToMemory();
- return compiler;
-@@ -114,10 +124,5 @@ - module.Members.Add(klass);
- return module;
- }
--
-- public static CompilerContext compile_(CompileUnit unit, params ICompileUnit[] references)
-- {
-- return NewCompilerWithReferences(references).Run(unit);
-- }
- }
- }
-Index: src/Boo.Lang.Compiler/Steps/MacroProcessing/MacroCompiler.cs -=================================================================== ---- src/Boo.Lang.Compiler/Steps/MacroProcessing/MacroCompiler.cs (révision 3467) -+++ src/Boo.Lang.Compiler/Steps/MacroProcessing/MacroCompiler.cs (révision 3468) -@@ -121,9 +121,7 @@ - m.Namespace = CleanClone(node.EnclosingModule.Namespace); - m.Name = node.Name; - foreach (Import i in node.EnclosingModule.Imports) -- { - m.Imports.Add(CleanClone(i)); -- } - m.Members.Add(CleanClone(node)); - return m; - } -@@ -139,17 +137,13 @@ - private void ReportErrors(CompilerErrorCollection errors) - { - foreach (CompilerError e in errors) -- { - Errors.Add(e); -- } - } - - private void ReportWarnings(CompilerWarningCollection warnings) - { - foreach (CompilerWarning w in warnings) -- { - Warnings.Add(w); -- } - } - - private static void CacheType(TypeDefinition node, Type type) -Index: tests/BooCompiler.Tests/ExtensionsCompilationTest.cs -=================================================================== ---- tests/BooCompiler.Tests/ExtensionsCompilationTest.cs (révision 0) -+++ tests/BooCompiler.Tests/ExtensionsCompilationTest.cs (révision 3468) -@@ -0,0 +1,33 @@ -+using System.Collections.Generic;
-+using System.IO;
-+using Boo.Lang.Compiler;
-+using Boo.Lang.Compiler.IO;
-+using NUnit.Framework;
-+
-+namespace BooCompiler.Tests
-+{
-+ [TestFixture]
-+ public class ExtensionsCompilationTest
-+ {
-+ [Test]
-+ public void MacroMacroCompilation()
-+ {
-+ var parameters = new CompilerParameters(false);
-+ parameters.References.Add(typeof(IEnumerable<>).Assembly);
-+
-+ parameters.Input.Add(BooLangExtensionsSource("Macros/MacroMacro.boo"));
-+ parameters.Input.Add(BooLangExtensionsSource("Macros/AssertMacro.boo"));
-+
-+ parameters.Pipeline = new Boo.Lang.Compiler.Pipelines.ResolveExpressions();
-+
-+ var compiler = new Boo.Lang.Compiler.BooCompiler(parameters);
-+ var results = compiler.Run();
-+ Assert.AreEqual(0, results.Errors.Count, results.Errors.ToString());
-+ }
-+
-+ private FileInput BooLangExtensionsSource(string file)
-+ {
-+ return new FileInput(Path.Combine(BooTestCaseUtil.BasePath, "src/Boo.Lang.Extensions/" + file));
-+ }
-+ }
-+}
-Index: tests/BooCompiler.Tests/BooTestCaseUtil.cs -=================================================================== ---- tests/BooCompiler.Tests/BooTestCaseUtil.cs (révision 3467) -+++ tests/BooCompiler.Tests/BooTestCaseUtil.cs (révision 3468) -@@ -31,7 +31,6 @@ - using System;
- using System.IO;
- using System.Reflection;
-- using System.Xml;
- using System.Xml.Serialization;
- using Boo.Lang.Compiler.Ast;
- using NUnit.Framework;
-@@ -43,11 +42,15 @@ - {
- public static string TestCasesPath
- {
-+ get { return Path.Combine(BasePath, "tests/testcases"); }
-+ }
-+
-+ public static string BasePath
-+ {
- get
- {
- Uri codebase = new Uri(Assembly.GetExecutingAssembly().CodeBase);
-- Uri path = new Uri(codebase, "../testcases");
-- return path.LocalPath;
-+ return new Uri(codebase, "../..").LocalPath;
- }
- }
-
diff --git a/lang/boo/files/patch-default.build b/lang/boo/files/patch-default.build index f949b55e40a9..71196c0b4fd1 100644 --- a/lang/boo/files/patch-default.build +++ b/lang/boo/files/patch-default.build @@ -1,8 +1,9 @@ + $FreeBSD$ ---- default.build.orig 2009-09-06 14:21:30.000000000 -0700 -+++ default.build 2009-09-06 14:21:40.000000000 -0700 -@@ -21,19 +21,25 @@ +--- default.build.orig ++++ default.build +@@ -23,19 +23,25 @@ <property name="build.dir" value="build" dynamic="True"/>
<property name="distrobuild.dir" value="distrobuild"/>
@@ -29,16 +30,16 @@ $FreeBSD$ <!-- set gendarme.dir in your build.properties to enable Gendarme report after build -->
<property name="gendarme.dir" value=""/>
-@@ -71,7 +77,7 @@ +@@ -90,7 +96,7 @@ <property name="nosign" value="true" overwrite="true" />
</target>
-- <target name="all" depends="booc, booi, booish, boo-pkgconfig, Boo.Lang.CodeDom, Boo.Lang.Useful, boo, Boo.Microsoft.Build.Tasks, update-vs2005-env, Boo.Lang.PatternMatching">
+- <target name="all" depends="booc, booi, booish, boo-pkgconfig, Boo.Lang.CodeDom, Boo.Lang.Useful, boo, Boo.Microsoft.Build.Tasks, update-vs-env, Boo.Lang.PatternMatching">
+ <target name="all" depends="booc, booi, booish, boo-pkgconfig, Boo.Lang.CodeDom, Boo.Lang.Useful, boo, Boo.Microsoft.Build.Tasks, Boo.Lang.PatternMatching">
<call target="gendarme" if="${gendarme.dir != ''}" />
+ <call target="verify-assemblies" />
</target>
-
-@@ -538,7 +544,7 @@ +@@ -571,7 +577,7 @@ <call target="install-linux" if="${not(platform::is-win32())}"/>
</target>
@@ -47,7 +48,7 @@ $FreeBSD$ <!--
Use pkg-config to find the proper locations for several
key files for mime detection, etc
-@@ -602,7 +608,7 @@ +@@ -635,7 +641,7 @@ </copy>
<copy file="extras/boo.lang" todir="${fakeroot.gsv}/share/gtksourceview-1.0/language-specs/" />
@@ -56,7 +57,7 @@ $FreeBSD$ <copy file="extras/boo-mime-info.xml" todir="${fakeroot.sharedmime}/share/mime/packages/" />
<exec program="chmod" commandline="+x ${fakeroot.bindir}/booc" />
-@@ -645,7 +651,28 @@ +@@ -678,7 +684,28 @@ </foreach>
</target>
|