From b4a4da1f9741ea6afb147dd4289989ec705a3fbd Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@tipit.to>
Date: Tue, 28 Jul 2009 18:17:15 +0200
Subject: Version is now 'standalone' - it is separately compiled. The version
 is now reflected in all javadoc pages, and on the website itself.

The website design has been updated to have a link to the changelog and to mention the current version.

Addresses issue #9.
---
 build.xml                    | 22 ++++++++++++++++++----
 src/lombok/core/Version.java |  1 +
 website/download.html        | 10 +++++++++-
 website/index.css            | 30 +++++++++++++++++++++---------
 website/index.html           | 13 +++++++++----
 5 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/build.xml b/build.xml
index 7edc7c6e..9109bd4e 100644
--- a/build.xml
+++ b/build.xml
@@ -69,7 +69,7 @@
 		</copy>
 	</target>
 	
-	<target name="-website-main" depends="-website-clean, javadoc, changelogToHtml">
+	<target name="-website-main" depends="-website-clean, version, javadoc, changelogToHtml">
 		<taskdef classpath="deps/website/java2html.jar" name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" />
 		<mkdir dir="build/website" />
 		<copy todir="build/website">
@@ -83,6 +83,17 @@
 				<exclude name="videos/**" />
 			</fileset>
 		</copy>
+		<copy todir="build/website" overwrite="true">
+			<fileset dir="website">
+				<include name="index.html" />
+				<include name="download.html" />
+			</fileset>
+			<filterchain>
+				<replacetokens>
+					<token key="VERSION" value="${lombok.version}" />
+				</replacetokens>
+			</filterchain>
+		</copy>
 		<antcall target="-integrateSnippet">
 			<param name="transformationName" value="GetterSetter" />
 		</antcall>
@@ -194,7 +205,9 @@
 		</unjar>
 	</target>
 	
-	<target name="version" description="Shows the version number" depends="compile">
+	<target name="version" description="Shows the version number">
+		<mkdir dir="build/lombok" />
+		<javac srcdir="src" debug="on" destdir="build/lombok" target="1.5" includes="lombok/core/Version.java" />
 		<java
 			classname="lombok.core.Version"
 			classpath="build/lombok"
@@ -206,11 +219,10 @@
 				<striplinebreaks />
 			</filterchain>
 		</loadresource>
-		<delete file="build/version.txt" quiet="true" />
 		<echo level="info">Lombok version: ${lombok.version}</echo>
 	</target>
 	
-	<target name="javadoc" description="Generates the javadoc">
+	<target name="javadoc" description="Generates the javadoc" depends="version">
 		<delete dir="build/api" quiet="true" />
 		<delete dir="doc/api" quiet="true" />
 		<mkdir dir="build/api" />
@@ -218,6 +230,7 @@
 			<classpath refid="lombok.deps.path" />
 			<classpath refid="lombok.libs.path" />
 			<link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="./deps/javadoc/java6"/>
+			<header><![CDATA[<a href="http://projectlombok.org/">Lombok</a> - ]]>v${lombok.version}</header>
 			<bottom><![CDATA[<i>Copyright &#169; 2009 Reinier Zwitserloot and Roel Spilker, licensed under the <a href='http://www.opensource.org/licenses/mit-license.php'>MIT licence</a>.]]></bottom>
 		</javadoc>
 		<mkdir dir="doc/api" />
@@ -250,6 +263,7 @@
 			<fileset dir="build" includes="changelog.txt" />
 			<manifest>
 				<attribute name="Main-Class" value="lombok.installer.Installer" />
+				<attribute name="Lombok-Version" value="${lombok.version}" />
 			</manifest>
 		</jar>
 		<copy file="dist/lombok-${lombok.version}.jar" tofile="dist/lombok.jar" />
diff --git a/src/lombok/core/Version.java b/src/lombok/core/Version.java
index 1c1c8cca..4fc70152 100644
--- a/src/lombok/core/Version.java
+++ b/src/lombok/core/Version.java
@@ -25,6 +25,7 @@ package lombok.core;
  * This class just holds lombok's current version.
  */
 public class Version {
+	// ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries).
 	private static final String VERSION = "0.8.2-HEAD";
 	
 	private Version() {
diff --git a/website/download.html b/website/download.html
index 5fd1f816..5b546b72 100644
--- a/website/download.html
+++ b/website/download.html
@@ -25,12 +25,20 @@
 			width: 100%;
 			text-align: right;
 		}
+		
+		h1 {
+			padding-bottom: 0;
+			margin-bottom: 4px;
+		}
 	</style>
 </head><body>
 	<div class="meat">
 		<h1>Download Lombok</h1>
+		<div class="versionInfo">
+			version: @VERSION@ | <a href="changelog.html">changelog</a>
+		</div>
 		<p id="downloadHelp">
-			Just double-click the <code>lombok.jar</code> file you've downloaded to install lombok into
+			Just double-click the <code>lombok.jar</code> file you'll download to install lombok into
 			your IDE. <code>lombok.jar</code> is also the jar you use as a project dependency
 			(include it in your classpath when compiling with <code>javac</code> or add it to your project
 			library list in your java IDE). It's the only jar you need!<br /><br />
diff --git a/website/index.css b/website/index.css
index 7ce9878b..a1480c40 100644
--- a/website/index.css
+++ b/website/index.css
@@ -18,12 +18,12 @@ h1 {
 	text-align: center;
 }
 
-#buttonBar a {
+#buttonBar a.button, a.downloadLink {
 	text-decoration: none;
 	color: black;
 }
 
-#buttonBar a:hover {
+#buttonBar a.button:hover, a.downloadLink:hover {
 	text-decoration: underline;
 	color: blue;
 }
@@ -78,31 +78,43 @@ h1 {
 	font-size: 14px;
 }
 
-.download {
+.downloadContainer {
 	float: left;
 	margin: 34px 8px 57px 40px;
-	background-image: url(downloadButton.png);
-	line-height: 56px;
-	width: 225px;
-	height: 56px;
 }
 
 code {
 	font-weight: bold;
 }
 
-.download img {
+.downloadLink {
+	background-image: url(downloadButton.png);
+	display: block;
+	line-height: 56px;
+	width: 225px;
+	height: 56px;
+}
+
+.downloadLink img {
 	margin: 4px 20px 4px 16px;
 	float: left;
 	width: 48px;
 }
 
-.download span {
+.downloadLink span {
 	display: block;
 	font-size: 16px;
 	font-weight: bold;
 }
 
+.versionInfo {
+	font-size: 12px;
+	margin-top: 4px;
+	font-weight: normal;
+	width: 100%;
+	text-align: center;
+}
+
 #downloadInfo {
 	font-size: 14px;
 }
diff --git a/website/index.html b/website/index.html
index a3a3f5b3..c85d2fb9 100644
--- a/website/index.html
+++ b/website/index.html
@@ -41,10 +41,15 @@
 				<img src="icon_bugs.png" />
 				<span>Report an issue</span>
 			</a>
-			<a class="download" id="downloadLink" href="download.html">
-				<img src="icon_download.png" />
-				<span>Download!</span>
-			</a>
+			<div class="downloadContainer">
+				<a class="downloadLink" id="downloadLink" href="download.html">
+					<img src="icon_download.png" />
+					<span>Download!</span>
+				</a>
+				<div class="versionInfo">
+					Version: @VERSION@ | <a href="changelog.html">changelog</a>
+				</div>
+			</div>
 		</div>
 		<div class="video">
 			<video width="800" height="480" poster="videos/poster.png" controls="controls">
-- 
cgit