svn commit: r534283 - /maven/maven-1/core/trunk/maven.xml

[ah...@apache.org]

Author: aheritier
Date: Tue May  1 17:11:14 2007
New Revision: 534283

URL: http://svn.apache.org/viewvc?view=rev&rev=534283
Log:
Optimize calls ...

Modified:
    maven/maven-1/core/trunk/maven.xml

Modified: maven/maven-1/core/trunk/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/maven.xml?view=diff&rev=534283&r1=534282&r2=534283
==============================================================================
--- maven/maven-1/core/trunk/maven.xml (original)
+++ maven/maven-1/core/trunk/maven.xml Tue May  1 17:11:14 2007
@@ -149,7 +149,6 @@
 
   <goal name="maven:build-tar" prereqs="maven:build-install">
     <j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
-    <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}"/>
     <ant:tar longfile="gnu" tarfile="${maven.build.dir}/installer/${tag}.tar">
       <ant:tarfileset dir="${maven.build.dir}/installer">
         <ant:include name="${tag}/**"/>
@@ -173,9 +172,11 @@
       <ant:zipfileset dir="${maven.build.dir}/installer" includes="${tag}/**"/>
     </ant:zip>
   </goal>
-  <goal name="maven:build-exe" prereqs="maven:build-tar">
+  <goal name="maven:build-exe" prereqs="maven:build-install">
     <j:choose>
       <j:when test="${systemScope['os.name'].startsWith('Windows')}">
+        <j:set var="tag" value="${pom.artifactId}-${pom.currentVersion}"/>
+        <j:set var="installerDir" value="${maven.build.dir}/installer/${tag}"/>
         <j:set var="maven.nsis.build.dir" value="${installerDir}"/>
         <attainGoal name="nsis"/>
         <ant:copy tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}.exe" file="${maven.build.dir}/${maven.nsis.final.name}.exe"/>