Mercurial > jhg

changeset 105:0617dd31477f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add version identifier to jar name.
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Sat, 29 Jan 2011 01:57:43 +0100
parents 54562de502f7
children 5c43e937e15b
files .hgignore build.xml
diffstat 2 files changed, 18 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Fri Jan 28 17:51:54 2011 +0100
+++ b/.hgignore	Sat Jan 29 01:57:43 2011 +0100
@@ -1,7 +1,7 @@
 syntax:glob
 bin
 src/Extras.java
-hg4j.jar
-hg4j-tests.jar
-hg4j-console.jar
+hg4j*.jar
+hg4j-tests*.jar
+hg4j-console*.jar
 TEST-*.xml
--- a/build.xml	Fri Jan 28 17:51:54 2011 +0100
+++ b/build.xml	Sat Jan 29 01:57:43 2011 +0100
@@ -21,19 +21,27 @@
     </description>
 	
 	<property name="junit.jar" value="lib/junit-4.8.2.jar"/>
+	<property name="ver.qualifier" value=".rc1"/>
+	<property name="version.lib" value="0.0.9"/>
+	<property name="version.jar" value="${version.lib}${ver.qualifier}"/>
+	
+	<property name="hg4j.jar" value="hg4j_${version.jar}.jar"/>
+	<property name="hg4j-tests.jar" value="hg4j-tests_${version.jar}.jar"/>
+	<property name="hg4j-console.jar" value="hg4j-console_${version.jar}.jar"/>
 
     <target name="samples" depends="build-cmdline">
+    	<path id="path.cmdline" path="${hg4j.jar};${hg4j-console.jar}"/>
     	
     	<echo message="History of a specific file(s)"/>
-    	<java classpath="hg4j.jar;hg4j-console.jar" classname="org.tmatesoft.hg.console.Log">
+    	<java classpathref="path.cmdline" classname="org.tmatesoft.hg.console.Log">
     		<arg line="design.txt .classpath src/com/tmate/hgkit/ll/LocalHgRepo.java"/>
     	</java>
     	
     	<echo message="Whole repo log"/>
-    	<java classpath="hg4j.jar;hg4j-console.jar" classname="org.tmatesoft.hg.console.Log"/>
+    	<java classpathref="path.cmdline" classname="org.tmatesoft.hg.console.Log"/>
     	
     	<echo message="Content of a file"/>
-    	<java classpath="hg4j.jar;hg4j-console.jar" classname="org.tmatesoft.hg.console.Cat">
+    	<java classpathref="path.cmdline" classname="org.tmatesoft.hg.console.Cat">
     		<arg line="src/com/tmate/hgkit/ll/Revlog.java"/>
     	</java>
 
@@ -41,7 +49,7 @@
 	
 	<target name="tests" depends="build-tests">
 		<junit>
-			<classpath path="hg4j.jar;hg4j-tests.jar;${junit.jar}"/>
+			<classpath path="${hg4j.jar};${hg4j-tests.jar};${junit.jar}"/>
 			<formatter type="xml"/>
 			<formatter type="plain" usefile="no"/>
 			<test name="org.tmatesoft.hg.test.TestHistory"/>
@@ -59,7 +67,7 @@
     <target name="build">
     	<mkdir dir="bin"/>
     	<javac srcdir="src" destdir="bin"/>
-    	<jar destfile="hg4j.jar">
+    	<jar destfile="${hg4j.jar}">
     		<fileset dir="bin/">
     			<include name="org/tmatesoft/hg/core/**" />
     			<include name="org/tmatesoft/hg/util/**" />
@@ -72,13 +80,13 @@
     <target name="build-tests" depends="build">
     	<mkdir dir="bin"/>
     	<javac srcdir="test" destdir="bin"/>
-    	<jar destfile="hg4j-tests.jar" basedir="bin" includes="org/tmatesoft/hg/test/**"/>
+    	<jar destfile="${hg4j-tests.jar}" basedir="bin" includes="org/tmatesoft/hg/test/**"/>
     </target>
 
     <target name="build-cmdline" depends="build">
     	<mkdir dir="bin"/>
     	<javac srcdir="cmdline" destdir="bin"/>
-    	<jar destfile="hg4j-console.jar" basedir="bin" includes="org/tmatesoft/hg/console/**"/>
+    	<jar destfile="${hg4j-console.jar}" basedir="bin" includes="org/tmatesoft/hg/console/**"/>
     </target>
 
 </project>