From 76e3862bcc8987d2f8cd73ed679045e74f71bd8c Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Tue, 13 Jun 2017 00:26:46 +0200 Subject: The way download-edge makes the HTML page for the edge release completely rewritten. --- buildScripts/website.ant.xml | 2 +- src/website/lombok/website/WebsiteMaker.java | 9 +--- website/extra/download-edge-none.html | 54 ------------------------ website/extra/download-edge.html | 63 ---------------------------- website/templates/_download-edge.html | 18 ++++++++ 5 files changed, 21 insertions(+), 125 deletions(-) delete mode 100644 website/extra/download-edge-none.html delete mode 100644 website/extra/download-edge.html create mode 100644 website/templates/_download-edge.html diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index 2b9f2012..c27d81fa 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -49,7 +49,7 @@ such as applying the templates to produce the website, converting the changelog - + diff --git a/src/website/lombok/website/WebsiteMaker.java b/src/website/lombok/website/WebsiteMaker.java index 10e460dd..5715086b 100644 --- a/src/website/lombok/website/WebsiteMaker.java +++ b/src/website/lombok/website/WebsiteMaker.java @@ -209,12 +209,7 @@ public class WebsiteMaker { } public void buildDownloadEdge(File out) throws Exception { - Configuration freemarkerConfig = new Configuration(Configuration.VERSION_2_3_25); - freemarkerConfig.setEncoding(Locale.ENGLISH, "UTF-8"); - freemarkerConfig.setOutputEncoding("UTF-8"); - freemarkerConfig.setOutputFormat(HTMLOutputFormat.INSTANCE); - freemarkerConfig.setTemplateLoader(createLoader("extra")); - freemarkerConfig.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); + Configuration freemarkerConfig = makeFreemarkerConfig(); outputDir.mkdirs(); convertDownloadEdge(freemarkerConfig, out); @@ -289,7 +284,7 @@ public class WebsiteMaker { private void convertDownloadEdge(Configuration freemarker, File outFile) throws Exception { Map dataModel = createBasicDataModel(); - Template template = freemarker.getTemplate("download-edge.html"); + Template template = freemarker.getTemplate("_download-edge.html"); FileOutputStream fileOut = new FileOutputStream(outFile); try { Writer wr = new BufferedWriter(new OutputStreamWriter(fileOut, "UTF-8")); diff --git a/website/extra/download-edge-none.html b/website/extra/download-edge-none.html deleted file mode 100644 index 07091b90..00000000 --- a/website/extra/download-edge-none.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - Project Lombok - Cutting Edge build - - -
-

Download Lombok Cutting Edge build

-
- No edge build as been released since the last stable release of lombok. -
-
- back to the project homepage -
-
- - - diff --git a/website/extra/download-edge.html b/website/extra/download-edge.html deleted file mode 100644 index e4c72dfc..00000000 --- a/website/extra/download-edge.html +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - Project Lombok - Cutting Edge build - - -
-

Download Lombok Cutting Edge build

-
- version: ${version} -
-

- ${changelogEdge?no_esc} -

- - Download now! - -

- Cutting edge a bit too gutsy for you? You can grab the stable release instead. -

-
- back to the project homepage -
-
- - - diff --git a/website/templates/_download-edge.html b/website/templates/_download-edge.html new file mode 100644 index 00000000..bd49c1b1 --- /dev/null +++ b/website/templates/_download-edge.html @@ -0,0 +1,18 @@ +<#import "/_scaffold.html" as main> +<@main.scaffold> +
+
+

Download 'Edgy Guinea Pig' – the Lombok Cutting Edge build

+
+ version: ${version} +
+ ${changelogEdge?no_esc} +
+

Download edge release now!

+
+

+ Cutting edge a bit too gutsy for you? You can grab the stable release instead. +

+
+
+ -- cgit