svn commit: r1553720 - /httpcomponents/project-release-tools/trunk/build.gradle

[ol...@apache.org]

Author: olegk
Date: Fri Dec 27 19:14:22 2013
New Revision: 1553720

URL: http://svn.apache.org/r1553720
Log:
Tweaked website publishing tasks

Modified:
    httpcomponents/project-release-tools/trunk/build.gradle

Modified: httpcomponents/project-release-tools/trunk/build.gradle
URL: http://svn.apache.org/viewvc/httpcomponents/project-release-tools/trunk/build.gradle?rev=1553720&r1=1553719&r2=1553720&view=diff
==============================================================================
--- httpcomponents/project-release-tools/trunk/build.gradle (original)
+++ httpcomponents/project-release-tools/trunk/build.gradle Fri Dec 27 19:14:22 2013
@@ -666,22 +666,8 @@ if (releaseTagFile.exists() && releaseRe
         }
     }
 
-
-    task completeRelease(dependsOn: commitNextVersion) {
-        group = 'Release'
-        description = "Completes releases."
-        doLast {
-            [releaseVerFile, releaseTagFile, rcQualifierFile, rcTagFile, rcRevisionFile,
-                    releaseRevisionFile, distRevisionFile, distRelRevisionFile,
-                    nextVerFile, nextVerRevisionFile].each { File file ->
-                GFileUtils.deleteQuietly(file)
-            }
-        }
-    }
-
 }
 
-
 /////////////////////////// Helper utilities //////////////////////////////////
 
 String getProductName(String artifactId) {
@@ -818,10 +804,14 @@ task generateFullWebsite(dependsOn: gene
     description = "Generates full website content including published releases."
 }
 
-List<URI> uris = HC_PUBLISHED_RELEASES ?
-    HC_PUBLISHED_RELEASES.split(/[ \t]+/).collect { new URI(it) } : null
+Set<URI> uris = HC_PUBLISHED_RELEASES ?
+    HC_PUBLISHED_RELEASES.split(/[ \t]+/).collect { new URI(it) } : []
 
-if (uris) {
+if (releaseTagFile.exists() && nextVerRevisionFile.exists()) {
+    uris.add(new URI(releaseTagFile.text))
+}
+
+if (!uris.empty) {
 
     uris.eachWithIndex { URI uri, int idx ->
 
@@ -909,6 +899,7 @@ task siteStage(dependsOn: [checkoutSiteS
             with siteContent(checkoutMainWebsite.localDir)
         }
     }
+    Svn.scheduleForAddition(checkoutSiteStage.localDir)
 }
 
 task revertSiteStage(type: SvnRevert, dependsOn: checkoutSiteStage) {
@@ -917,6 +908,16 @@ task revertSiteStage(type: SvnRevert, de
     repo = checkoutSiteStage.repo
 }
 
+task previewSiteStage(type: SvnStatus, dependsOn: checkoutSiteStage) {
+    group = 'Website generation'
+    description = "Displays local changes for project website."
+    repo = checkoutSiteStage.repo
+    doFirst {
+        println "Local changes for project website"
+        println "${checkoutSiteStage.localDir}"
+    }
+}
+
 task commitSiteStage(dependsOn: checkoutSiteStage) {
     group = 'Repository'
     description = "Commit changes from website content stage to ${HC_SITE_STAGING}."