website build script updated to work with new template based website.

9 files changed, 210 insertions, 378 deletions

diff --git a/build.xml b/build.xml
index af444f27..13450e06 100644
--- a/build.xml
+++ b/build.xml
@@ -126,9 +126,17 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			classname="lombok.core.Version"
 			classpath="build/lombok"
 			failonerror="true"
+			output="build/version.txt">
+			<arg value="full" />
+		</java>
+		<ivy:loadversion property="lombok.fullversion" file="build/version.txt" />
+		<java
+			classname="lombok.core.Version"
+			classpath="build/lombok"
+			failonerror="true"
 			output="build/version.txt" />
 		<ivy:loadversion property="lombok.version" file="build/version.txt" />
-		<echo level="info">Lombok version: ${lombok.version}</echo>
+		<echo level="info">Lombok version: ${lombok.version} (${lombok.fullversion})</echo>
 	</target>
 	
 	<target name="-unpackLibs" depends="ensureRuntimeDeps">
@@ -235,6 +243,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor</echo>
 	<target name="-latestChanges" depends="version">
 		<ant antfile="buildScripts/website.ant.xml" target="latestChanges" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
+			<property name="lombok.fullversion" value="${lombok.fullversion}" />
 		</ant>
 	</target>
 	
@@ -655,6 +664,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 	<target name="javadoc" depends="compile, version" description="Builds javadoc into doc/api.">
 		<ant antfile="buildScripts/website.ant.xml" target="javadoc" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
+			<property name="lombok.fullversion" value="${lombok.fullversion}" />
 		</ant>
 	</target>
 	
@@ -744,6 +754,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 		description="Publishes an edge release for those who need to test a cutting edge build.">
 		<ant antfile="buildScripts/website.ant.xml" target="edgeRelease" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
+			<property name="lombok.fullversion" value="${lombok.fullversion}" />
 			<property name="ssh.username" value="${ssh.username}" />
 			<property name="ssh.keyfile" value="${ssh.keyfile}" />
 		</ant>
@@ -766,6 +777,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 	<target name="website" depends="version" description="Prepares the website for distribution.">
 		<ant antfile="buildScripts/website.ant.xml" target="website" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
+			<property name="lombok.fullversion" value="${lombok.fullversion}" />
 		</ant>
 	</target>
 	
@@ -773,6 +785,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
 			description="Prepares the website for distribution and then publishes it to projectlombok.org.">
 		<ant antfile="buildScripts/website.ant.xml" target="website-publish" inheritAll="false">
 			<property name="lombok.version" value="${lombok.version}" />
+			<property name="lombok.fullversion" value="${lombok.fullversion}" />
 			<property name="ssh.username" value="${ssh.username}" />
 			<property name="ssh.keyfile" value="${ssh.keyfile}" />
 		</ant>
