[GRASS-SVN] r59706 - grass/branches/releasebranch_7_0/mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2014-04-13 05:15:54 -0700 (Sun, 13 Apr 2014)
New Revision: 59706

Modified:
   grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
Log:
wingrass-R: remove unused hardcoded path to R as path to R is loaded now dynamically to path (merged from trunk)

Modified: grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2014-04-13 12:08:09 UTC (rev 59705)
+++ grass/branches/releasebranch_7_0/mswindows/GRASS-Installer.nsi.tmpl	2014-04-13 12:15:54 UTC (rev 59706)
@@ -200,17 +200,11 @@
 	Var /GLOBAL MESSAGE_2_
 	Var /GLOBAL MESSAGE_3_
 	
-;	Var /GLOBAL R_HKLM_INSTALL_PATH 
-;	Var /GLOBAL R_HKCU_INSTALL_PATH
-	
 	ReadRegStr $UNINSTALL_STRING HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${GRASS_BASE}" "UninstallString"
 	ReadRegStr $INSTALL_PATH HKLM "Software\${GRASS_BASE}" "InstallPath"
 	ReadRegStr $INSTALLED_VERSION_NUMBER HKLM "Software\${GRASS_BASE}" "VersionNumber"
 	ReadRegStr $INSTALLED_SVN_REVISION HKLM "Software\${GRASS_BASE}" "SvnRevision"
 	
-;	ReadRegStr $R_HKLM_INSTALL_PATH HKLM "Software\R-core\R" "InstallPath" 
-;	ReadRegStr $R_HKCU_INSTALL_PATH HKCU "Software\R-core\R" "InstallPath"
-	
 	${If} $INSTALLED_SVN_REVISION == ""
 		ReadRegStr $INSTALLED_SVN_REVISION HKLM "Software\${GRASS_BASE}" "Revision"
 	${EndIf}	
@@ -692,14 +686,6 @@
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'set GISBASE=$INSTALL_DIR$\r$\n'
 	FileWrite $0 '$\r$\n'
-;	${If} $R_HKLM_INSTALL_PATH != ""
-;	FileWrite $0 'set PATH=$R_HKLM_INSTALL_PATH\bin;%PATH%$\r$\n'
-;	FileWrite $0 '$\r$\n'
-;	${EndIf}
-;	${If} $R_HKCU_INSTALL_PATH != ""
-;	FileWrite $0 'set PATH=$R_HKCU_INSTALL_PATH\bin;%PATH%$\r$\n'
-;	FileWrite $0 '$\r$\n'
-;	${EndIf}
 	FileWrite $0 'call "%GISBASE%\etc\env.bat"$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'cd "%USERPROFILE%"'
@@ -731,14 +717,6 @@
 	; FileWrite $0 'set GISBASE=$INSTALL_DIR$\r$\n'
 	; FileWrite $0 'set GRASS_SH=%GISBASE%\msys\bin\sh.exe$\r$\n'
 	; FileWrite $0 '$\r$\n'
-;	${If} $R_HKLM_INSTALL_PATH != ""
-;	FileWrite $0 'set PATH=$R_HKLM_INSTALL_PATH\bin;%PATH%$\r$\n'
-;	FileWrite $0 '$\r$\n'
-;	${EndIf}
-;	${If} $R_HKCU_INSTALL_PATH != ""
-;	FileWrite $0 'set PATH=$R_HKCU_INSTALL_PATH\bin;%PATH%$\r$\n'
-;	FileWrite $0 '$\r$\n'
-;	${EndIf}
 	; FileWrite $0 'call "%GISBASE%\etc\env.bat"$\r$\n'
 	; FileWrite $0 '$\r$\n'
 	; FileWrite $0 'cd "%USERPROFILE%"'