don't pass path to java-to-jar macro

scarytom · scarytom · commit c32167cdaf78 · 2012-06-10T12:47:39.000+01:00
diff --git a/build.xml b/build.xml
@@ -12,20 +12,20 @@
 
     <target name="generator" description="Build code generator tool">
         <java-to-jar srcdir="hamcrest-generator/src/main/java"
-                     destjar="build/temp/hamcrest-generator-${version}-nodeps"
+                     destjar="hamcrest-generator-${version}-nodeps"
                      classpath="lib/generator/qdox-1.12.jar"/>
 
         <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
         <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
         <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-            <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
+            <zipfileset src="build/hamcrest-generator-${version}-nodeps.jar"/>
             <zipfileset src="lib/generator/qdox-1.12.jar"/>
             <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
         </jarjar>
     </target>
 
     <target name="core" depends="generator" description="Build core Hamcrest library">
-        <java-to-jar srcdir="hamcrest-core/src/main/java" destjar="build/hamcrest-core-${version}"/>
+        <java-to-jar srcdir="hamcrest-core/src/main/java" destjar="hamcrest-core-${version}"/>
 
         <!-- Generate one class with all static imports -->
         <mkdir dir="build/temp/hamcrest-core/generated-code"/>
@@ -44,7 +44,7 @@
         </java>
         <!-- Append to core jar -->
         <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
-                     destjar="build/hamcrest-core-${version}"
+                     destjar="hamcrest-core-${version}"
                      classpath="build/hamcrest-core-${version}.jar"/>
     </target>
 
@@ -53,7 +53,7 @@
             description="Build library of matchers">
         <mkdir dir="build/temp/hamcrest-library/generated-code"/>
         <java-to-jar srcdir="hamcrest-library/src/main/java"
-                     destjar="build/hamcrest-library-${version}"
+                     destjar="hamcrest-library-${version}"
                      classpath="build/hamcrest-core-${version}.jar"/>
         <!-- Generate one class with all static imports -->
         <java classname="org.hamcrest.generator.config.XmlConfigurator"
@@ -71,19 +71,19 @@
         </java>
         <!-- Append to library jar -->
         <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
-                     destjar="build/hamcrest-library-${version}"
+                     destjar="hamcrest-library-${version}"
                      classpath="build/hamcrest-core-${version}.jar"/>
     </target>
 
     <target name="integration" depends="core, library" description="Build integration with external tools">
-        <java-to-jar srcdir="hamcrest-integration/src/main/java" destjar="build/hamcrest-integration-${version}"
+        <java-to-jar srcdir="hamcrest-integration/src/main/java" destjar="hamcrest-integration-${version}"
                      classpath="
                         build/hamcrest-core-${version}.jar;
                         build/hamcrest-library-${version}.jar"/>
     </target>
     
     <target name="unit-test" depends="core, library, integration, generator" description="Build and run unit tests.">
-        <java-to-jar srcdir="hamcrest-unit-test/src/main/java" destjar="build/hamcrest-unit-test-${version}"
+        <java-to-jar srcdir="hamcrest-unit-test/src/main/java" destjar="hamcrest-unit-test-${version}"
                      classpath="
                         build/hamcrest-core-${version}.jar;
                         build/hamcrest-library-${version}.jar;
@@ -112,7 +112,7 @@
 
     <target name="examples" depends="core, library, integration" description="Build and run unit tests.">
         <java-to-jar srcdir="hamcrest-examples/src/main/java"
-                     destjar="build/hamcrest-examples-${version}"
+                     destjar="hamcrest-examples-${version}"
                      classpath="
                         build/hamcrest-core-${version}.jar;
                         build/hamcrest-library-${version}.jar;
@@ -207,7 +207,7 @@
             <copy todir="build/temp/@{destjar}.jar.contents">
                 <fileset dir="@{srcdir}"/>
             </copy>
-            <jar jarfile="@{destjar}.jar">
+            <jar jarfile="build/@{destjar}.jar">
                 <fileset dir="build/temp/@{destjar}.jar.contents"/>
             </jar>
         </sequential>