diff --git a/buildScripts/src/lombok/website/WebUpToDate.java b/buildScripts/src/lombok/website/WebUpToDate.java
deleted file mode 100644
index 0fe4c1e9..00000000
--- a/buildScripts/src/lombok/website/WebUpToDate.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Modified from http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/UpToDate.java?view=markup
- *
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-package lombok.website;
-
-import java.io.File;
-import java.util.Vector;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.condition.Condition;
-import org.apache.tools.ant.types.Resource;
-import org.apache.tools.ant.types.FileSet;
-import org.apache.tools.ant.types.resources.Union;
-import org.apache.tools.ant.types.resources.FileResource;
-import org.apache.tools.ant.types.resources.URLResource;
-import org.apache.tools.ant.types.selectors.SelectorUtils;
-
-public class WebUpToDate extends Task implements Condition {
-	private String property;
-	private String value;
-	private String urlbase;
-	private File sourceFile;
-	private Vector sourceFileSets = new Vector();
-	private Union sourceResources = new Union();
-	
-	/**
-	 * The property to set if the target file is more up-to-date than
-	 * (each of) the source file(s).
-	 *
-	 * @param property the name of the property to set if Target is up-to-date.
-	 */
-	public void setProperty(String property) {
-		this.property = property;
-	}
-	
-	/**
-	 * The value to set the named property to if the target file is more
-	 * up-to-date than (each of) the source file(s). Defaults to 'true'.
-	 *
-	 * @param value the value to set the property to if Target is up-to-date
-	 */
-	public void setValue(String value) {
-		this.value = value;
-	}
-	
-	/**
-	 * Returns the value, or "true" if a specific value wasn't provided.
-	 */
-	private String getValue() {
-		return (value != null) ? value : "true";
-	}
-	
-	/**
-	 * The file that must be older than the target file
-	 * if the property is to be set.
-	 *
-	 * @param file the file we are checking against the target file.
-	 */
-	public void setSrcfile(File file) {
-		this.sourceFile = file;
-	}
-	
-	/**
-	 * Nested &lt;srcfiles&gt; element.
-	 * @param fs the source files
-	 */
-	public void addSrcfiles(FileSet fs) {
-		sourceFileSets.addElement(fs);
-	}
-	
-	/**
-	 * Nested resource collections as sources.
-	 * @return the source resources to configure.
-	 * @since Ant 1.7
-	 */
-	public Union createSrcResources() {
-		return sourceResources;
-	}
-	
-	public void setUrlbase(String base) {
-		if (base.charAt(base.length()-1) != '/') this.urlbase = base + "/";
-		else this.urlbase = base;
-	}
-	
-	/**
-	 * Evaluate (all) target and source file(s) to
-	 * see if the target(s) is/are up-to-date.
-	 * @return true if the target(s) is/are up-to-date
-	 */
-	public boolean eval() {
-		if (sourceFileSets.size() == 0 && sourceResources.size() == 0 && sourceFile == null) {
-			throw new BuildException("At least one srcfile or a nested <srcfiles> or <srcresources> element must be set.");
-		}
-		
-		if ((sourceFileSets.size() > 0 || sourceResources.size() > 0) && sourceFile != null) {
-			throw new BuildException("Cannot specify both the srcfile attribute and a nested <srcfiles> or <srcresources> element.");
-		}
-		
-		if (urlbase == null) {
-			throw new BuildException("The urlbase attribute must be set.");
-		}
-		
-		// if the source file isn't there, throw an exception
-		if (sourceFile != null && !sourceFile.exists()) {
-			throw new BuildException(sourceFile.getAbsolutePath() + " not found.");
-		}
-		
-		boolean upToDate = true;
-		if (sourceFile != null) {
-			Resource fileResource = new FileResource(sourceFile);
-			upToDate = isUpToDate(fileResource);
-		}
-		
-		if (upToDate) {
-			Enumeration e = sourceFileSets.elements();
-			while (upToDate && e.hasMoreElements()) {
-				FileSet fs = (FileSet)e.nextElement();
-				Iterator it = fs.iterator();
-				while (upToDate && it.hasNext()) {
-					Resource r = (Resource)it.next();
-					upToDate = isUpToDate(r);
-				}
-			}
-		}
-		
-		if (upToDate) {
-			Resource[] r = sourceResources.listResources();
-			for (int i = 0; upToDate && i < r.length; i++) {
-				upToDate = isUpToDate(r[i]);
-			}
-		}
-		
-		return upToDate;
-	}
-	
-	private boolean isUpToDate(Resource r) throws BuildException {
-		String url = urlbase + r.getName();
-		Resource urlResource;
-		try {
-			urlResource = new URLResource(new URL(url));
-		} catch (MalformedURLException e) {
-			throw new BuildException("url is malformed: " + url, e);
-		}
-		
-		if (SelectorUtils.isOutOfDate(r, urlResource, 20)) {
-			log(r.getName() + " is newer than " + url, Project.MSG_VERBOSE);
-			return false;
-		} else {
-			return true;
-		}
-	}
-	
-	/**
-	 * Sets property to true if target file(s) have a more recent timestamp
-	 * than (each of) the corresponding source file(s).
-	 * @throws BuildException on error
-	 */
-	public void execute() throws BuildException {
-		if (property == null) {
-			throw new BuildException("property attribute is required.", getLocation());
-		}
-		boolean upToDate = eval();
-		
-		if (upToDate) {
-			getProject().setNewProperty(property, getValue());
-			log("Website is up to date.");
-		}
-	}
-}
diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml
index 697a5ad7..8a2851fb 100644
--- a/buildScripts/website.ant.xml
+++ b/buildScripts/website.ant.xml
@@ -22,7 +22,7 @@
 <project name="lombok-website" basedir=".." default="website">
 	<description>
 This buildfile is part of projectlombok.org. It is responsible for building the website and all website-related aspects,
