[GRASS-SVN] r41721 - grass/trunk/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-04 15:13:20 -0400 (Sun, 04 Apr 2010)
New Revision: 41721

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi
   grass/trunk/mswindows/GRASS-Packager.bat
Log:
upgrade wingrass package files

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2010-04-04 18:19:57 UTC (rev 41720)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2010-04-04 19:13:20 UTC (rev 41721)
@@ -27,7 +27,7 @@
 !define DEV70_VERSION_NUMBER "7.0.SVN"
 !define DEV70_SVN_REVISION "36599"
 !define DEV70_BINARY_REVISION "1"
-!define DEV70_GRASS_COMMAND "grass70svn"
+!define DEV70_GRASS_COMMAND "grass70"
 !define DEV70_GRASS_BASE "GRASS-70-SVN"
 
 ;----------------------------------------------------------------------------------------------------------------------------

Modified: grass/trunk/mswindows/GRASS-Packager.bat
===================================================================
--- grass/trunk/mswindows/GRASS-Packager.bat	2010-04-04 18:19:57 UTC (rev 41720)
+++ grass/trunk/mswindows/GRASS-Packager.bat	2010-04-04 19:13:20 UTC (rev 41721)
@@ -17,6 +17,7 @@
 set OSGEO4W_DIR=c:\osgeo4w
 
 set GRASS_PREFIX=%OSGEO4W_DIR%\apps\grass\grass-7.0.svn
+set GRASS_BIN_PREFIX=%OSGEO4W_DIR%\apps\grass\bin
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
@@ -29,10 +30,11 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy %GRASS_PREFIX% content to PACKAGE_DIR
+ at echo Copy %GRASS_PREFIX% & %GRASS_BIN_PREFIX% content to PACKAGE_DIR
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.
 
+xcopy %GRASS_BIN_PREFIX%\grass70* %PACKAGE_DIR% /S/V/F
 xcopy %GRASS_PREFIX% %PACKAGE_DIR% /S/V/F
 
 @echo.