correct name of nodeps generator jar

scarytom · scarytom · commit 0daf8352f565 · 2012-06-10T17:13:24.000+01:00
diff --git a/build.xml b/build.xml
@@ -12,17 +12,17 @@
 
     <target name="generator" description="Build code generator tool">
         <java-to-jar srcdir="hamcrest-generator/src/main/java"
-                     modulename="hamcrest-generator-${version}-nodeps"
+                     modulename="hamcrest-generator-nodeps-${version}"
                      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/hamcrest-generator-${version}-nodeps.jar"/>
+            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
             <zipfileset src="lib/generator/qdox-1.12.jar"/>
             <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
         </jarjar>
-        <copy file="build/hamcrest-generator-${version}-nodeps-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
+        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
     </target>
 
     <target name="core" depends="generator" description="Build core Hamcrest library">
@@ -137,11 +137,11 @@
     </target>
 
     <target name="javadoc" description="build javadoc jars">
-        <java-to-javadoc-jar modulename="hamcrest-generator-${version}-nodeps"/>
+        <java-to-javadoc-jar modulename="hamcrest-generator-nodeps-${version}"/>
         <java-to-javadoc-jar modulename="hamcrest-core-${version}"/>
         <java-to-javadoc-jar modulename="hamcrest-library-${version}"/>
         <java-to-javadoc-jar modulename="hamcrest-integration-${version}"/>
-        <copy file="build/hamcrest-generator-${version}-nodeps-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
+        <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
 
         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
@@ -229,7 +229,7 @@
         </tar>
     </target>
 
-    <target name="bundle" description="Create a release bundle for deployment to maven central" depends="clean,package">
+    <target name="bundle" description="Create a release bundle for deployment to maven central" depends="clean, package">
         <exec executable="gpg" dir="build"><arg value="-ab"/><arg value="hamcrest-core-${version}.pom"/></exec>
         <exec executable="gpg" dir="build"><arg value="-ab"/><arg value="hamcrest-core-${version}.jar"/></exec>
         <exec executable="gpg" dir="build"><arg value="-ab"/><arg value="hamcrest-core-${version}-javadoc.jar"/></exec>
