diff --git a/build.xml b/build.xml
index af444f27..13450e06 100644
--- a/build.xml
+++ b/build.xml
@@ -122,13 +122,21 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
+
+
+
+
- Lombok version: ${lombok.version}
+ Lombok version: ${lombok.version} (${lombok.fullversion})
@@ -235,6 +243,7 @@ lombok.launch.AnnotationProcessorHider$ClaimingProcessor
+
@@ -655,6 +664,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
+
@@ -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.">
+
@@ -766,6 +777,7 @@ You can also create your own by writing a 'testenvironment.properties' file. The
+
@@ -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.">
+
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 <srcfiles> 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 or 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 or 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 @@
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.
@@ -34,159 +34,49 @@ such as converting the changelog into HTML, and creating javadoc.
-
+
-
+
-
+ Supply lombok.version
+
+ Supply lombok.fullversion
+
+
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
- Your videos are newer than those on the website. They will be included too.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
@@ -206,44 +96,7 @@ such as converting the changelog into HTML, and creating javadoc.
trust="true" command="/data/lombok/stagingCmd/deployWebsite" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -256,7 +109,7 @@ such as converting the changelog into HTML, and creating javadoc.
-
+
@@ -276,7 +129,7 @@ such as converting the changelog into HTML, and creating javadoc.
-
+
@@ -336,7 +189,7 @@ such as converting the changelog into HTML, and creating javadoc.
-
+
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
similarity index 100%
rename from buildScripts/src/lombok/website/CompileChangelog.java
rename to 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("^.*([^<]+).*$");
private Map createDataModel() throws IOException {
Map data = new HashMap();
- 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 @@
+
+
+
+
+
+
+ Project Lombok - Cutting Edge build
+
+
+
+
Download Lombok Cutting Edge build
+
+ No edge build as been released since the last stable release of lombok.
+
If a certain field/parameter is never set during a build session, then it always gets 0 / null / false. If you've put @Builder on a class (and not a method or constructor) you can instead specify the default directly on the field, and annotate the field with @Builder.Default:
- @Builder.Default private final long created = System.currentTimeMillis();
+ @Builder.Default private final long created = System.currentTimeMillis();