-such as converting the changelog into HTML, and creating javadoc.
+such as applying the templates to produce the website, converting the changelog into HTML, and creating javadoc.
 	</description>
 	
 	<path id="build.path">
@@ -34,159 +34,49 @@ such as converting the changelog into HTML, and creating javadoc.
 	<property name="SNIPPET_TAB_STOP" value="2" />
 	
 	<target name="-website-clean">
-		<delete dir="build/website-old" quiet="true" />
+		<delete dir="build/website" quiet="true" />
 	</target>
 	
-	<target name="website" description="Prepares the website for distribution" depends="-website-main, -website-videos, -website-dist" />
+	<target name="website" description="Prepares the website for distribution" depends="-website-main, -website-dist" />
 	
-	<target name="version" unless="lombok.version">
+	<target name="-ensure-version" unless="lombok.version">
 		<fail>Supply lombok.version</fail>
 	</target>
 	
+	<target name="-ensure-fullversion" unless="lombok.fullversion">
+		<fail>Supply lombok.fullversion</fail>
+	</target>
+	
 	<target name="-compile-webclasses">
 		<mkdir dir="build/webclasses" />
-		<javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.4" target="1.4">
-			<classpath refid="build.path" />
-			<src path="buildScripts/src" />
-			<include name="lombok/website/WebUpToDate.java" />
-		</javac>
-		<javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.5" target="1.5">
+		<javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.8" target="1.8">
 			<classpath refid="build.path" />
-			<src path="buildScripts/src" />
-			<include name="lombok/website/CompileChangelog.java" />
+			<src path="src/website" />
 		</javac>
 	</target>
 	
-	<target name="build-webuptodate" depends="-compile-webclasses">
-		<taskdef name="webuptodate" classname="lombok.website.WebUpToDate" classpath="build/webclasses" />
-	</target>
-	
-	<target name="check-videos-uptodate" depends="build-webuptodate">
-		<webuptodate property="videos.uptodate" urlbase="https://projectlombok.org/videos/">
-			<srcfiles dir="website-old/videos" includes="**/*" />
-		</webuptodate>
-	</target>
-	
-	<target name="-website-videos" depends="-website-clean, check-videos-uptodate" unless="videos.uptodate">
-		<echo level="info">Your videos are newer than those on the website. They will be included too.</echo>
-		<mkdir dir="build/website-old/videos" />
-		<copy todir="build/website-old/videos">
-			<fileset dir="website-old/videos" />
-		</copy>
-	</target>
-	
-	<target name="-website-main" depends="-website-clean, version, javadoc, changelogToHtml">
-		<taskdef classpath="lib/build/de.java2html-java2html.jar" name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" />
-		<mkdir dir="build/website-old" />
-		<copy todir="build/website-old">
-			<fileset dir="website-old">
-				<exclude name="**/*.jpage" />
-				<exclude name="**/*.svg" />
-				<exclude name="**/*.psd" />
-				<exclude name="**/*.ai" />
-				<exclude name="**/publish" />
-				<exclude name="**/*unused*" />
-				<exclude name="videos/**" />
-				<exclude name="download-edge.html" />
-				<exclude name="download-edge-none.html" />
-			</fileset>
+	<target name="-website-main" depends="-ensure-version, -ensure-fullversion, -website-clean, -compile-webclasses, javadoc, changelogToHtml">
+		<mkdir dir="build/website" />
+		<copy todir="build/website">
+			<fileset dir="website/resources" />
 			<fileset dir=".">
