Author: lluis
Date: 2007-04-27 13:34:01 -0400 (Fri, 27 Apr 2007)
New Revision: 76396

Modified:
   trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
   
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
   
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs
Log:
* MonoDevelop.Deployment.Linux/LinuxDeployData.cs: Added package name
  property.
* MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: Rename
  app.desktop files to <package-name>.desktop when deploying.

Modified: 
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/ChangeLog  
2007-04-27 17:32:52 UTC (rev 76395)
+++ trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/ChangeLog  
2007-04-27 17:34:01 UTC (rev 76396)
@@ -1,3 +1,10 @@
+2007-04-27  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.Deployment.Linux/LinuxDeployData.cs: Added package name
+         property.
+       * MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs: Rename
+         app.desktop files to <package-name>.desktop when deploying.
+
 2007-04-26  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * MonoDevelop.Deployment.Linux.addin.xml: Register new project feature

Modified: 
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
===================================================================
--- 
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
    2007-04-27 17:32:52 UTC (rev 76395)
+++ 
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployData.cs
    2007-04-27 17:34:01 UTC (rev 76396)
@@ -13,6 +13,9 @@
                [ItemProperty]
                string scriptName;
                
+               [ItemProperty]
+               string packageName;
+               
                [ItemProperty (DefaultValue=false)]
                bool generateDesktopEntry;
                
@@ -71,6 +74,16 @@
                        connected = true;
                }
                
+               public string PackageName {
+                       get {
+                               if (packageName != null)
+                                       return packageName;
+                               if (scriptName != null)
+                                       return scriptName;
+                               return entry.Name.ToLower ();
+                       }
+               }
+               
                public bool GenerateScript {
                        get { return generateScript; }
                        set {

Modified: 
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs
===================================================================
--- 
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs
       2007-04-27 17:32:52 UTC (rev 76395)
+++ 
trunk/monodevelop/Extras/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux/LinuxDeployExtension.cs
       2007-04-27 17:34:01 UTC (rev 76396)
@@ -13,10 +13,11 @@
                {
                        DeployFileCollection col = base.GetProjectDeployFiles 
(ctx, project);
                        
+                       LinuxDeployData data = 
LinuxDeployData.GetLinuxDeployData (project);
+                       
                        if (ctx.Platform == "Linux") {
                                DotNetProject netProject = project as 
DotNetProject;
                                if (netProject != null) {
-                                       LinuxDeployData data = 
LinuxDeployData.GetLinuxDeployData (netProject);
                                        DotNetProjectConfiguration conf = 
netProject.ActiveConfiguration as DotNetProjectConfiguration;
                                        if (conf != null) {
                                                if (conf.CompileTarget == 
CompileTarget.Exe || conf.CompileTarget == CompileTarget.WinExe) {
@@ -33,6 +34,14 @@
                                }
                        }
                        
+                       // If the project is deploying an app.desktop file, 
rename it to the name of the project.
+                       foreach (DeployFile file in col) {
+                               if (Path.GetFileName (file.RelativeTargetPath) 
== "app.desktop") {
+                                       string dir = Path.GetDirectoryName 
(file.RelativeTargetPath);
+                                       file.RelativeTargetPath = Path.Combine 
(dir, data.PackageName + ".desktop");
+                               }
+                       }
+                       
                        return col;
                }
                

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to