Merge branch 'master' of https://github.com/ccnet/CruiseControl.NET

Author: RubenWillems

project/CCTrayLib/Presentation/AddBuildServer.cs

@@ -62,7 +62,6 @@ public AddBuildServer(ICruiseProjectManagerFactory cruiseProjectManagerFactory)
             LoadExtensions();
 		}
 
-
 		/// <summary>
 		/// Clean up any resources being used.
 		/// </summary>
@@ -369,6 +368,7 @@ private void InitializeComponent()
             this.btnConfigureExtension.TabIndex = 20;
             this.btnConfigureExtension.Text = "Configure Extension";
             this.btnConfigureExtension.UseVisualStyleBackColor = true;
+            this.btnConfigureExtension.Click += new EventHandler(btnConfigureExtension_Click);
             // 
             // cmbExtension
             // 
@@ -381,6 +381,7 @@ private void InitializeComponent()
             this.cmbExtension.Size = new System.Drawing.Size(609, 21);
             this.cmbExtension.Sorted = true;
             this.cmbExtension.TabIndex = 18;
+            this.cmbExtension.SelectedIndexChanged += new EventHandler(cmbExtension_SelectedIndexChanged);
             // 
             // label6
             // 
@@ -582,15 +583,36 @@ private BuildServer ConstructBuildServerFromSelectedOptions()
 			return null;
 		}
 
-
-
         private void LoadExtensions()
         {
             cmbExtension.Items.Clear();
             string extensionsPath = Path.Combine(Environment.CurrentDirectory, "Extensions");
             cmbExtension.Items.AddRange(ExtensionHelpers.QueryAssembliesForTypes(extensionsPath, "ITransportExtension"));
         }
 
+        /// <summary>
+        /// Call configure on the Transport extension, as defined in ITransportExtension
+        /// </summary>
+        void btnConfigureExtension_Click(object sender, EventArgs e)
+        {
+            if (transportExtension != null)
+            {
+                transportExtension.Configure(this);
+            }
+        }
+
+        /// <summary>
+        /// Load the Transport extension, this method will throw if the extension cannot be loaded. 
+        /// </summary>
+        void cmbExtension_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (cmbExtension.SelectedIndex >= 0)
+            {
+                // try loading the transport extension... 
+                transportExtension = ExtensionHelpers.RetrieveExtension(cmbExtension.SelectedItem.ToString());
+            }
+        }
+
         private void panel4_Paint(object sender, PaintEventArgs e)
         {
 

project/core/publishers/PackageFolder.cs

@@ -101,7 +101,18 @@ public string BaseFolder
         public IEnumerable<string> Package(IIntegrationResult result, ZipOutputStream zipStream)
         {
             var filesAdded = new List<string>();
-            var effectiveBaseFolder = (BaseFolder == null) ? result.WorkingDirectory : BaseFolder;
+
+            string effectiveBaseFolder;
+            if (BaseFolder == null)
+            {
+                effectiveBaseFolder = result.WorkingDirectory;
+            }
+            else
+            {
+                // If base is relative, make it relative to working directory and ensure we convert to absolute path
+                effectiveBaseFolder = Path.IsPathRooted(this.BaseFolder) ? this.BaseFolder : Path.GetFullPath(result.BaseFromWorkingDirectory(this.BaseFolder));
+            }
+            
             var fullName = Path.IsPathRooted(this.SourceFolder) ? this.SourceFolder : result.BaseFromWorkingDirectory(this.SourceFolder);
             var folderInfo = new DirectoryInfo(fullName);
             if (folderInfo.Exists)