Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename ORGANIZATION constant to PROJECT_ORGANIZATION.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115760 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
dion
2004-07-10 08:57:27 +00:00
parent 05808b9db7
commit ca4a0908d4
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nsis/src/plugin-resources/templates/project.jelly
View File

@@ -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}"

2
nsis/src/plugin-resources/templates/setup.jelly
View File

@@ -74,7 +74,7 @@ SetFont "Arial" 8
!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"

1
nsis/xdocs/changes.xml
View File

@@ -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>

4
nsis/xdocs/customizing.xml
View File

@@ -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>