brett       2004/03/10 06:35:06

  Modified:    .        Tag: MAVEN-1_0-BRANCH maven.xml
  Log:
  nsis fixes
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.97.2.19 +3 -3      maven/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven/maven.xml,v
  retrieving revision 1.97.2.18
  retrieving revision 1.97.2.19
  diff -u -r1.97.2.18 -r1.97.2.19
  --- maven.xml 10 Mar 2004 13:58:57 -0000      1.97.2.18
  +++ maven.xml 10 Mar 2004 14:35:06 -0000      1.97.2.19
  @@ -203,7 +203,7 @@
           <j:set var="version" 
value="${reactorProject.versions[size(reactorProject.versions)-2]}" />
         </j:if>
         <j:if test="${version == null}">
  -        <ant:echo>WARNING: no version for ${reactorProject} (TODO: fail 
instead)</ant:echo>
  +        <ant:fail>WARNING: no version for ${reactorProject})</ant:fail>
         </j:if>
         <j:if test="${version != null}">
           <ant:echo>Downloading ${reactorProject.artifactId} version 
${version}</ant:echo>
  @@ -247,9 +247,9 @@
   
       <j:choose>
         <j:when test="${systemScope['os.name'].startsWith('Windows')}">
  -        <j:set var="maven.dist.bin.assembly.dir" value="${installerDir}/${tag}" />
  +        <j:set var="maven.dist.bin.assembly.dir" value="${installerDir}" />
           <attainGoal name="nsis" />
  -        <ant:copy 
tofile="${installerDir}/${pom.artifactId}-${pom.currentVersion}.exe" 
file="${maven.build.dir}/${pom.artifactId}.exe" />
  +        <ant:copy 
tofile="${maven.build.dir}/installer/${pom.artifactId}-${pom.currentVersion}.exe" 
file="${maven.build.dir}/${pom.artifactId}.exe" />
         </j:when>
         <j:otherwise>
           <ant:echo>WARNING: nsis installer not generated. Run again on windows if 
needed.</ant:echo>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to