updates and new icons from Colin Nielsen (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37902 15284696-431f-4ddb-bdfa-cd5b030d7da7

mswindows/GRASS-Installer.nsi

@@ -430,6 +430,8 @@ Section "GRASS" SecGRASS
 	SetOutPath "$INSTALL_DIR\icons"
 	File .\Installer-Files\GRASS.ico
 	File .\Installer-Files\GRASS_Web.ico
+	File .\Installer-Files\GRASS_tcltk.ico
+	File .\Installer-Files\GRASS_MSys.ico
 	File .\Installer-Files\GRASS_CMD.ico
 	File .\Installer-Files\MSYS_Custom_Icon.ico
 	File .\Installer-Files\WinGRASS.ico	
@@ -485,7 +487,7 @@ Section "GRASS" SecGRASS
 	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI"
 
 	CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER} with MSYS.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/bin/${GRASS_COMMAND} -wxpython"\
-	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI and a MSYS UNIX terminal"
+	"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI and a MSYS UNIX terminal"
  
 	;Create the Windows Start Menu Shortcuts
 	SetShellVarContext all
@@ -493,7 +495,7 @@ Section "GRASS" SecGRASS
 	CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
 	
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Old TclTk GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-tcltk"\
-	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with the old TclTk GUI"
+	"$INSTALL_DIR\icons\GRASS_tcltk.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with the old TclTk GUI"
 
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wxpython"\
 	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI"
@@ -508,7 +510,7 @@ Section "GRASS" SecGRASS
 	"$INSTALL_DIR\icons\GRASS_Web.ico" "" SW_SHOWNORMAL "" "Visit the GRASS website"
 	
 	CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS ${VERSION_NUMBER} with MSYS.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/bin/${GRASS_COMMAND} -wxpython"\
-	"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI and a MSYS UNIX terminal"
+	"$INSTALL_DIR\icons\GRASS_MSys.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with the new wxPython GUI and a MSYS UNIX terminal"
 	
 ; FIXME: ship the WinGrass release notes .html file instead of URL
 ; http://trac.osgeo.org/grass/browser/grass-web/trunk/grass64/binary/mswindows/native/README.html?format=raw

mswindows/GRASS-Packager.bat

@@ -19,7 +19,7 @@ set GRASS_7_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-7.0.svn
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo Edited by: Marco Pasetti
 @echo Revised for OSGeo4W by: Colin Nielsen
-@echo Last Update: 30 March 2009
+@echo Last Update: 10 June 2009
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo Select the GRASS version to pack:
 @echo.
@@ -183,7 +183,7 @@ xcopy %OSGEO4W_DIR%\apps\msys\etc %PACKAGE_DIR%\msys\etc /S/V/F/I
 xcopy %OSGEO4W_DIR%\apps\msys\info %PACKAGE_DIR%\msys\info /S/V/F/I
 xcopy %OSGEO4W_DIR%\apps\msys\lib %PACKAGE_DIR%\msys\lib /S/V/F/I
 xcopy %OSGEO4W_DIR%\apps\msys\man %PACKAGE_DIR%\msys\man /S/V/F/I
-del %OSGEO4W_DIR%\apps\msys\etc\fstab
+del %PACKAGE_DIR%\msys\etc\fstab
 
 
 @echo.
@@ -205,7 +205,6 @@ xcopy %OSGEO4W_DIR%\apps\Python25\Scripts %PACKAGE_DIR%\Python25\Scripts /S/V/F/
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo Packaging Completed
-@echo Remove lines 11-16 from %PACKAGE_DIR%\msys\msys.bat
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.
 pause

mswindows/README.html

@@ -212,6 +212,9 @@ the option number 1.</p>
 <p>When finished, you should have a GRASS self-contained release package
 in <code>c:\temp\GRASS-Release-Package</code>.</p>
 
+<p>Download README.html from <a href="http://trac.osgeo.org/grass/browser/grass-web/trunk/grass64/binary/mswindows/native/README.html?format=raw">here</a>, 
+place in <code>c:\temp\GRASS-Release-Package</code> (update version numbers as necessary).</p>
+
 </div>
 
 
@@ -227,10 +230,9 @@ lines 11-16.</p>
 <p>At the end of line 88 (also in msys.bat) change:
 <pre><code>start %WD%rxvt -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-12 -tn msys -geometry 80x25 -e /bin/sh --login -c "%*"</code></pre>
 To:
-<pre><code>if "x%*" == "x" start %WD%rxvt -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-12 -tn msys -geometry 80x25 -e /bin/sh --login -i
-if NOT "x%*" == "x" start %WD%rxvt -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-12 -tn msys -geometry 80x25 -e /bin/sh --login -c "%*"</code></pre>
-
-<p>Delete <code>c:\temp\GRASS-Release-Package\msys\etc\fstab</code></p>
+<pre><code>if "x%*" == "x" start "MSYS 1.0" "%WD%rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-12 -tn msys -geometry 80x25 -e /bin/sh --login -i
+if NOT "x%*" == "x" start "MSYS 1.0" "%WD%rxvt" -backspacekey  -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-12 -tn msys -geometry 80x25 -e /bin/sh --login -c "%*"
+</code></pre>
 
 </div>
 
@@ -303,7 +305,7 @@ osgeo4w tree by Colin Nielsen</p>
 <p>To contact them, e-mail to: GRASS Development Mailing List
 (<a target="_blank" href="http://lists.osgeo.org/mailman/listinfo/grass-dev">http://lists.osgeo.org/mailman/listinfo/grass-dev</a>).</p>
 
-<p>Last edited by Colin Nielsen on 29 April 2009.</p>
+<p>Last edited by Colin Nielsen on 10 June 2009.</p>
 
 </div>