diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | buildScripts/website.ant.xml | 28 |
2 files changed, 19 insertions, 11 deletions
@@ -6,7 +6,7 @@ /google.properties /debug /*.launch -/escudo-upload.key +/ssh.configuration /findbugsReport.html /lib /.settings diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index ef60d350..d1baa28f 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -272,20 +272,28 @@ such as converting the changelog into HTML, and creating javadoc. </tar> </target> - <target name="edgeRelease" depends="edgeRelease-build"> - <available file="escudo-upload.key" property="escudo.key.available" /> - <fail unless="escudo.key.available">You don't have the escudo-upload.key; you'll need it to get write access to the server.</fail> - + <property file="ssh.configuration" /> + + <target name="config-ssh" unless="ssh.username"> + <input message="What is your SSH username on the projectlombok.org server? (Enter to abort)." addproperty="ssh.username" /> + <condition property="ssh.usernameBlank"><equals arg1="${ssh.username}" arg2="" trim="true" /></condition> + <fail if="ssh.usernameBlank">Aborted.</fail> + <input message="Where is your ssh keyfile located?" addproperty="ssh.keyfile" defaultvalue="${user.home}/.ssh/id_rsa" /> + </target> + + <target name="edgeRelease" depends="edgeRelease-build, config-ssh"> <scp localFile="dist/website-edge.tar.bz2" - todir="lombokup@projectlombok.org:/staging" - keyfile="escudo-upload.key" passphrase="" + todir="${ssh.username}@projectlombok.org:/data/lombok/staging" + keyfile="${ssh.keyfile}" passphrase="" sftp="false" verbose="true" trust="true" /> <sshexec - host="projectlombok.org" - username="lombokup" - keyfile="escudo-upload.key" passphrase="" - trust="true" command="./deployEdge" /> + host="projectlombok.org" username="${ssh.username}" keyfile="${ssh.keyfile}" passphrase="" + trust="true" command="/data/lombok/stagingCmd/deployEdge" /> + <propertyfile file="ssh.configuration"> + <entry key="ssh.username" value="${ssh.username}" /> + <entry key="ssh.keyfile" value="${ssh.keyfile}" /> + </propertyfile> </target> <target name="changelogToHtml" depends="-compile-webclasses"> |