-				<include name="LICENCE" />
+				<include name="LICENSE" />
 			</fileset>
 		</copy>
-		<copy file="website/download-edge-none.html" tofile="build/website-old/download-edge.html" />
-		<copy todir="build/website-old" overwrite="true">
-			<fileset dir="website-old">
-				<include name="index.html" />
-				<include name="download.html" />
-				<include name="slideshow.html" />
-				<include name="setup/*.html" />
-				<include name="mavenrepo/index.html" />
-			</fileset>
-			<filterchain>
-				<replacetokens>
-					<token key="VERSION" value="${lombok.version}" />
-				</replacetokens>
-			</filterchain>
-		</copy>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="GetterSetter" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="GetterLazy" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="ToString" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="EqualsAndHashCode" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="Data" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="Cleanup" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="Synchronized" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="SneakyThrows" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="Constructor" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="Log" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="val" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="Value" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="NonNull" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="Builder" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="Singular-snippet" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/var" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/Delegate" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/Accessors" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/ExtensionMethod" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/FieldDefaults" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/Wither" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/onX" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/UtilityClass" />
-		</antcall>
-		<antcall target="-integrateSnippet">
-			<param name="transformationName" value="experimental/Helper" />
-		</antcall>
+		<java classname="lombok.website.WebsiteMaker" failonerror="true">
+			<classpath>
+				<path refid="build.path" />
+				<pathelement location="build/webclasses" />
+			</classpath>
+			<arg value="${lombok.version}" />
+			<arg value="${lombok.fullversion}" />
+		</java>
 	</target>
 	
 	<target name="-website-dist">
 		<mkdir dir="dist" />
 		<tar destfile="dist/website.tar.bz2" compression="bzip2">
-			<tarfileset dir="build/website-old" />
+			<tarfileset dir="build/website" />
 			<tarfileset dir="doc/api" prefix="api" />
 		</tar>
 	</target>
@@ -206,44 +96,7 @@ such as converting the changelog into HTML, and creating javadoc.
 			trust="true" command="/data/lombok/stagingCmd/deployWebsite" />
 	</target>
 	
-	<target name="-integrateSnippet">
-		<mkdir dir="build/website-old" />
-		<property name="prefile" location="usage_examples/${transformationName}Example_pre.jpage" />
-		<property name="postfile" location="usage_examples/${transformationName}Example_post.jpage" />
-		<property name="htmlfile" location="website-old/features/${transformationName}.html" />
-		<mkdir dir="build/temp" />
-		<property name="preout" location="build/temp/${transformationName}Example_pre.jpage.html" />
-		<property name="postout" location="build/temp/${transformationName}Example_post.jpage.html" />
-		<java2html srcdir="usage_examples" includes="${transformationName}Example_*.jpage" destdir="build/temp" tabs="${SNIPPET_TAB_STOP}"
-			showLineNumbers="true" overwrite="true" />
-		<loadfile property="pre" encoding="UTF-8" srcFile="${preout}">
-			<filterchain>
-				<linecontainsregexp>
-					<regexp pattern="(code>)|(font>)" />
-				</linecontainsregexp>
-				<striplinebreaks />
-			</filterchain>
-		</loadfile>
-		<loadfile property="post" encoding="UTF-8" srcFile="${postout}">
-			<filterchain>
-				<linecontainsregexp>
-					<regexp pattern="(code>)|(font>)" />
-				</linecontainsregexp>
-				<striplinebreaks />
-			</filterchain>
-		</loadfile>
-		<delete dir="build/temp" quiet="true" />
-		<copy file="${htmlfile}" tofile="build/website-old/features/${transformationName}.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="HTML_PRE" value="${pre}" />
-					<token key="HTML_POST" value="${post}" />
-				</replacetokens>
-			</filterchain>
-		</copy>
-	</target>
-	
-	<target name="latestChanges" depends="-compile-webclasses, version">
+	<target name="latestChanges" depends="-compile-webclasses, -ensure-version, -ensure-fullversion">
 		<java fork="true" classname="lombok.website.CompileChangelog" failonerror="true">
 			<classpath>
 				<path refid="build.path" />
