Author: ankit
Date: 2007-12-07 06:15:15 -0500 (Fri, 07 Dec 2007)
New Revision: 90903
Modified:
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/ChangeLog
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/DefaultMSBuildProjectExtension.cs
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/MSBuildFileFormat.cs
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/Makefile.am
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp
Log:
Fix bug #341643.
* DefaultMSBuildProjectExtension.cs: Set DeployProperties.UseProjectRelativePath
for all deploy files.
* MSBuildFileFormat.cs (HandleFilePropertyChanged): Set "CopyToOutputDirectory"
if build action changed to FileCopy.
* Makefile.am:
* prj2make-sharp-lib.mdp: Add reference to MonoDevelop.Deployment project.
Modified: trunk/monodevelop/main/src/addins/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/prj2make-sharp-lib/ChangeLog
2007-12-07 11:14:41 UTC (rev 90902)
+++ trunk/monodevelop/main/src/addins/prj2make-sharp-lib/ChangeLog
2007-12-07 11:15:15 UTC (rev 90903)
@@ -1,3 +1,13 @@
+2007-12-07 Ankit Jain <[EMAIL PROTECTED]>
+
+ Fix bug #341643.
+ * DefaultMSBuildProjectExtension.cs: Set
DeployProperties.UseProjectRelativePath
+ for all deploy files.
+ * MSBuildFileFormat.cs (HandleFilePropertyChanged): Set
"CopyToOutputDirectory"
+ if build action changed to FileCopy.
+ * Makefile.am:
+ * prj2make-sharp-lib.mdp: Add reference to MonoDevelop.Deployment
project.
+
2007-12-04 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* prj2make-sharp-lib.addin.xml, Makefile.am, prj2make-sharp-lib.mdp:
Modified:
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/DefaultMSBuildProjectExtension.cs
===================================================================
---
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/DefaultMSBuildProjectExtension.cs
2007-12-07 11:14:41 UTC (rev 90902)
+++
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/DefaultMSBuildProjectExtension.cs
2007-12-07 11:15:15 UTC (rev 90903)
@@ -27,6 +27,7 @@
//
using MonoDevelop.Core;
+using MonoDevelop.Deployment;
using MonoDevelop.Projects;
using System;
@@ -220,10 +221,13 @@
path = Utils.GetValidPath (monitor, basePath,
include);
if (path == null)
return;
- if (Utils.ReadAsString (node,
"CopyToOutputDirectory", ref str_tmp, false))
+ if (Utils.ReadAsString (node,
"CopyToOutputDirectory", ref str_tmp, false)) {
pf = project.AddFile (path,
BuildAction.FileCopy);
- else
+ DeployProperties dp =
DeployService.GetDeployProperties (pf);
+ dp.UseProjectRelativePath = true;
+ } else {
pf = project.AddFile (path,
BuildAction.Nothing);
+ }
data.ProjectFileElements [pf] = (XmlElement)
node;
break;
case "EmbeddedResource":
@@ -363,6 +367,11 @@
}
}
+ if (projectFile.BuildAction == BuildAction.FileCopy) {
+ DeployProperties dp =
DeployService.GetDeployProperties (projectFile);
+ dp.UseProjectRelativePath = true;
+ }
+
return elem;
}
Modified:
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/MSBuildFileFormat.cs
===================================================================
--- trunk/monodevelop/main/src/addins/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-12-07 11:14:41 UTC (rev 90902)
+++ trunk/monodevelop/main/src/addins/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-12-07 11:15:15 UTC (rev 90903)
@@ -702,6 +702,9 @@
parent.AppendChild (newElem);
d.ProjectFileElements [e.ProjectFile] = newElem;
+
+ if (e.ProjectFile.BuildAction ==
BuildAction.FileCopy)
+ Utils.EnsureChildValue (newElem,
"CopyToOutputDirectory", "Always");
}
//DependentUpon is relative to the basedir of the 'pf'
(resource file)
Modified: trunk/monodevelop/main/src/addins/prj2make-sharp-lib/Makefile.am
===================================================================
--- trunk/monodevelop/main/src/addins/prj2make-sharp-lib/Makefile.am
2007-12-07 11:14:41 UTC (rev 90902)
+++ trunk/monodevelop/main/src/addins/prj2make-sharp-lib/Makefile.am
2007-12-07 11:15:15 UTC (rev 90903)
@@ -7,6 +7,7 @@
$(MONO_ADDINS_LIBS) \
-r:$(top_builddir)/build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll \
-r:$(top_builddir)/build/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll \
+
-r:$(top_builddir)/build/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll
\
-r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Core.Gui.dll \
-r:$(top_builddir)/build/bin/MonoDevelop.Ide.dll \
Modified:
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp
===================================================================
--- trunk/monodevelop/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp
2007-12-07 11:14:41 UTC (rev 90902)
+++ trunk/monodevelop/main/src/addins/prj2make-sharp-lib/prj2make-sharp-lib.mdp
2007-12-07 11:15:15 UTC (rev 90903)
@@ -57,6 +57,7 @@
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Projects" />
<ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.CSharpBinding" />
<ProjectReference type="Gac" localcopy="True" refto="Mono.Addins,
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+ <ProjectReference type="Project" localcopy="False"
refto="MonoDevelop.Deployment" />
</References>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True" IsAutotoolsProject="True"
RelativeConfigureInPath="../../../">
<BuildFilesVar Sync="True" Name="FILES" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
