From: <lh...@us...> - 2008-11-14 15:42:30
|
Revision: 193 http://tinytim.svn.sourceforge.net/tinytim/?rev=193&view=rev Author: lheuer Date: 2008-11-14 15:42:28 +0000 (Fri, 14 Nov 2008) Log Message: ----------- - Simplified Version.java - Preparation for release 2.0.0a3 Modified Paths: -------------- tinytim/trunk/build.properties tinytim/trunk/build.xml tinytim/trunk/src/main/java/org/tinytim/Version.java Modified: tinytim/trunk/build.properties =================================================================== --- tinytim/trunk/build.properties 2008-11-14 14:10:29 UTC (rev 192) +++ tinytim/trunk/build.properties 2008-11-14 15:42:28 UTC (rev 193) @@ -1,4 +1,5 @@ version=2.0.0 -version_suffix=a3-snapshot +version_suffix=a3 +#release_type= debug=off optimize=on Modified: tinytim/trunk/build.xml =================================================================== --- tinytim/trunk/build.xml 2008-11-14 14:10:29 UTC (rev 192) +++ tinytim/trunk/build.xml 2008-11-14 15:42:28 UTC (rev 193) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <project name="tinyTiM" default="jar" basedir="."> <property file="build.properties"/> + <tstamp/> + <property name="release_type" value="-snapshot-${DSTAMP}${TSTAMP}"/> <property name="dir.src" value="${basedir}/src/main/java"/> <property name="dir.test" value="${basedir}/src/test/java"/> @@ -42,7 +44,7 @@ </target> <target name="init"> - <property name="dist.version" value="${version}${version_suffix}"/> + <property name="dist.version" value="${version}${version_suffix}${release_type}"/> <property name="dist.name" value="tinytim-${dist.version}"/> <property name="tinytim.jar" value="${dist.name}.jar"/> @@ -146,6 +148,7 @@ <!-- Compile source files --> <!-- =================================================================== --> <target name="compile" depends="clean, prepare"> + <replace file="${dir.src}/org/tinytim/Version.java" token="@RELEASE@" value="${dist.version}"/> <javac destdir="${dir.build.classes}" debug="${debug}" target="1.5"> @@ -155,6 +158,7 @@ </classpath> <src path="${dir.src}"/> </javac> + <replace file="${dir.src}/org/tinytim/Version.java" token="${dist.version}" value="@RELEASE@"/> </target> <!-- =================================================================== --> @@ -175,10 +179,11 @@ <exclude name="org/tinytim/core/**"/> <exclude name="org/tinytim/index/**"/> <exclude name="org/tinytim/internal/**"/> + <exclude name="org/tinytim/utils/Property.*"/> </fileset> <!-- <doclet name="net.gleamynode.apiviz.APIviz" - path="${dir.lib}/apiviz-1.1.3.jar"> + path="${dir.lib}/apiviz-1.2.4.GA.jar"> </doclet> --> <link href="http://www.tmapi.org/2.0/api/"/> @@ -199,7 +204,7 @@ <manifest> <attribute name="Implementation-Title" value="tinyTiM"/> <attribute name="Implementation-Version" value="${dist.version}"/> - <attribute name="Implementation-URL" value="http://sourceforge.net/projects/tinytim"/> + <attribute name="Implementation-URL" value="http://tinytim.sourceforge.net/"/> </manifest> </jar> </target> @@ -215,7 +220,7 @@ <manifest> <attribute name="Implementation-Title" value="tinyTiM Tests"/> <attribute name="Implementation-Version" value="${dist.version}"/> - <attribute name="Implementation-URL" value="http://sourceforge.net/projects/tinytim"/> + <attribute name="Implementation-URL" value="http://tinytim.sourceforge.net/"/> </manifest> </jar> </target> @@ -232,6 +237,7 @@ <copy todir="${dir.dist}/src"> <fileset dir="${dir.src}"/> </copy> + <replace file="${dir.dist}/src/org/tinytim/Version.java" token="@RELEASE@" value="${dist.version}"/> <copy todir="${dir.dist}/test"> <fileset dir="${dir.test}"/> </copy> @@ -239,8 +245,10 @@ <fileset dir="${dir.lib}"> <include name="tmapi*"/> <include name="junit*"/> + <include name="trove*"/> + <include name="LICENSE.tmapi*"/> <include name="LICENSE.junit*"/> - <include name="LICENSE.tmapi*"/> + <include name="LICENSE.trove*"/> </fileset> </copy> Modified: tinytim/trunk/src/main/java/org/tinytim/Version.java =================================================================== --- tinytim/trunk/src/main/java/org/tinytim/Version.java 2008-11-14 14:10:29 UTC (rev 192) +++ tinytim/trunk/src/main/java/org/tinytim/Version.java 2008-11-14 15:42:28 UTC (rev 193) @@ -23,16 +23,14 @@ */ public class Version { - private static final String _MAJOR = "@MAJOR@"; - private static final String _MINOR = "@MINOR@"; - private static final String _MICRO = "@MICRO@"; - private static final String _STATE ="@STATE@"; - private static final String _DATE = "@DATE@"; + private Version() { + // noop. + } /** * The release information. */ // Not final since Java compilers copy the string into classes - public static String RELEASE = _MAJOR + "." + _MINOR + "." + _MICRO + _STATE + _DATE; + public static String RELEASE = "@RELEASE@"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |