The way download-edge makes the HTML page for the edge release completely rewritten.

This commit is contained in:
Reinier Zwitserloot committed 2017-06-13 00:29:33 +02:00
1 parent b351b2af2c
commit 76e3862bcc
5 files changed
+21 -125

No files matched your search

+1 -1
View File
@@ -49,7 +49,7 @@ such as applying the templates to produce the website, converting the changelog
<target name="-compile-webclasses">
<mkdir dir="build/webclasses" />
<javac includeDestClasses="false" destdir="build/webclasses" debug="on" source="1.8" target="1.8">
<javac includeDestClasses="false" includeantruntime="false" destdir="build/webclasses" debug="on" source="1.8" target="1.8">
<classpath refid="build.path" />
<src path="src/website" />
</javac>
+2 -7
View File
@@ -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<String, Object> 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"));
-54
View File
@@ -1,54 +0,0 @@
<!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>
-63
View File
@@ -1,63 +0,0 @@
<!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}
</div>
<p id="changelog">
${changelogEdge?no_esc}
</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>
+18
View File
@@ -0,0 +1,18 @@
<#import "/_scaffold.html" as main>
<@main.scaffold>
<div class="page-header top5">
<div class="row text-center versionInfo">
<h1>Download 'Edgy Guinea Pig' – the Lombok Cutting Edge build</h1>
</div><div class="row versionInfo">
version: ${version}
</div><div class="row" id="changelog">
${changelogEdge?no_esc}
</div><div class="row text-center">
<h2><a href="/lombok-edge.jar" id="downloadLink">Download edge release now!</a></h2>
</div><div class="row text-center">
<p>
Cutting edge a bit too gutsy for you? You can grab the <a href="download.html">stable release</a> instead.
</p>
</div>
</div>
</@main.scaffold>