@@ -256,7 +109,7 @@ such as converting the changelog into HTML, and creating javadoc.
 		</java>
 	</target>
 	
-	<target name="edgeRelease-build" depends="-compile-webclasses, version">
+	<target name="edgeRelease-build" depends="-compile-webclasses, -ensure-version, -ensure-fullversion">
 		<mkdir dir="build/website-edge" />
 		<property name="CHANGELOG_FILE" location="doc/changelog.markdown" />
 		<property name="CHANGELOG_HTML" location="build/website-edge/changelog-edge.html" />
@@ -276,7 +129,7 @@ such as converting the changelog into HTML, and creating javadoc.
 			<format property="edgeRelease-timestamp" pattern="yyyy-MM-dd HH:mm 'UTC'" timezone="UTC" />
 		</tstamp>
 		<copy todir="build/website-edge" overwrite="true">
-			<fileset dir="website-old">
+			<fileset dir="website/extra">
 				<include name="download-edge.html" />
 			</fileset>
 			<filterchain>
@@ -336,7 +189,7 @@ such as converting the changelog into HTML, and creating javadoc.
 		</copy>
 	</target>
 	
-	<target name="javadoc" description="Generates the javadoc" depends="version">
+	<target name="javadoc" description="Generates the javadoc" depends="-ensure-version, -ensure-fullversion">
 		<delete dir="build/api" quiet="true" />
 		<delete dir="doc/api" quiet="true" />
 		<mkdir dir="build/api" />
