From ca4a0908d47ac7ec21cf26d81c43ea1833fa111d Mon Sep 17 00:00:00 2001 From: dion Date: Sat, 10 Jul 2004 08:57:27 +0000 Subject: [PATCH] Rename ORGANIZATION constant to PROJECT_ORGANIZATION. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115760 13f79535-47bb-0310-9956-ffa450edef68 --- nsis/src/plugin-resources/templates/project.jelly | 2 +- nsis/src/plugin-resources/templates/setup.jelly | 2 +- nsis/xdocs/changes.xml | 1 + nsis/xdocs/customizing.xml | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nsis/src/plugin-resources/templates/project.jelly b/nsis/src/plugin-resources/templates/project.jelly index c13c319e..745487fa 100644 --- a/nsis/src/plugin-resources/templates/project.jelly +++ b/nsis/src/plugin-resources/templates/project.jelly @@ -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}" !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}" diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly index b617190b..50a49018 100644 --- a/nsis/src/plugin-resources/templates/setup.jelly +++ b/nsis/src/plugin-resources/templates/setup.jelly @@ -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" diff --git a/nsis/xdocs/changes.xml b/nsis/xdocs/changes.xml index 4c45afa3..8b1f54ea 100644 --- a/nsis/xdocs/changes.xml +++ b/nsis/xdocs/changes.xml @@ -26,6 +26,7 @@ + Rename ORGANIZATION constant to PROJECT_ORGANIZATION. Check maven.nsis.exe exists before using it. Add faq Add back license to project.xml after the scm plugin removed it. diff --git a/nsis/xdocs/customizing.xml b/nsis/xdocs/customizing.xml index eb8f61f4..c0c70b99 100644 --- a/nsis/xdocs/customizing.xml +++ b/nsis/xdocs/customizing.xml @@ -82,7 +82,6 @@

- @@ -91,7 +90,8 @@ - + +
Constant Value
ORGANIZATION ${pom.organization}
PROJECT_BUILD_DIR ${maven.build.dir}
PROJECT_DIST_BIN_DIR ${maven.dist.bin.assembly.dir}
PROJECT_DIST_DIR ${maven.dist.dir}
PROJECT_LICENSE_TEXT ${maven.nsis.license.text}
PROJECT_LOGO ${maven.nsis.logo}
PROJECT_NAME ${pom.name}
PROJECT_REG_KEY SOFTWARE\${pom.organization}\${pom.name}\${pom.currentVersion}
PROJECT_ORGANIZATION ${pom.organization.name}
PROJECT_REG_KEY SOFTWARE\${pom.organization.name}\${pom.name}\${pom.currentVersion}
PROJECT_REG_UNINSTALL_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\${pom.name} ${pom.currentVersion}
PROJECT_STARTMENU_FOLDER $$SMPROGRAMS\${pom.organization}\${pom.name} ${pom.currentVersion}
PROJECT_URL ${pom.url}