From 2e29f9df8171a07960f140ee94c46afc6da69084 Mon Sep 17 00:00:00 2001
From: dion <dion@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 4 Jul 2004 14:27:30 +0000
Subject: [PATCH] Fix for MPNSIS-2. Create .exe in distributions directory.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115643 13f79535-47bb-0310-9956-ffa450edef68
---
 nsis/plugin.jelly                               | 4 +++-
 nsis/src/plugin-resources/templates/setup.jelly | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nsis/plugin.jelly b/nsis/plugin.jelly
index 760a467f..74066634 100644
--- a/nsis/plugin.jelly
+++ b/nsis/plugin.jelly
@@ -38,7 +38,7 @@
 
   <goal name="nsis:generate-project"
     description="Generate NSIS project.nsh file">
-    
+    <maven:get var="maven.dist.bin.assembly.dir" plugin="maven-dist-plugin" property="maven.dist.bin.assembly.dir"/>
     <maven:param-check value="${maven.dist.bin.assembly.dir}" fail="true" 
     	message="'maven.dist.bin.assembly.dir' must be specified. It is the directory containing files to be placed in the installer"/>
 
@@ -77,6 +77,8 @@
   
     <j:set var="script" value="${maven.build.dir}/setup.nsi"/>
 
+    <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 -->
     <ant:exec executable="${maven.nsis.exe}">
       <arg value="/V2"/>
diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly
index 6df34d3a..1bb19b83 100644
--- a/nsis/src/plugin-resources/templates/setup.jelly
+++ b/nsis/src/plugin-resources/templates/setup.jelly
@@ -54,7 +54,7 @@ CRCCheck on
 Name "$${PROJECT_NAME}"
 
 ; Maven Setup executable
-OutFile "$${PROJECT_BUILD_DIR}\$${PROJECT_FINAL_NAME}.exe"
+OutFile "$${PROJECT_DIST_DIR}\$${PROJECT_FINAL_NAME}.exe"
 
 ; Adds an XP manifest to the installer
 XPStyle on