[GRASS-SVN] r53036 - grass/branches/develbranch_6/mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2012-08-31 13:47:05 -0700 (Fri, 31 Aug 2012)
New Revision: 53036

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
   grass/branches/develbranch_6/mswindows/GRASS-Packager.bat.tmpl
Log:
better GRASS-R-integration (Ticket #1149) - step 2: adapt GRASS-Installer.nsi.tmpl, GRASS-Packager.bat.tmpl

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2012-08-31 20:11:56 UTC (rev 53035)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2012-08-31 20:47:05 UTC (rev 53036)
@@ -10,11 +10,11 @@
 
 ;Define the source path of the demolocation files
 
-!define DEMOLOCATION_PATH "c:\osgeo4w\usr\src\grass_trunk\demolocation"
+!define DEMOLOCATION_PATH "c:\osgeo4w\usr\src\grass6_devel\demolocation"
 
 ;Define the source of the patched msys.bat
 
-!define MSYS_BATCH "C:\OSGeo4W\usr\src\grass_trunk\mswindows\osgeo4w\msys.bat"
+!define MSYS_BATCH "C:\OSGeo4W\usr\src\grass6_devel\mswindows\osgeo4w\msys.bat"
 
 ;Select if you are building a "Development Version" (Devel) or a "Release Version" (Release) of the GRASS Installer
 
@@ -195,16 +195,16 @@
 	Var /GLOBAL MESSAGE_2_
 	Var /GLOBAL MESSAGE_3_
 	
-	Var /GLOBAL R_HKLM_INSTALL_PATH 
-	Var /GLOBAL R_HKCU_INSTALL_PATH
+;	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"
+;	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"
@@ -679,14 +679,14 @@
 	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}
+;	${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%"'

Modified: grass/branches/develbranch_6/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Packager.bat.tmpl	2012-08-31 20:11:56 UTC (rev 53035)
+++ grass/branches/develbranch_6/mswindows/GRASS-Packager.bat.tmpl	2012-08-31 20:47:05 UTC (rev 53036)
@@ -74,6 +74,13 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
+ at echo Copy 'Windows batchfiles for use with R' (GRASS-R-integration) from source to PACKAGE_DIR\extrabin
+ at echo -----------------------------------------------------------------------------------------------------------------------
+ at echo.
+
+copy %OSGEO4W_DIR%\usr\src\grass6_devel\mswindows\external\rbatch\* %PACKAGE_DIR%\extrabin
+ at echo.
+ at echo -----------------------------------------------------------------------------------------------------------------------
 @echo Copy SQLite content to PACKAGE_DIR\sqlite
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.