diff options
Diffstat (limited to 'buildScripts/website.ant.xml')
| -rw-r--r-- | buildScripts/website.ant.xml | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index 5c996fc6..a799e7fe 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -185,9 +185,11 @@ such as applying the templates to produce the website, converting the changelog <arg value="build/website-edge/download-edge.html" /> </java> <copy file="dist/lombok.jar" tofile="build/website-edge/lombok-edge.jar" /> - <tar destfile="dist/website-edge.tar.bz2" compression="bzip2"> <tarfileset dir="build/website-edge" /> + <tarfileset dir="build"> + <include name="edge-releases/**" /> + </tarfileset> </tar> </target> @@ -209,6 +211,23 @@ such as applying the templates to produce the website, converting the changelog username="${ssh.username}" keyfile="${ssh.keyfile}" knownHosts="ssh.knownHosts" /> + <exec executable="/usr/bin/git" failonerror="true"> + <arg value="merge-base" /> + <arg value="--is-ancestor" /> + <arg value="edge" /> + <arg value="master" /> + </exec> + <exec executable="/usr/bin/git"> + <arg value="branch" /> + <arg value="-f" /> + <arg value="edge" /> + <arg value="master" /> + </exec> + <exec executable="/usr/bin/git"> + <arg value="push" /> + <arg value="origin" /> + <arg value="edge:refs/heads/edge" /> + </exec> </target> <target name="javadoc" description="Generates the javadoc" depends="-ensure-version, -ensure-fullversion" unless="skip.javadoc"> |