dion 2004/07/10 01:57:27
Modified: nsis/xdocs customizing.xml changes.xml
nsis/src/plugin-resources/templates project.jelly
setup.jelly
Log:
Rename ORGANIZATION constant to PROJECT_ORGANIZATION.
Revision Changes Path
1.7 +2 -2 maven-plugins/nsis/xdocs/customizing.xml
Index: customizing.xml
===================================================================
RCS file: /home/cvs/maven-plugins/nsis/xdocs/customizing.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- customizing.xml 5 Jul 2004 12:39:38 -0000 1.6
+++ customizing.xml 10 Jul 2004 08:57:27 -0000 1.7
@@ -82,7 +82,6 @@
</p>
<table>
<tr><th>Constant</th> <th>Value</th></tr>
- <tr><td>ORGANIZATION</td> <td>${pom.organization}</td></tr>
<tr><td>PROJECT_BUILD_DIR</td> <td>${maven.build.dir}</td></tr>
<tr><td>PROJECT_DIST_BIN_DIR</td>
<td>${maven.dist.bin.assembly.dir}</td></tr>
<tr><td>PROJECT_DIST_DIR</td> <td>${maven.dist.dir}</td></tr>
@@ -91,7 +90,8 @@
<tr><td>PROJECT_LICENSE_TEXT</td>
<td>${maven.nsis.license.text}</td></tr>
<tr><td>PROJECT_LOGO</td> <td>${maven.nsis.logo}</td></tr>
<tr><td>PROJECT_NAME</td> <td>${pom.name}</td></tr>
- <tr><td>PROJECT_REG_KEY</td>
<td>SOFTWARE\${pom.organization}\${pom.name}\${pom.currentVersion}</td></tr>
+ <tr><td>PROJECT_ORGANIZATION</td>
<td>${pom.organization.name}</td></tr>
+ <tr><td>PROJECT_REG_KEY</td>
<td>SOFTWARE\${pom.organization.name}\${pom.name}\${pom.currentVersion}</td></tr>
<tr><td>PROJECT_REG_UNINSTALL_KEY</td>
<td>Software\Microsoft\Windows\CurrentVersion\Uninstall\${pom.name}
${pom.currentVersion}</td></tr>
<tr><td>PROJECT_STARTMENU_FOLDER</td>
<td>$$SMPROGRAMS\${pom.organization}\${pom.name} ${pom.currentVersion}</td></tr>
<tr><td>PROJECT_URL</td> <td>${pom.url}</td></tr>
1.15 +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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 9 Jul 2004 13:59:34 -0000 1.14
+++ changes.xml 10 Jul 2004 08:57:27 -0000 1.15
@@ -26,6 +26,7 @@
<body>
<release version="1.2-SNAPSHOT" date="Unreleased">
+ <action dev="dion" type="update">Rename <code>ORGANIZATION</code> constant to
<code>PROJECT_ORGANIZATION.</code></action>
<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.</action>
1.11 +1 -1 maven-plugins/nsis/src/plugin-resources/templates/project.jelly
Index: project.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/nsis/src/plugin-resources/templates/project.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.jelly 9 Jul 2004 12:52:34 -0000 1.10
+++ project.jelly 10 Jul 2004 08:57:27 -0000 1.11
@@ -31,7 +31,6 @@
; generated by ${user.name} from project.xml version ${pom.currentVersion}
; on date ${TODAY}, time ${TSTAMP}
-!define ORGANIZATION "${pom.organization.name}"
!define PROJECT_BUILD_DIR "${build}"
!define PROJECT_DIST_BIN_DIR "${maven.dist.bin.assembly.dir}"
!define PROJECT_DIST_DIR "${maven.dist.dir}"
@@ -41,6 +40,7 @@
!define PROJECT_LICENSE_TEXT "${maven.nsis.license.text}"
</util:available>
!define PROJECT_NAME "${pom.name}"
+!define PROJECT_ORGANIZATION "${pom.organization.name}"
!define PROJECT_REG_KEY
"SOFTWARE\${pom.organization.name}\${pom.name}\${pom.currentVersion}"
!define PROJECT_REG_UNINSTALL_KEY
"Software\Microsoft\Windows\CurrentVersion\Uninstall\${pom.name} ${pom.currentVersion}"
!define PROJECT_STARTMENU_FOLDER "$$SMPROGRAMS\${pom.organization.name}\${pom.name}
${pom.currentVersion}"
1.16 +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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- setup.jelly 7 Jul 2004 21:01:52 -0000 1.15
+++ setup.jelly 10 Jul 2004 08:57:27 -0000 1.16
@@ -74,7 +74,7 @@
!endif
; The default installation directory
-InstallDir "$$PROGRAMFILES\$${ORGANIZATION}\$${PROJECT_NAME} $${PROJECT_VERSION}"
+InstallDir "$$PROGRAMFILES\$${PROJECT_ORGANIZATION}\$${PROJECT_NAME}
$${PROJECT_VERSION}"
; Registry key to check for directory (so if you upgrade, it will
; overwrite the old one automatically)
InstallDirRegKey HKLM "$${PROJECT_REG_KEY}" "Install_Dir"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]