[GRASS-SVN] r53034 - grass/trunk/mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Aug 31 12:52:44 PDT 2012
Author: hellik
Date: 2012-08-31 12:52:43 -0700 (Fri, 31 Aug 2012)
New Revision: 53034
Modified:
grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
grass/trunk/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/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl 2012-08-31 19:34:51 UTC (rev 53033)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl 2012-08-31 19:52:43 UTC (rev 53034)
@@ -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"
@@ -676,14 +676,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%"'
@@ -710,14 +710,14 @@
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}
+; ${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/trunk/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Packager.bat.tmpl 2012-08-31 19:34:51 UTC (rev 53033)
+++ grass/trunk/mswindows/GRASS-Packager.bat.tmpl 2012-08-31 19:52:43 UTC (rev 53034)
@@ -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\grass_trunk\mswindows\external\rbatch\* %PACKAGE_DIR%\extrabin
+ at echo.
+ at echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy SQLite content to PACKAGE_DIR\sqlite
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
More information about the grass-commit
mailing list