Author: ankit
Date: 2007-05-31 17:16:50 -0400 (Thu, 31 May 2007)
New Revision: 78380
Modified:
trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpResourceIdBuilder.cs
trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
Log:
* MSBuildFileFormat.cs (ReadItemGroups): Don't ignore resources external
to the project directory. These now get handled by the *ResourceIdBuilder.
* CSharpResourceIdBuilder.cs: If the file is external to the project,
then use only the filename.
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpResourceIdBuilder.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpResourceIdBuilder.cs
2007-05-31 20:13:26 UTC (rev 78379)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/CSharpResourceIdBuilder.cs
2007-05-31 21:16:50 UTC (rev 78380)
@@ -39,8 +39,10 @@
{
if (String.IsNullOrEmpty (pf.DependsOn)) {
string fname = pf.RelativePath;
- if (fname.StartsWith ("./"))
- fname = fname.Substring (2);
+ if (pf.IsExternalToProject)
+ fname = Path.GetFileName (fname);
+ else
+ fname =
MSBuildFileFormat.NormalizeRelativePath (fname);
if (String.Compare (Path.GetExtension (fname),
".resx", true) == 0)
fname = Path.ChangeExtension (fname,
".resources");
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog 2007-05-31
20:13:26 UTC (rev 78379)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/ChangeLog 2007-05-31
21:16:50 UTC (rev 78380)
@@ -1,5 +1,12 @@
2007-06-01 Ankit Jain <[EMAIL PROTECTED]>
+ * MSBuildFileFormat.cs (ReadItemGroups): Don't ignore resources external
+ to the project directory. These now get handled by the
*ResourceIdBuilder.
+ * CSharpResourceIdBuilder.cs: If the file is external to the project,
+ then use only the filename.
+
+2007-06-01 Ankit Jain <[EMAIL PROTECTED]>
+
* MSBuildFileFormat.cs (ReadItemGroups): If reference name cannot be
resolved, then try to find the correct case for the assembly name.
(AssemblyNamesTable): New.
Modified: trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
===================================================================
--- trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-05-31 20:13:26 UTC (rev 78379)
+++ trunk/monodevelop/Extras/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-05-31 21:16:50 UTC (rev 78380)
@@ -937,12 +937,15 @@
if (path == null)
continue;
- if (!path.StartsWith
(project.BaseDirectory)) {
+ /* IResourceBuilder, in this
case will use just the
+ * filename to build the
resource id. Ignoring <Link> here
+ *
+ * if (!path.StartsWith
(project.BaseDirectory)) {
monitor.ReportWarning
(GettextCatalog.GetString (
"The specified
path '{0}' for the EmbeddedResource is outside the project directory.
Ignoring.", include));
Console.WriteLine ("The
specified path '{0}' for the EmbeddedResource is outside the project directory.
Ignoring.", include);
continue;
- }
+ }*/
pf = project.AddFile (path,
BuildAction.EmbedAsResource);
if (ReadAsString (node,
"LogicalName", ref str_tmp, false))
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
