Author: aheritier Date: Tue Oct 24 20:12:27 2006 New Revision: 467545 URL: http://svn.apache.org/viewvc?view=rev&rev=467545 Log: MPNSIS-14 : Put MAVEN_HOME in the system environment variables + fix links in startup menu + format files
Modified: maven/maven-1/core/trunk/src/installer/nsis/ (props changed) maven/maven-1/core/trunk/src/installer/nsis/before-install.nsh maven/maven-1/core/trunk/src/installer/nsis/registry-uninstall.nsh maven/maven-1/core/trunk/src/installer/nsis/registry.nsh maven/maven-1/core/trunk/src/installer/nsis/startmenu-shortcuts.nsh Propchange: maven/maven-1/core/trunk/src/installer/nsis/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Oct 24 20:12:27 2006 @@ -0,0 +1 @@ +Thumbs.db Modified: maven/maven-1/core/trunk/src/installer/nsis/before-install.nsh URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/installer/nsis/before-install.nsh?view=diff&rev=467545&r1=467544&r2=467545 ============================================================================== --- maven/maven-1/core/trunk/src/installer/nsis/before-install.nsh (original) +++ maven/maven-1/core/trunk/src/installer/nsis/before-install.nsh Tue Oct 24 20:12:27 2006 @@ -1,2 +1 @@ - Call AssertJavaHome - +Call AssertJavaHome \ No newline at end of file Modified: maven/maven-1/core/trunk/src/installer/nsis/registry-uninstall.nsh URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/installer/nsis/registry-uninstall.nsh?view=diff&rev=467545&r1=467544&r2=467545 ============================================================================== --- maven/maven-1/core/trunk/src/installer/nsis/registry-uninstall.nsh (original) +++ maven/maven-1/core/trunk/src/installer/nsis/registry-uninstall.nsh Tue Oct 24 20:12:27 2006 @@ -1,4 +1,4 @@ - ; Remove $${MAVEN_HOME} - Push "MAVEN_HOME" - Call un.DeleteEnvStr +; Remove $${MAVEN_HOME} +Push "MAVEN_HOME" +Call un.DeleteEnvStr Modified: maven/maven-1/core/trunk/src/installer/nsis/registry.nsh URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/installer/nsis/registry.nsh?view=diff&rev=467545&r1=467544&r2=467545 ============================================================================== --- maven/maven-1/core/trunk/src/installer/nsis/registry.nsh (original) +++ maven/maven-1/core/trunk/src/installer/nsis/registry.nsh Tue Oct 24 20:12:27 2006 @@ -1,10 +1,10 @@ - ; ${MAVEN_HOME} - Push "MAVEN_HOME" - Push "$INSTDIR" - Call WriteEnvStr +; ${MAVEN_HOME} +Push "MAVEN_HOME" +Push "$INSTDIR" +Call WriteEnvStr - ; TODO - Add MAVEN_HOME to the path +; TODO - Add MAVEN_HOME to the path - ; TODO Prompt and write other environment variables to the Registry - ; WriteRegStr HKCU "Environment" "MAVEN_LOCAL_HOME" "$$INSTDIR" +; TODO Prompt and write other environment variables to the Registry +; WriteRegStr HKCU "Environment" "MAVEN_LOCAL_HOME" "$$INSTDIR" Modified: maven/maven-1/core/trunk/src/installer/nsis/startmenu-shortcuts.nsh URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/installer/nsis/startmenu-shortcuts.nsh?view=diff&rev=467545&r1=467544&r2=467545 ============================================================================== --- maven/maven-1/core/trunk/src/installer/nsis/startmenu-shortcuts.nsh (original) +++ maven/maven-1/core/trunk/src/installer/nsis/startmenu-shortcuts.nsh Tue Oct 24 20:12:27 2006 @@ -1,12 +1,12 @@ - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Maven.lnk" "$INSTDIR\bin\maven.bat" "" "$INSTDIR\bin\maven.bat" 0 - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Install Maven Repository.lnk" "$INSTDIR\bin\install_repo.bat" "" "$INSTDIR\install_repo.bat" 0 - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Uninstall.lnk" "$INSTDIR\Uninst.exe" "" "$INSTDIR\Uninst.exe" 0 - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Homepage.lnk" "http://maven.apache.org/maven-1.x/" - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\User Guide.lnk" "http://maven.apache.org/maven-1.x/using/index.html" - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Bundled Plugins.lnk" "http://maven.apache.org/maven-1.x/plugins/bundled/" - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Sandbox Plugins.lnk" "http://maven.apache.org/maven-1.x/plugins/sandbox/" - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Third Party Plugins.lnk" "http://maven.apache.org/maven-1.x/plugins/3rdparty.html" - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Reference.lnk" "http://maven.apache.org/maven-1.x/reference/index.html" - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Report a Bug.lnk" "http://jira.codehaus.org/browse/MAVEN" - CreateShortCut "${PROJECT_STARTMENU_FOLDER}\Frequently Asked Questions.lnk" "http://maven.apache.org/maven-1.x/faq.html" +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\01 - Maven.lnk" "$INSTDIR\bin\maven.bat" "" "$INSTDIR\bin\maven.bat" 0 +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\02 - Install Maven Repository.lnk" "$INSTDIR\bin\install_repo.bat" "" "$INSTDIR\install_repo.bat" 0 +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\03 - Uninstall.lnk" "$INSTDIR\Uninst.exe" "" "$INSTDIR\Uninst.exe" 0 +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\04 - Homepage.url" "http://maven.apache.org/maven-1.x/" +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\05 - User Guide.url" "http://maven.apache.org/maven-1.x/using/index.html" +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\06 - Bundled Plugins.url" "http://maven.apache.org/maven-1.x/plugins/bundled/" +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\07 - Sandbox Plugins.url" "http://maven.apache.org/maven-1.x/plugins/sandbox/" +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\08 - Third Party Plugins.url" "http://maven.apache.org/maven-1.x/plugins/3rdparty.html" +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\09 - Reference.url" "http://maven.apache.org/maven-1.x/reference/index.html" +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\10 - Report a Bug.url" "http://jira.codehaus.org/browse/MAVEN" +CreateShortCut "${PROJECT_STARTMENU_FOLDER}\11 - Frequently Asked Questions.url" "http://maven.apache.org/maven-1.x/faq.html"