diff --git a/src/core/lombok/core/Version.java b/src/core/lombok/core/Version.java
index 9cea1f1e..035f5e8a 100644
--- a/src/core/lombok/core/Version.java
+++ b/src/core/lombok/core/Version.java
@@ -49,7 +49,7 @@ public class Version {
 	 */
 	public static void main(String[] args) {
 		if (args.length > 0) {
-			System.out.printf("Lombok %s\n", getFullVersion());
+			System.out.printf("%s\n", getFullVersion());
 		} else {
 			System.out.println(VERSION);
 		}
diff --git a/buildScripts/src/lombok/website/CompileChangelog.java b/src/website/lombok/website/CompileChangelog.java
index 276842be..276842be 100644
--- a/buildScripts/src/lombok/website/CompileChangelog.java
+++ b/src/website/lombok/website/CompileChangelog.java
diff --git a/src/website/lombok/website/WebsiteMaker.java b/src/website/lombok/website/WebsiteMaker.java
index d903340b..fddc1b38 100644
--- a/src/website/lombok/website/WebsiteMaker.java
+++ b/src/website/lombok/website/WebsiteMaker.java
@@ -10,6 +10,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,32 +32,70 @@ import freemarker.template.Template;
 import freemarker.template.TemplateExceptionHandler;
 
 public class WebsiteMaker {
+	private final String version, fullVersion;
 	private final File baseDir, outputDir;
 	
-	public WebsiteMaker(File baseDir, File outputDir) {
+	public WebsiteMaker(String version, String fullVersion, File baseDir, File outputDir) {
+		this.version = version;
+		this.fullVersion = fullVersion;
 		this.baseDir = baseDir;
 		this.outputDir = outputDir;
 	}
 	
+	private static final class VersionFinder {
+		public static String getVersion() {
+			return getVersion0("getVersion");
+		}
+		
+		public static String getFullVersion() {
+			return getVersion0("getFullVersion");
+		}
+		
+		private static String getVersion0(String mName) {
+			try {
+				Class<?> c = Class.forName("lombok.core.Version");
+				Method m = c.getMethod(mName);
+				return (String) m.invoke(null);
+			} catch (ClassNotFoundException e) {
+				System.err.println("You need to specify the version string, and the full version string, as first 2 arguments.");
+				System.exit(1);
+				return null;
+			} catch (Exception e) {
+				if (e instanceof RuntimeException) throw (RuntimeException) e;
+				throw new RuntimeException(e);
+			}
+		}
+	}
+	
 	public static void main(String[] args) throws Exception {
 		File in, out;
-		if (args.length == 0) {
+		String version, fullVersion;
+		if (args.length < 2) {
+			version = VersionFinder.getVersion();
+			fullVersion = VersionFinder.getFullVersion();
+		} else {
+			version = args[0];
+			fullVersion = args[1];
+		}
+		
+		if (args.length < 3) {
 			in = new File(".");
 			if (new File(in, "build.xml").isFile() && new File(in, "website").isDirectory()) in = new File(in, "website");
 		} else {
-			in = new File(args[0]);
+			in = new File(args[2]);
 		}
 		
-		if (args.length < 2) {
+		if (args.length < 4) {
 			if (new File("./build.xml").isFile() && new File("./website").isDirectory() && new File("./build").isDirectory()) {
 				out = new File("./build/website");
 			} else {
 				out = new File(in, "output");
 			}
 		} else {
-			out = new File(args[1]);
+			out = new File(args[3]);
 		}
-		WebsiteMaker maker = new WebsiteMaker(in, out);
+		
+		WebsiteMaker maker = new WebsiteMaker(version, fullVersion, in, out);
 		
 		maker.buildWebsite();
 	}
@@ -151,8 +190,8 @@ public class WebsiteMaker {
 	private static final Pattern LOMBOK_LINK = Pattern.compile("^.*<a(?: (?:id|class|rel|rev|download|target|type)(?:=\"[^\"]*\")?)* href=\"([^\"]+)\"(?: (?:id|class|rel|rev|download|target|type)(?:=\"[^\"]*\")?)*>([^<]+)</a>.*$");
 	private Map<String, Object> createDataModel() throws IOException {
 		Map<String, Object> data = new HashMap<String, Object>();
-		data.put("version", lombok.core.Version.getVersion());
-		data.put("fullVersion", lombok.core.Version.getFullVersion());
+		data.put("version", version);
+		data.put("fullVersion", fullVersion);
 		data.put("year", "" + new GregorianCalendar().get(Calendar.YEAR));
 		data.put("usages", new HtmlMaker(new File(baseDir, "usageExamples")));
 		InputStream in = new URL("https://projectlombok.org/all-versions.html").openStream();
@@ -167,8 +206,8 @@ public class WebsiteMaker {
 			in.close();
 		}
 		
-		if (links.isEmpty() || !links.get(0).get(0).endsWith("lombok-" + lombok.core.Version.getVersion() + ".jar")) {
-			links.add(Arrays.asList("downloads/lombok-" + lombok.core.Version.getVersion() + ".jar", "lombok-" + lombok.core.Version.getVersion() + ".jar"));
+		if (links.isEmpty() || !links.get(0).get(0).endsWith("lombok-" + version + ".jar")) {
+			links.add(Arrays.asList("downloads/lombok-" + version + ".jar", "lombok-" + version + ".jar"));
 		}
 		
 		data.put("linksToVersions", links);
diff --git a/website/extra/download-edge-none.html b/website/extra/download-edge-none.html
new file mode 100644
index 00000000..07091b90
--- /dev/null
+++ b/website/extra/download-edge-none.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html><head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<link rel="stylesheet" type="text/css" href="logi/reset.css" />
+	<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+	<meta name="description" content="Spice up your java" />
+	<title>Project Lombok - Cutting Edge build</title>
+	<style type="text/css">
+		code {
+			font-size: 12px;
+			font-family: monospaced;
+		}
+		
+		#downloadLink {
+			font-size: 14px;
+		}
+		
+		.meat {
+			margin: 16px auto 0 auto;
+			width: 800px;
+		}
+		
+		.backLink {
+			padding-top: 100px;
+			width: 100%;
+			text-align: right;
+		}
+		
+		h1 {
+			padding-bottom: 0;
+			margin-bottom: 4px;
+		}
+	</style>
+</head><body>
+	<div class="meat download edge">
+		<h1>Download Lombok Cutting Edge build</h1>
+		<div class="versionInfo">
+			No edge build as been released since the last <a href="download.html">stable release</a> of lombok.
+		</div>
+		<div class="backLink">
+			<a href="index.html">back to the project homepage</a>
+		</div>
+	</div>
+	<script type="text/javascript">
+		var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+		document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+	</script>
+	<script type="text/javascript">
+		try {
+			var pageTracker = _gat._getTracker("UA-9884254-1");
+			pageTracker._trackPageview();
+		} catch(err) {}
+	</script>
+</body></html>
diff --git a/website/extra/download-edge.html b/website/extra/download-edge.html
new file mode 100644
index 00000000..4cf794a6
--- /dev/null
+++ b/website/extra/download-edge.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html><head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<link rel="stylesheet" type="text/css" href="logi/reset.css" />
+	<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
+	<meta name="description" content="Spice up your java" />
+	<title>Project Lombok - Cutting Edge build</title>
+	<style type="text/css">
+		code {
+			font-size: 12px;
+			font-family: monospaced;
+		}
+		
+		#downloadLink {
+			font-size: 14px;
+		}
+		
+		.meat {
+			margin: 16px auto 0 auto;
+			width: 800px;
+		}
+		
+		.backLink {
+			padding-top: 100px;
+			width: 100%;
+			text-align: right;
+		}
+		
+		h1 {
+			padding-bottom: 0;
+			margin-bottom: 4px;
+		}
+	</style>
+</head><body>
+	<div class="meat download edge">
+		<h1>Download Lombok Cutting Edge build</h1>
+		<div class="versionInfo">
+			version: @VERSION-EDGE@
+		</div>
+		<p id="changelog">
+			@CHANGELOG-EDGE@
+		</p>
+		<a href="lombok-edge.jar" id="downloadLink">
+			Download now!
+		</a>
+		<p>
+			Cutting edge a bit too gutsy for you? You can grab the <a href="download.html">stable release</a> instead.
+		</p>
+		<div class="backLink">
+			<a href="index.html">back to the project homepage</a>
+		</div>
+	</div>
+	<script type="text/javascript">
+		var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+		document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+	</script>
+	<script type="text/javascript">
+		try {
+			var pageTracker = _gat._getTracker("UA-9884254-1");
+			pageTracker._trackPageview();
+		} catch(err) {}
+	</script>
+</body></html>
diff --git a/website/templates/features/Builder.html b/website/templates/features/Builder.html
index a6b8d18f..96a30d99 100644
--- a/website/templates/features/Builder.html
+++ b/website/templates/features/Builder.html
@@ -74,7 +74,7 @@
 		
 		<p>
 			If a certain field/parameter is never set during a build session, then it always gets 0 / <code>null</code> / false. If you've put <code>@Builder</code> on a class (and not a method or constructor) you can instead specify the default directly on the field, and annotate the field with <code>@Builder.Default</code>:<br />
-			<code>@Builder.Default private final long created = System.currentTimeMillis();</code>	</@f.featureSection>
+			<code>@Builder.Default private final long created = System.currentTimeMillis();</code>
 		</p>
 	</@f.featureSection>