From 58f845f2b8d81bb3a45eda277a962fb80c96dd28 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@gmail.com>
Date: Tue, 13 Jul 2010 12:59:58 +0200
Subject: [PATCH] minor refactoring of uploadArchives in docs subprojects

---
 docs/api/build.gradle       | 12 +++---------
 docs/reference/build.gradle |  6 +++---
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/docs/api/build.gradle b/docs/api/build.gradle
index fa2c0e12..34a790a6 100644
--- a/docs/api/build.gradle
+++ b/docs/api/build.gradle
@@ -80,12 +80,6 @@ docsSpec = copySpec {
     }
 }
 
-configurations { scpAntTask }
-dependencies {
-    scpAntTask("org.apache.ant:ant-jsch:1.8.1")
-}
-
-
 task build(dependsOn: assemble) {
 }
 
@@ -121,6 +115,9 @@ uploadArchives {
         }
     }
 
+    configurations { scpAntTask }
+    dependencies { scpAntTask 'org.apache.ant:ant-jsch:1.8.1' }
+
     doFirst {
         println "Uploading: ${docsArchive.archivePath} to ${fqRemoteDir}"
     }
@@ -132,12 +129,9 @@ uploadArchives {
                 classpath: configurations.scpAntTask.asPath)
 
             // copy the archive, unpack it, then delete it
-            //def mkdirCommand = "mkdir -p ${remoteDocsDir}"
             def unpackCommand = "cd ${remoteDocsDir} && tar -xjf ${docsArchive.archiveName}"
             def deleteCommand = "rm ${remoteDocsDir}/${docsArchive.archiveName}"
 
-            //println "sshexec ${mkdirCommand}"
-            //sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: mkdirCommand)
             println "sshexec ${unpackCommand}"
             sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: unpackCommand)
             println "sshexec ${deleteCommand}"
diff --git a/docs/reference/build.gradle b/docs/reference/build.gradle
index 56bd8020..7bd662fb 100644
--- a/docs/reference/build.gradle
+++ b/docs/reference/build.gradle
@@ -143,6 +143,9 @@ uploadArchives {
         }
     }
 
+    configurations { scpAntTask }
+    dependencies { scpAntTask 'org.apache.ant:ant-jsch:1.8.1' }
+
     doFirst {
         println "Uploading: ${docsArchive.archivePath} to ${fqRemoteDir}"
     }
@@ -154,12 +157,9 @@ uploadArchives {
                 classpath: configurations.scpAntTask.asPath)
 
             // copy the archive, unpack it, then delete it
-            //def mkdirCommand = "mkdir -p ${remoteDocsDir}"
             def unpackCommand = "cd ${remoteDocsDir} && tar -xjf ${docsArchive.archiveName}"
             def deleteCommand = "rm ${remoteDocsDir}/${docsArchive.archiveName}"
 
-            //println "sshexec ${mkdirCommand}"
-            //sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: mkdirCommand)
             println "sshexec ${unpackCommand}"
             sshexec(host: sshHost, username: sshUsername, keyfile: sshPrivateKey, command: unpackCommand)
             println "sshexec ${deleteCommand}"