Prepare for v0.3

FudgeMsg · Mar 7, 2011 · 741623f · 741623f
1 parent a3addcb
commit 741623f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright 2009 by OpenGamma Inc and other contributors.
+Copyright (C) 2009 - present by OpenGamma Inc. and other contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/build.properties b/build.properties
@@ -1,8 +1,11 @@
-module.version.target = 0.2
+module.version.target = 0.3
+# following line commented in for release, comment out otherwise
+#ivy.new.revision = 0.3
 
 build.debug=true
 build.optimize=false
 build.verbose=false
+jar.compress=false
 
 common.dir = ${basedir}/common
 javadocs.windowtitle = Fudge implementation

diff --git a/common/build.properties b/common/build.properties
@@ -40,9 +40,9 @@ ivy.jar.dir=${bootstrap.dir}
 ivy.jar.file=${ivy.jar.dir}/ivy.jar
 ivy.settings.file=${basedir}/ivysettings.xml
 
-jar.file = ${build.dir}/${ant.project.name}.jar
-src.jar.file = ${build.dir}/${ant.project.name}-src.jar
-javadocs.jar.file = ${build.dir}/${ant.project.name}-javadocs.jar
+jar.file.base = ${build.dir}/${ant.project.name}
+src.jar.file.base = ${build.dir}/${ant.project.name}-src
+javadocs.jar.file.base = ${build.dir}/${ant.project.name}-javadocs
 
 main.class.name = ${ant.project.name}.Main
 

diff --git a/common/common.xml b/common/common.xml
@@ -128,7 +128,10 @@
 		<mkdir dir="${docs.dir}/javadoc" />
 		<javadoc sourcepath="${src.dir}" destdir="${docs.dir}/javadoc"
 			classpathref="lib.path.id" author="false" windowtitle="${javadocs.windowtitle}"
-			doctitle="${javadocs.doctitle}" bottom="${javadocs.footer}" />
+			doctitle="${javadocs.doctitle}" bottom="${javadocs.footer}">
+          <link href="http://download.oracle.com/javase/6/docs/api/" />
+          <link href="http://threeten.sourceforge.net/apidocs/" />
+	    </javadoc>
 	</target>
 
 	<target name="compile-tests-mkdir">
@@ -159,7 +162,7 @@
 			</fileset>
 			<fileset dir="${tests.dir}/interop" erroronmissingdir="false">
 				<exclude name="**/*.java" />
-			</fileset> 
+			</fileset>
 		</copy>
 	</target>
 
@@ -223,13 +226,17 @@
 
 		<!-- load generated version properties file -->
 		<property file="${classes.dir}/${ant.project.name}.properties" />
+
+		<!-- setup correct versioned properties -->
+		<property name="jar.file" value="${jar.file.base}-${version}.jar" />
+		<property name="src.jar.file" value="${src.jar.file.base}-${version}.jar" />
+		<property name="javadocs.jar.file" value="${javadocs.jar.file.base}-${version}.jar" />
 	</target>
 
 	<target name="jar" depends="version, compile"
 		description="--> make a jar file for this project">
 		<jar destfile="${jar.file}">
 			<fileset dir="${classes.dir}" />
-			<fileset dir="${tests.classes.dir}" />
 			<manifest>
 				<attribute name="Built-By" value="${user.name}" />
 				<attribute name="Build-Version" value="${version}" />
@@ -252,7 +259,7 @@
 	<target name="javadoc-jar" depends="version, javadoc"
 		description="--> make a javadoc jar file for this project">
 		<jar destfile="${javadocs.jar.file}" basedir="${docs.dir}/javadoc"
-			compress="{$jar.compress}" />
+			compress="${jar.compress}" />
 	</target>
 
 	<target name="publish" depends="clean-build, jar"
@@ -271,11 +278,13 @@
 			message="project ${ant.project.name} published locally with version ${version}" />
 	</target>
 
-	<target name="dist" depends="clean,jar">
+	<target name="create-dist" depends="clean,jar,src-jar,javadoc-jar">
 		<mkdir dir="${dist.dir}" />
 		<copy todir="${dist.dir}/${dist.name}" file="${basedir}/LICENSE.txt" failonerror="false"/>
 		<copy todir="${dist.dir}/${dist.name}" file="${basedir}/README.txt" failonerror="false"/>
 		<copy todir="${dist.dir}/${dist.name}" file="${jar.file}" />
+		<copy todir="${dist.dir}/${dist.name}" file="${src.jar.file}" />
+		<copy todir="${dist.dir}/${dist.name}" file="${javadocs.jar.file}" />
 		<copy todir="${dist.dir}/${dist.name}/config" failonerror="false">
 			<fileset dir="${basedir}/config"/>
 		</copy>
@@ -294,20 +303,20 @@
 		<ivy:retrieve type="jar" pattern="${dist.dir}/${dist.name}/lib/[organization]-[module]-[artifact]-[revision].[ext]" />
 	</target>
 
-	<target name="tarball" depends="dist" description="--> generate a tarball for distribution">
+	<target name="tarball" depends="create-dist">
 		<tar destfile="${dist.dir}/${dist.name}-${version}.tar" basedir="${dist.dir}">
 			<include name="${dist.name}/**/*" />
 		</tar>
 		<bzip2 src="${dist.dir}/${dist.name}-${version}.tar" destfile="${dist.dir}/${dist.name}-${version}.tar.bz2" />
 	</target>
 
-	<target name="zipfile" depends="dist" description="--> generate a zip file for distribution">
+	<target name="zipfile" depends="create-dist">
 		<zip destfile="${dist.dir}/${dist.name}-${version}.zip" basedir="${dist.dir}">
 			<include name="${dist.name}/**/*" />
 		</zip>
 	</target>
 
-	<target name="tarzip" depends="clean-dist,tarball,zipfile" description="--> generate a tarball and zipfile">
+	<target name="dist" depends="create-dist,tarball,zipfile" description="--> generate the distribution">
 	</target>
 
 	<target name="clean-local" depends="load-ivy"