dion        2004/07/07 21:34:14

  Modified:    nsis     plugin.jelly
               nsis/xdocs changes.xml
  Log:
  Check maven.nsis.exe exists before using it.
  
  Revision  Changes    Path
  1.8       +4 -1      maven-plugins/nsis/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven-plugins/nsis/plugin.jelly,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- plugin.jelly      4 Jul 2004 14:27:30 -0000       1.7
  +++ plugin.jelly      8 Jul 2004 04:34:14 -0000       1.8
  @@ -21,7 +21,6 @@
   <project 
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
  -  xmlns:dist="dist"
     xmlns:license="license"
     xmlns:maven="jelly:maven"
     xmlns:util="jelly:util">
  @@ -77,6 +76,10 @@
     
       <j:set var="script" value="${maven.build.dir}/setup.nsi"/>
   
  +    <util:file var="nsisExeFile" name="${maven.nsis.exe}" />
  +    <j:if test="${!nsisExeFile.exists()}">
  +      <fail>The NSIS executable '${maven.nsis.exe}' could not be found</fail>
  +    </j:if>
       <maven:get var="maven.dist.dir" plugin="maven-dist-plugin" 
property="maven.dist.dir"/>
       <mkdir dir="${maven.dist.dir}"/>
       <!-- call makensis.exe with the setup.nsi file -->
  
  
  
  1.12      +1 -0      maven-plugins/nsis/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/nsis/xdocs/changes.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- changes.xml       8 Jul 2004 04:19:44 -0000       1.11
  +++ changes.xml       8 Jul 2004 04:34:14 -0000       1.12
  @@ -26,6 +26,7 @@
     <body>
     
       <release version="1.2-SNAPSHOT" date="Unreleased">
  +      <action dev="dion" type="fix" due-to="Geoffrey">Check maven.nsis.exe exists 
before using it.</action>
         <action dev="dion" type="add" due-to="Geoffrey">Add faq</action>
         <action dev="dion" type="update">
           Add back license to project.xml after the scm plugin removed it.
  
  
  

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

Reply via email to