dion 2004/07/04 07:27:30
Modified: nsis plugin.jelly
nsis/src/plugin-resources/templates setup.jelly
Log:
Fix for MPNSIS-2. Create .exe in distributions directory.
Revision Changes Path
1.7 +3 -1 maven-plugins/nsis/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/nsis/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 4 Jul 2004 12:26:39 -0000 1.6
+++ plugin.jelly 4 Jul 2004 14:27:30 -0000 1.7
@@ -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"/>
1.12 +1 -1 maven-plugins/nsis/src/plugin-resources/templates/setup.jelly
Index: setup.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/nsis/src/plugin-resources/templates/setup.jelly,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- setup.jelly 4 Jul 2004 12:25:15 -0000 1.11
+++ setup.jelly 4 Jul 2004 14:27:30 -0000 1.12
@@ -54,7 +54,7 @@
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
