[GRASS-SVN] r36911 - grass/branches/releasebranch_6_4/mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Apr 29 16:28:08 EDT 2009
Author: neteler
Date: 2009-04-29 16:28:08 -0400 (Wed, 29 Apr 2009)
New Revision: 36911
Modified:
grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
grass/branches/releasebranch_6_4/mswindows/README.html
Log:
Colin Nielsen: native winGRASS packager updates
Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi 2009-04-29 20:26:40 UTC (rev 36910)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi 2009-04-29 20:28:08 UTC (rev 36911)
@@ -482,7 +482,7 @@
SetShellVarContext current
CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wxpython"\
- "$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER}"
+ "$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER}"
CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER} msys.lnk" "$INSTALL_DIR\msys\msys.bat" "/grass/bin/${GRASS_COMMAND} -wxpython"\
"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER} with msys Terminal"
@@ -493,13 +493,13 @@
CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Old GUI.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-tcltk"\
- "$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER}"
+ "$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER}"
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wxpython"\
- "$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWNORMAL "" "Launch GRASS ${VERSION_NUMBER}"
+ "$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS ${VERSION_NUMBER}"
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Command Line.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-text"\
- "$INSTALL_DIR\icons\GRASS_CMD.ico" "" SW_SHOWNORMAL "" "Launch GRASS in Text Mode on the Command Line"
+ "$INSTALL_DIR\icons\GRASS_CMD.ico" "" SW_SHOWMINIMIZED "" "Launch GRASS in Text Mode on the Command Line"
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS MSYS Console.lnk" "$INSTALL_DIR\msys\msys.bat" ""\
"$INSTALL_DIR\icons\MSYS_Custom_Icon.ico" "" SW_SHOWNORMAL "" "Open the GRASS MSYS Console"
@@ -662,6 +662,10 @@
FileWrite $0 'PYTHONHOME="$INSTALL_DIR\Python25"$\r$\n'
FileWrite $0 'export PYTHONHOME$\r$\n'
FileWrite $0 '$\r$\n'
+ FileWrite $0 '# Set the GRASS_PROJSHARE variable$\r$\n'
+ FileWrite $0 'GRASS_PROJSHARE="$INSTALL_DIR\proj"$\r$\n'
+ FileWrite $0 'export GRASS_PROJSHARE$\r$\n'
+ FileWrite $0 '$\r$\n'
FileWrite $0 'exec "$$GISBASE/etc/Init.sh" "$$@"'
FileClose $0
done_create_grass_command:
Modified: grass/branches/releasebranch_6_4/mswindows/README.html
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/README.html 2009-04-29 20:26:40 UTC (rev 36910)
+++ grass/branches/releasebranch_6_4/mswindows/README.html 2009-04-29 20:28:08 UTC (rev 36911)
@@ -167,7 +167,7 @@
<p>This document explains how to prepare a WinGRASS release (as a self-contained package installer) using the scripts contained
-in the mswindows folder. In order to avoid mistakes or misunderstandings, I highly recommend to follow each step and command
+in the mswindows folder. In order to avoid mistakes or misunderstandings, we highly recommend to follow each step and command
exactly as they are written in this document.</p>
</div>
@@ -193,8 +193,7 @@
<p>Copy all the content of the mswindows folder to a temporary directory, for example <code>c:\temp</code>.</p>
-<p>Edit lines 11-15 in the file <code>c:\temp\GRASS-Packager.bat</code> to reflect the path to your OSGeo4W tree (eg. <code>c:\OSGeo4W</code>),
-and the Grass version being packaged (eg. <code>grass-6.4.0RC4</code>.</p>
+<p>Edit lines 11-15 in the file <code>c:\temp\GRASS-Packager.bat</code> to reflect the paths to your OSGeo4W tree (eg. <code>c:\OSGeo4W</code>) and the GRASS version being packaged (eg. <code>grass-6.4.0RC4</code>).</p>
<p>Launch the file <code>c:\temp\GRASS-Packager.bat</code> and select the option number 1.</p>
@@ -211,11 +210,14 @@
<p>Open <code>c:\temp\GRASS-Release-Package\msys\msys.bat</code> and remove lines 11-16.</p>
-<p>At the end of line 88 change:
-<pre><code>--login -i</code></pre>
+<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>--login -c "%*"</code></pre>
+<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>
+
</div>
@@ -256,7 +258,7 @@
<p>Open the the file <code>c:\temp\GRASS-Installer.nsi</code>.</p>
<p>At line 13 set the <code>DEMOLOCATION_PATH</code> varibale to the demolocation folder in the source tree.
-For example, <code>c:\msys\local\src\grass-6.4.0RC4\demolocation</code>
+For example, <code>c:\msys\local\src\grass-6.4.0RC3\demolocation</code>
<p>At line 18 set the <code>INSTALLER_TYPE</code> variable to <code>"Release"</code>, then, at lines 24-26, set the
<code>RELEASE_VERSION_NUMBER</code>, the <code>RELEASE_SVN_REVISION</code> and the <code>RELEASE_BINARY_REVISION</code> variables.</p>
@@ -280,10 +282,11 @@
<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 06 April 2009.</p>
+<p>Last edited by Colin Nielsen on 29 April 2009.</p>
</div>
</body>
</html>
+
More information about the grass-commit
mailing list