Author: peterw
Date: 2005-07-14 23:30:56 -0400 (Thu, 14 Jul 2005)
New Revision: 47323
Removed:
trunk/mbuild/Mono.Build/Mono.Build/IResultTypeLookup.cs
Modified:
trunk/mbuild/ChangeLog
trunk/mbuild/Mono.Build.dll.sources
trunk/mbuild/Mono.Build/ChangeLog
trunk/mbuild/Mono.Build/Mono.Build.Bundling/BundleManager.cs
trunk/mbuild/Mono.Build/Mono.Build/CompositeResult.cs
trunk/mbuild/Mono.Build/Mono.Build/Fingerprint.cs
trunk/mbuild/Mono.Build/Mono.Build/MBBool.cs
trunk/mbuild/Mono.Build/Mono.Build/MBDictionary.cs
trunk/mbuild/Mono.Build/Mono.Build/MBDirectory.cs
trunk/mbuild/Mono.Build/Mono.Build/MBFile.cs
trunk/mbuild/Mono.Build/Mono.Build/MBString.cs
trunk/mbuild/Mono.Build/Mono.Build/Result.cs
trunk/mbuild/mbuild/ChangeLog
trunk/mbuild/mbuild/mbuild.cs
trunk/mbuild/scripts/Buildfile
trunk/mbuild/scripts/ChangeLog
Log:
2005-07-14 Peter Williams <[EMAIL PROTECTED]>
* Mono.Build.dll.sources: Get rid of IResultTypeLookup.cs, which I only
needed because I didn't know that loading an assembly into the current
appdomain imported its types.
2005-07-14 Peter Williams <[EMAIL PROTECTED]>
* Buildfile (mb-import): Comment out mb-import since that's
unfinished at the moment.
2005-07-14 Peter Williams <[EMAIL PROTECTED]>
* Mono.Build/Result.cs: Get rid of the IResultTypeLookup argument
since I figured out how to be able to load these based on
fully-qualified type names: gotta load them into the
AppDomain. Mmm.
* Mono.Build/MBString.cs: No more IResultTypeLookup.
* Mono.Build/CompositeResult.cs: Same.
* Mono.Build/Fingerprint.cs: Same.
* Mono.Build/MBBool.cs: Same.
* Mono.Build/MBDictionary.cs: Same.
* Mono.Build/MBDirectory.cs: Same.
* Mono.Build/MBFile.cs: Same.
* Mono.Build.Bundling/BundleManager.cs: Don't implement the now-useless
IResultTypeLookup.
2005-07-14 Peter Williams <[EMAIL PROTECTED]>
* mbuild.cs (ImportXml): Don't need to pass the IResultTypeLookup
anymore.
Modified: trunk/mbuild/ChangeLog
===================================================================
--- trunk/mbuild/ChangeLog 2005-07-15 03:10:04 UTC (rev 47322)
+++ trunk/mbuild/ChangeLog 2005-07-15 03:30:56 UTC (rev 47323)
@@ -1,3 +1,9 @@
+2005-07-14 Peter Williams <[EMAIL PROTECTED]>
+
+ * Mono.Build.dll.sources: Get rid of IResultTypeLookup.cs, which I only
+ needed because I didn't know that loading an assembly into the current
+ appdomain imported its types.
+
2005-03-05 Peter Williams <[EMAIL PROTECTED]>
* Update a whole bunch of stuff: introduce CompositeResults, make it
Modified: trunk/mbuild/Mono.Build/ChangeLog
===================================================================
--- trunk/mbuild/Mono.Build/ChangeLog 2005-07-15 03:10:04 UTC (rev 47322)
+++ trunk/mbuild/Mono.Build/ChangeLog 2005-07-15 03:30:56 UTC (rev 47323)
@@ -1,3 +1,27 @@
+2005-07-14 Peter Williams <[EMAIL PROTECTED]>
+
+ * Mono.Build/Result.cs: Get rid of the IResultTypeLookup argument
+ since I figured out how to be able to load these based on
+ fully-qualified type names: gotta load them into the
+ AppDomain. Mmm.
+
+ * Mono.Build/MBString.cs: No more IResultTypeLookup.
+
+ * Mono.Build/CompositeResult.cs: Same.
+
+ * Mono.Build/Fingerprint.cs: Same.
+
+ * Mono.Build/MBBool.cs: Same.
+
+ * Mono.Build/MBDictionary.cs: Same.
+
+ * Mono.Build/MBDirectory.cs: Same.
+
+ * Mono.Build/MBFile.cs: Same.
+
+ * Mono.Build.Bundling/BundleManager.cs: Don't implement the now-useless
+ IResultTypeLookup.
+
2005-05-19 Peter Williams <[EMAIL PROTECTED]>
* Mono.Build/CompositeResult.cs (FindCompatible): Move the former
Modified: trunk/mbuild/Mono.Build/Mono.Build/CompositeResult.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/CompositeResult.cs 2005-07-15
03:10:04 UTC (rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/CompositeResult.cs 2005-07-15
03:30:56 UTC (rev 47323)
@@ -205,7 +205,7 @@
}
}
- protected override bool ImportXml (XmlReader xr,
IResultTypeLookup irtl, IWarningLogger log) {
+ protected override bool ImportXml (XmlReader xr, IWarningLogger
log) {
// We try very hard to load composites because they are
liable to
// change between versions, and we don't want to trash
people's
// configurations.
@@ -280,7 +280,7 @@
}
string ignore;
- Result r = Result.ImportXml (xr, out ignore,
irtl, log);
+ Result r = Result.ImportXml (xr, out ignore,
log);
if (r == null) {
log.Warning (3019, "Couldn't load
result for field '" + name + "'; still trying to load. Result may need to be
uncached", null);
continue;
Modified: trunk/mbuild/Mono.Build/Mono.Build/Fingerprint.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/Fingerprint.cs 2005-07-15 03:10:04 UTC
(rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/Fingerprint.cs 2005-07-15 03:30:56 UTC
(rev 47323)
@@ -135,7 +135,7 @@
throw new InvalidOperationException ();
}
- protected override bool ImportXml (XmlReader xr,
IResultTypeLookup irtl, IWarningLogger log) {
+ protected override bool ImportXml (XmlReader xr, IWarningLogger
log) {
throw new InvalidOperationException ();
}
Deleted: trunk/mbuild/Mono.Build/Mono.Build/IResultTypeLookup.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/IResultTypeLookup.cs 2005-07-15
03:10:04 UTC (rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/IResultTypeLookup.cs 2005-07-15
03:30:56 UTC (rev 47323)
@@ -1,13 +0,0 @@
-using System;
-
-namespace Mono.Build {
-
- public interface IResultTypeLookup {
-
- // Return true on error, false on success. If no match is found,
- // return false but set t to null.
-
- bool LookupType (string name, IWarningLogger logger, out Type
t);
-
- }
-}
Modified: trunk/mbuild/Mono.Build/Mono.Build/MBBool.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/MBBool.cs 2005-07-15 03:10:04 UTC
(rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/MBBool.cs 2005-07-15 03:30:56 UTC
(rev 47323)
@@ -50,7 +50,7 @@
xw.WriteString ("false");
}
- protected override bool ImportXml (XmlReader xr,
IResultTypeLookup irtl, IWarningLogger log) {
+ protected override bool ImportXml (XmlReader xr, IWarningLogger
log) {
string s = xr.ReadString ();
switch (s) {
Modified: trunk/mbuild/Mono.Build/Mono.Build/MBDictionary.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/MBDictionary.cs 2005-07-15 03:10:04 UTC
(rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/MBDictionary.cs 2005-07-15 03:30:56 UTC
(rev 47323)
@@ -126,7 +126,7 @@
}
}
- protected override bool ImportXml (XmlReader xr,
IResultTypeLookup irtl, IWarningLogger log) {
+ protected override bool ImportXml (XmlReader xr, IWarningLogger
log) {
int d = xr.Depth;
while (!xr.EOF && xr.Depth >= d) {
@@ -143,7 +143,7 @@
}
string id;
- Result r = Result.ImportXml (xr, out id, irtl,
log);
+ Result r = Result.ImportXml (xr, out id, log);
if (r == null)
return true;
Modified: trunk/mbuild/Mono.Build/Mono.Build/MBDirectory.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/MBDirectory.cs 2005-07-15 03:10:04 UTC
(rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/MBDirectory.cs 2005-07-15 03:30:56 UTC
(rev 47323)
@@ -131,7 +131,7 @@
}
}
- protected override bool ImportXml (XmlReader xr,
IResultTypeLookup irtl, IWarningLogger log) {
+ protected override bool ImportXml (XmlReader xr, IWarningLogger
log) {
while (xr.NodeType == XmlNodeType.Whitespace) {
if (!xr.Read ()) {
log.Warning (3019, "Empty node for
directory result", null);
Modified: trunk/mbuild/Mono.Build/Mono.Build/MBFile.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/MBFile.cs 2005-07-15 03:10:04 UTC
(rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/MBFile.cs 2005-07-15 03:30:56 UTC
(rev 47323)
@@ -173,7 +173,7 @@
xw.WriteEndElement ();
}
- protected override bool ImportXml (XmlReader xr,
IResultTypeLookup irtl, IWarningLogger log) {
+ protected override bool ImportXml (XmlReader xr, IWarningLogger
log) {
bool gotdir = false;
bool gotname = false;
int depth = xr.Depth;
@@ -189,7 +189,7 @@
case "result":
string ignore;
- Result r = Result.ImportXml (xr, out
ignore, irtl, log);
+ Result r = Result.ImportXml (xr, out
ignore, log);
if (r == null)
return true;
if (!(r is MBDirectory)) {
Modified: trunk/mbuild/Mono.Build/Mono.Build/MBString.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/MBString.cs 2005-07-15 03:10:04 UTC
(rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/MBString.cs 2005-07-15 03:30:56 UTC
(rev 47323)
@@ -40,7 +40,7 @@
xw.WriteString (value);
}
- protected override bool ImportXml (XmlReader xr,
IResultTypeLookup irtl, IWarningLogger log) {
+ protected override bool ImportXml (XmlReader xr, IWarningLogger
log) {
value = xr.ReadString ();
return false;
}
Modified: trunk/mbuild/Mono.Build/Mono.Build/Result.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build/Result.cs 2005-07-15 03:10:04 UTC
(rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build/Result.cs 2005-07-15 03:30:56 UTC
(rev 47323)
@@ -86,7 +86,7 @@
xw.WriteEndElement ();
}
- public static Result ImportXml (XmlReader xr, out string id,
IResultTypeLookup irtl, IWarningLogger log) {
+ public static Result ImportXml (XmlReader xr, out string id,
IWarningLogger log) {
id = null;
if (xr.Name != "result") {
@@ -128,7 +128,7 @@
t = System.Type.GetType (type, false);
- if (t == null && irtl.LookupType (type, log,
out t)) {
+ if (t == null) {
log.Warning (3019, "Unknown result type
during XML import", type);
log.PopLocation ();
return null;
@@ -141,7 +141,7 @@
}
r = (Result) System.Activator.CreateInstance
(t);
- if (r.ImportXml (xr, irtl, log)) {
+ if (r.ImportXml (xr, log)) {
log.PopLocation ();
// error will be reported
return null;
@@ -161,6 +161,6 @@
protected abstract void ExportXml (XmlWriter xw);
- protected abstract bool ImportXml (XmlReader xr,
IResultTypeLookup irtl, IWarningLogger log);
+ protected abstract bool ImportXml (XmlReader xr, IWarningLogger
log);
}
}
Modified: trunk/mbuild/Mono.Build/Mono.Build.Bundling/BundleManager.cs
===================================================================
--- trunk/mbuild/Mono.Build/Mono.Build.Bundling/BundleManager.cs
2005-07-15 03:10:04 UTC (rev 47322)
+++ trunk/mbuild/Mono.Build/Mono.Build.Bundling/BundleManager.cs
2005-07-15 03:30:56 UTC (rev 47323)
@@ -14,7 +14,7 @@
public delegate bool PublicProviderAdded (string basis,
IBuildProvider prov);
- public class BundleManager : IResultTypeLookup {
+ public class BundleManager {
public const string MBuildPrefix = "MBuildDynamic.";
@@ -83,7 +83,7 @@
return false;
try {
- assy = Assembly.Load (aname);
+ assy = System.AppDomain.CurrentDomain.Load
(aname);
} catch (Exception e) {
logger.Error (2020, "Could not load the
referenced assembly " + aname.ToString (),
e.ToString ());
@@ -97,7 +97,7 @@
Assembly assy;
try {
- assy = Assembly.LoadFrom (path);
+ assy = System.AppDomain.CurrentDomain.Load
(path);
Console.WriteLine ("loadfrom: {0} -> {1}",
path, assy);
} catch (Exception e) {
logger.Error (2020, "Could not load the
referenced assembly " + path,
@@ -296,8 +296,8 @@
if (name == null)
throw new ArgumentNullException ();
- if (!name.StartsWith (MBuildPrefix))
- name = MBuildPrefix + name;
+ //if (!name.StartsWith (MBuildPrefix))
+ name = MBuildPrefix + name;
t = null;
Assembly where = null;
Modified: trunk/mbuild/Mono.Build.dll.sources
===================================================================
--- trunk/mbuild/Mono.Build.dll.sources 2005-07-15 03:10:04 UTC (rev 47322)
+++ trunk/mbuild/Mono.Build.dll.sources 2005-07-15 03:30:56 UTC (rev 47323)
@@ -18,7 +18,6 @@
Mono.Build/Mono.Build/IBuildProvider.cs
Mono.Build/Mono.Build/IFingerprintable.cs
Mono.Build/Mono.Build/IResultInstaller.cs
-Mono.Build/Mono.Build/IResultTypeLookup.cs
Mono.Build/Mono.Build/ITaggable.cs
Mono.Build/Mono.Build/ITagged.cs
Mono.Build/Mono.Build/ITagger.cs
Modified: trunk/mbuild/mbuild/ChangeLog
===================================================================
--- trunk/mbuild/mbuild/ChangeLog 2005-07-15 03:10:04 UTC (rev 47322)
+++ trunk/mbuild/mbuild/ChangeLog 2005-07-15 03:30:56 UTC (rev 47323)
@@ -1,3 +1,7 @@
+2005-07-14 Peter Williams <[EMAIL PROTECTED]>
+
+ * mbuild.cs (ImportXml): Don't need to pass the IResultTypeLookup
anymore.
+
2005-05-19 Peter Williams <[EMAIL PROTECTED]>
* mbuild.cs: (DescribeInstall): Track changes to compat finder.
Modified: trunk/mbuild/mbuild/mbuild.cs
===================================================================
--- trunk/mbuild/mbuild/mbuild.cs 2005-07-15 03:10:04 UTC (rev 47322)
+++ trunk/mbuild/mbuild/mbuild.cs 2005-07-15 03:30:56 UTC (rev 47323)
@@ -580,7 +580,7 @@
}
string id;
- Result r = Result.ImportXml (import_reader, out id,
pm.Project.BundleManager, log);
+ Result r = Result.ImportXml (import_reader, out id,
log);
if (r == null)
continue;
Modified: trunk/mbuild/scripts/Buildfile
===================================================================
--- trunk/mbuild/scripts/Buildfile 2005-07-15 03:10:04 UTC (rev 47322)
+++ trunk/mbuild/scripts/Buildfile 2005-07-15 03:30:56 UTC (rev 47323)
@@ -30,8 +30,8 @@
default = true
]
-mb-import = TextSource [] with [
- install = /config/install/bindir_installer
- default = true
-]
+# mb-import = Subst [ mb-import.in map ] with [
+# install = /config/install/bindir_installer
+# default = true
+# ]
Modified: trunk/mbuild/scripts/ChangeLog
===================================================================
--- trunk/mbuild/scripts/ChangeLog 2005-07-15 03:10:04 UTC (rev 47322)
+++ trunk/mbuild/scripts/ChangeLog 2005-07-15 03:30:56 UTC (rev 47323)
@@ -1,3 +1,8 @@
+2005-07-14 Peter Williams <[EMAIL PROTECTED]>
+
+ * Buildfile (mb-import): Comment out mb-import since that's
+ unfinished at the moment.
+
2004-08-30 Peter Williams <[EMAIL PROTECTED]>
* mb-bundledoc: Oops, create this.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
