Merge pull request #1 from 2Toad/master

Added RootDirectory option to Zip task  loresoft#58

Author: arlm

Source/MSBuild.Community.Tasks/Zip.cs

@@ -65,6 +65,17 @@ namespace MSBuild.Community.Tasks
     ///         ZipFileName="D:\svn\repo.zip" />
     /// </Target>
     /// ]]></code>
+    /// Create a zip file using a root directory.
+    /// <code><![CDATA[
+    /// <ItemGroup>
+    ///     <RepoFiles Include="D:\svn\repo\**\*.*" />
+    /// </ItemGroup>
+    /// <Target Name="Zip">
+    ///     <Zip Files="@(RepoFiles)" 
+    ///         RootDirectory="Repo" 
+    ///         ZipFileName="D:\svn\repo.zip" />
+    /// </Target>
+    /// ]]></code>
     /// </example>
     public class Zip : Task
     {
@@ -139,11 +150,19 @@ public Zip()
         /// </summary>
         /// <value>The working directory.</value>
         /// <remarks>
-        /// The working directory is the base of the zip file.  
         /// All files will be made relative from the working directory.
         /// </remarks>
         public string WorkingDirectory { get; set; }
 
+        /// <summary>
+        /// Gets or sets the root directory for the archive.
+        /// </summary>
+        /// <value>The root directory.</value>
+        /// <remarks>
+        /// The root directory is the base of the archive.  
+        /// </remarks>
+        public string RootDirectory { get; set; }
+
         /// <summary>
         /// Gets or sets the password.
         /// </summary>
@@ -292,7 +311,7 @@ private bool ZipFiles()
                             // maybe a directory
                             if (Directory.Exists(name))
                             {
-                                var directoryEntry = zip.AddDirectory(name, directoryPathInArchive);
+                                var directoryEntry = zip.AddDirectory(name, GetArchivePath(RootDirectory, directoryPathInArchive));
                                 if (!Quiet)
                                     Log.LogMessage(Resources.ZipAdded, directoryEntry.FileName);
 
@@ -308,7 +327,7 @@ private bool ZipFiles()
                             && Path.GetFileName(directoryPathInArchive) == Path.GetFileName(name))
                             directoryPathInArchive = Path.GetDirectoryName(directoryPathInArchive);
 
-                        var entry = zip.AddFile(name, directoryPathInArchive);
+                        var entry = zip.AddFile(name, GetArchivePath(RootDirectory, directoryPathInArchive));
                         if (!Quiet)
                             Log.LogMessage(Resources.ZipAdded, entry.FileName);
                     }
@@ -326,6 +345,15 @@ private bool ZipFiles()
             return true;
         }
 
+        private static string GetArchivePath(string rootDirectory, string directoryPathInArchive)
+        {
+            return String.IsNullOrEmpty(rootDirectory)
+                ? directoryPathInArchive
+                : String.IsNullOrEmpty(directoryPathInArchive)
+                    ? rootDirectory
+                    : Path.Combine(rootDirectory, directoryPathInArchive);
+        }
+
         private static string GetPath(string originalPath, string rootDirectory)
         {
             var relativePath = new List<string>();