diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly index dc598a66..404094ea 100644 --- a/nsis/src/plugin-resources/templates/setup.jelly +++ b/nsis/src/plugin-resources/templates/setup.jelly @@ -26,8 +26,9 @@ ; Author Kristen Gillard ; Author Dion Gillard +; Author Arnaud Heritier ; Setup Script for NSIS -; http://maven.apache.org/maven-1.x/reference/plugins/nsis/ +; http://maven.apache.org/maven-1.x/plugins/nsis/ ; add directories for the source if it exists, and the plugin @@ -41,9 +42,9 @@ ; macro for the image on the install screen !include "BrandingImage.nsh" +; macro to check if the jdk is installed !include "JDK.nsh" -; register environment variables in the system scope -!define ALL_USERS + !include "Environment.nsh" ; include project specific details @@ -172,4 +173,4 @@ Function un.onGUIInit FunctionEnd ; -------------------------------------------------------------- End of File - \ No newline at end of file + diff --git a/nsis/xdocs/changes.xml b/nsis/xdocs/changes.xml index c77923b1..5a83e41c 100644 --- a/nsis/xdocs/changes.xml +++ b/nsis/xdocs/changes.xml @@ -24,7 +24,6 @@ - Set environment variables in system scope instead of user scope. NSIS plugin does not support silent uninstall. Remove the final dialog box.