[GRASS-SVN] r36699 - grass/branches/releasebranch_6_4/mswindows
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Apr 12 09:29:00 EDT 2009
Author: neteler
Date: 2009-04-12 09:29:00 -0400 (Sun, 12 Apr 2009)
New Revision: 36699
Modified:
grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
grass/branches/releasebranch_6_4/mswindows/README.html
Log:
Colin Nielsen <colin nielsen gmail.com>: native winGRASS packager update
Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi 2009-04-12 10:07:24 UTC (rev 36698)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi 2009-04-12 13:29:00 UTC (rev 36699)
@@ -2,14 +2,15 @@
;GRASS Installer for Windows
;Written by Marco Pasetti
-;Last Update: 13 September 2008
-;Mail to: marco.pasetti at alice.it
+;Updated for OSGeo4W by Colin Nielsen
+;Last Update: 30 March 2009
+;Mail to: grass-dev at lists.osgeo.org
;----------------------------------------------------------------------------------------------------------------------------
;Define the source path of the demolocation files
-!define DEMOLOCATION_PATH "c:\msys\local\src\grass-6.3.0\demolocation"
+!define DEMOLOCATION_PATH "c:\osgeo4w\usr\src\grass-6.4.0RC3\demolocation"
;Select if you are building a "Development Version" or a "Release Version" of the GRASS Installer
;Change the INSTALLER_TYPE variable to Release, Dev6 or Dev7
@@ -20,14 +21,14 @@
;Version variables
-!define RELEASE_VERSION_NUMBER "6.3.0"
-!define RELEASE_SVN_REVISION "31095"
-!define RELEASE_BINARY_REVISION "4"
-!define RELEASE_GRASS_COMMAND "grass63"
+!define RELEASE_VERSION_NUMBER "6.4.0RC3"
+!define RELEASE_SVN_REVISION "36599"
+!define RELEASE_BINARY_REVISION "1"
+!define RELEASE_GRASS_COMMAND "grass64"
!define RELEASE_GRASS_BASE "GRASS"
!define DEV6_VERSION_NUMBER "6-SVN"
-!define DEV6_SVN_REVISION ""
+!define DEV6_SVN_REVISION "36599"
!define DEV6_BINARY_REVISION "1"
!define DEV6_GRASS_COMMAND "grass64"
!define DEV6_GRASS_BASE "GRASS-6-SVN"
@@ -480,17 +481,23 @@
;Create the Desktop Shortcut
SetShellVarContext current
- CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-tcltk"\
+ CreateShortCut "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-wxpython"\
"$INSTALL_DIR\icons\GRASS.ico" "" SW_SHOWNORMAL "" "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"
;Create the Windows Start Menu Shortcuts
SetShellVarContext all
CreateDirectory "$SMPROGRAMS\${GRASS_BASE}"
- CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS ${VERSION_NUMBER}.lnk" "$INSTALL_DIR\${GRASS_COMMAND}.bat" "-tcltk"\
+ 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}"
+ 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}"
+
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"
@@ -500,6 +507,9 @@
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\GRASS Web Site.lnk" "$INSTALL_DIR\GRASS-WebSite.url" ""\
"$INSTALL_DIR\icons\GRASS_Web.ico" "" SW_SHOWNORMAL "" "Visit the GRASS Web Site"
+ CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\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"
+
!if ${INSTALLER_TYPE} == "Release"
CreateShortCut "$SMPROGRAMS\${GRASS_BASE}\Release Notes.lnk" "$INSTALL_DIR\WinGRASS-README.url" ""\
"$INSTALL_DIR\icons\WinGRASS.ico" "" SW_SHOWNORMAL "" "Visit the WinGRASS Project Web Page"
@@ -549,6 +559,9 @@
FileWrite $0 'rem Path to the proj files (notably the epsg projection list)$\r$\n'
FileWrite $0 'set GRASS_PROJSHARE=%GRASSDIR%\proj$\r$\n'
FileWrite $0 '$\r$\n'
+ FileWrite $0 'rem Path to the python directory$\r$\n'
+ FileWrite $0 'set PYTHONHOME=%GRASSDIR%\Python25$\r$\n'
+ FileWrite $0 '$\r$\n'
FileWrite $0 'set WINGISBASE=%GRASSDIR%$\r$\n'
FileWrite $0 '"%WINGISBASE%\etc\init.bat" %*'
FileClose $0
@@ -597,9 +610,9 @@
CreateDirectory $INSTALL_DIR\msys\home
CreateDirectory $INSTALL_DIR\msys\home\$USERNAME
- ;create the $INSTALL_DIR\msys\home\$USERNAME\grass_command
+ ;create the $INSTALL_DIR\bin grass_command
ClearErrors
- FileOpen $0 $INSTALL_DIR\msys\home\$USERNAME\${GRASS_COMMAND} w
+ FileOpen $0 $INSTALL_DIR\bin\${GRASS_COMMAND} w
IfErrors done_create_grass_command
FileWrite $0 '#! /bin/sh$\r$\n'
FileWrite $0 '#########################################################################$\r$\n'
@@ -643,9 +656,26 @@
FileWrite $0 'PATH="$$GISBASE/tcl-tk/bin:$$GISBASE/sqlite/bin:$$GISBASE/gpsbabel:$$PATH"$\r$\n'
FileWrite $0 'export PATH$\r$\n'
FileWrite $0 '$\r$\n'
+ FileWrite $0 '# Set the PYTHONPATH variable$\r$\n'
+ FileWrite $0 'PYTHONPATH="$$GISBASE/etc/python:$$GISBASE/Python25:$$PYTHONPATH"$\r$\n'
+ FileWrite $0 'export PYTHONPATH$\r$\n'
+ FileWrite $0 'PYTHONHOME="$INSTALL_DIR\Python25"$\r$\n'
+ FileWrite $0 'export PYTHONHOME$\r$\n'
+ FileWrite $0 '$\r$\n'
FileWrite $0 'exec "$$GISBASE/etc/Init.sh" "$$@"'
FileClose $0
done_create_grass_command:
+
+ ;Create the $INSTALL_DIR\msys\grass link directory
+ CreateDirectory $INSTALL_DIR\msys\grass
+
+ ;create the $INSTALL_DIR\msys\etc\fstab with the main grass dir mount info
+ ClearErrors
+ FileOpen $0 $INSTALL_DIR\msys\etc\fstab w
+ IfErrors done_create_fstab
+ FileWrite $0 '$INSTALL_DIR /grass$\r$\n'
+ FileClose $0
+ done_create_fstab:
;Set the Unix-Like GIS_DATABASE Path
Var /GLOBAL UNIX_LIKE_GIS_DATABASE_PATH
@@ -785,8 +815,10 @@
RMDir /r "$INSTDIR\icons"
RMDir /r "$INSTDIR\include"
RMDir /r "$INSTDIR\lib"
+ RMDir /r "$INSTDIR\locale"
RMDir /r "$INSTDIR\msys"
RMDir /r "$INSTDIR\proj"
+ RMDir /r "$INSTDIR\Python25"
RMDir /r "$INSTDIR\scripts"
RMDir /r "$INSTDIR\sqlite"
RMDir /r "$INSTDIR\tcl-tk"
@@ -797,6 +829,7 @@
;remove the Desktop ShortCut
SetShellVarContext current
Delete "$DESKTOP\GRASS ${VERSION_NUMBER}.lnk"
+ Delete "$DESKTOP\GRASS ${VERSION_NUMBER} msys.lnk"
;remove the Programs Start ShortCuts
SetShellVarContext all
Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat 2009-04-12 10:07:24 UTC (rev 36698)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat 2009-04-12 13:29:00 UTC (rev 36699)
@@ -8,15 +8,18 @@
set GRASS_6_DEV_PACKAGE_DIR=.\GRASS-6-Dev-Package
set GRASS_7_DEV_PACKAGE_DIR=.\GRASS-7-Dev-Package
-set GRASS_RELEASE_INSTALL_FOLDER=c:\msys\local\grass-6.3.0
-set GRASS_6_DEV_INSTALL_FOLDER=c:\msys\local\grass-6-svn
-set GRASS_7_DEV_INSTALL_FOLDER=c:\msys\local\grass-7-svn
+set OSGEO4W_DIR=c:\osgeo4w
+set GRASS_RELEASE_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.4.0RC3
+set GRASS_6_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.4.0svn
+set GRASS_7_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-7.0.svn
+
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Self Contained GRASS Automated Packager
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Edited by: Marco Pasetti
- at echo Last Update: 29 June 2008
+ at echo Revised for OSGeo4W by: Colin Nielsen
+ at echo Last Update: 30 March 2009
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Select the GRASS version to pack:
@echo.
@@ -71,8 +74,8 @@
mkdir %PACKAGE_DIR%\extralib
-copy c:\msys\local\bin\*.dll %PACKAGE_DIR%\extralib
-copy c:\msys\local\pgsql\lib\libpq.dll %PACKAGE_DIR%\extralib
+copy %OSGEO4W_DIR%\bin\*.dll %PACKAGE_DIR%\extralib
+rem copy %OSGEO4W_DIR%\pgsql\lib\libpq.dll %PACKAGE_DIR%\extralib
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -82,7 +85,7 @@
mkdir %PACKAGE_DIR%\extrabin
-copy c:\msys\local\bin\*.exe %PACKAGE_DIR%\extrabin
+copy %OSGEO4W_DIR%\bin\*.exe %PACKAGE_DIR%\extrabin
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -90,8 +93,26 @@
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-xcopy c:\msys\local\sqlite %PACKAGE_DIR%\sqlite /S/V/F/I
+mkdir %PACKAGE_DIR%\sqlite
+mkdir %PACKAGE_DIR%\sqlite\bin
+mkdir %PACKAGE_DIR%\sqlite\include
+mkdir %PACKAGE_DIR%\sqlite\lib
+xcopy %OSGEO4W_DIR%\bin\sqlite3.dll %PACKAGE_DIR%\sqlite\bin /S/V/F/I
+copy %OSGEO4W_DIR%\include\btree.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\fts1*.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\hash.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\keywordhash.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\opcodes.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\os.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\os_common.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\pager.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\parse.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\sqlite*.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\vdbe.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\include\vdbeInt.h %PACKAGE_DIR%\sqlite\include
+copy %OSGEO4W_DIR%\lib\sqlite3_i.lib %PACKAGE_DIR%\sqlite\lib
+
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy GPSBABEL executable and dll to PACKAGE_DIR\gpsbabel
@@ -100,8 +121,8 @@
mkdir %PACKAGE_DIR%\gpsbabel
-copy c:\msys\local\gpsbabel\gpsbabel.exe %PACKAGE_DIR%\gpsbabel
-copy c:\msys\local\gpsbabel\libexpat.dll %PACKAGE_DIR%\gpsbabel
+copy %OSGEO4W_DIR%\gpsbabel.exe %PACKAGE_DIR%\gpsbabel
+rem copy %OSGEO4W_DIR%\libexpat.dll %PACKAGE_DIR%\gpsbabel
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -109,7 +130,7 @@
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-xcopy c:\msys\local\share\proj %PACKAGE_DIR%\proj /S/V/F/I
+xcopy %OSGEO4W_DIR%\share\proj %PACKAGE_DIR%\proj /S/V/F/I
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -118,22 +139,33 @@
@echo.
mkdir %PACKAGE_DIR%\tcl-tk
+mkdir %PACKAGE_DIR%\tcl-tk\bin
mkdir %PACKAGE_DIR%\tcl-tk\include
mkdir %PACKAGE_DIR%\tcl-tk\lib
mkdir %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
mkdir %PACKAGE_DIR%\tcl-tk\lib\tk8.5
-xcopy c:\msys\local\tcl-tk\bin %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
+xcopy %OSGEO4W_DIR%\bin\tclpip85.dll %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
+xcopy %OSGEO4W_DIR%\bin\tcl85.dll %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
+xcopy %OSGEO4W_DIR%\bin\tclsh.exe %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
+xcopy %OSGEO4W_DIR%\bin\tclsh85.exe %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
+xcopy %OSGEO4W_DIR%\bin\tk85.dll %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
+xcopy %OSGEO4W_DIR%\bin\wish.exe %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
+xcopy %OSGEO4W_DIR%\bin\wish85.exe %PACKAGE_DIR%\tcl-tk\bin /S/V/F/I
-copy c:\msys\local\tcl-tk\include\*.h %PACKAGE_DIR%\tcl-tk\include
+copy %OSGEO4W_DIR%\include\tcl*.h %PACKAGE_DIR%\tcl-tk\include
+copy %OSGEO4W_DIR%\include\tk*.h %PACKAGE_DIR%\tcl-tk\include
+copy %OSGEO4W_DIR%\include\tommath_class.h %PACKAGE_DIR%\tcl-tk\include
+copy %OSGEO4W_DIR%\include\tommath_superclass.h %PACKAGE_DIR%\tcl-tk\include
+copy %OSGEO4W_DIR%\include\ttkDecls.h %PACKAGE_DIR%\tcl-tk\include
-copy c:\msys\local\tcl-tk\lib\tcl8.5\*.tcl %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
-copy c:\msys\local\tcl-tk\lib\tcl8.5\tclIndex %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
+copy %OSGEO4W_DIR%\lib\tcl8.5\*.tcl %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
+copy %OSGEO4W_DIR%\lib\tcl8.5\tclIndex %PACKAGE_DIR%\tcl-tk\lib\tcl8.5
-copy c:\msys\local\tcl-tk\lib\tk8.5\*.tcl %PACKAGE_DIR%\tcl-tk\lib\tk8.5
-copy c:\msys\local\tcl-tk\lib\tk8.5\tclIndex %PACKAGE_DIR%\tcl-tk\lib\tk8.5
+copy %OSGEO4W_DIR%\lib\tk8.5\*.tcl %PACKAGE_DIR%\tcl-tk\lib\tk8.5
+copy %OSGEO4W_DIR%\lib\tk8.5\tclIndex %PACKAGE_DIR%\tcl-tk\lib\tk8.5
-xcopy c:\msys\local\tcl-tk\lib\tk8.5\ttk %PACKAGE_DIR%\tcl-tk\lib\tk8.5\ttk /S/V/F/I
+xcopy %OSGEO4W_DIR%\lib\tk8.5\ttk %PACKAGE_DIR%\tcl-tk\lib\tk8.5\ttk /S/V/F/I
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -143,18 +175,37 @@
mkdir %PACKAGE_DIR%\msys
-copy c:\msys\* %PACKAGE_DIR%\msys
+copy %OSGEO4W_DIR%\apps\msys\* %PACKAGE_DIR%\msys
-xcopy c:\msys\bin %PACKAGE_DIR%\msys\bin /S/V/F/I
-xcopy c:\msys\doc %PACKAGE_DIR%\msys\doc /S/V/F/I
-xcopy c:\msys\etc %PACKAGE_DIR%\msys\etc /S/V/F/I
-xcopy c:\msys\info %PACKAGE_DIR%\msys\info /S/V/F/I
-xcopy c:\msys\lib %PACKAGE_DIR%\msys\lib /S/V/F/I
-xcopy c:\msys\man %PACKAGE_DIR%\msys\man /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\msys\bin %PACKAGE_DIR%\msys\bin /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\msys\doc %PACKAGE_DIR%\msys\doc /S/V/F/I
+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
+
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
+ at echo Copy Python content to PACKAGE_DIR\Python25
+ at echo -----------------------------------------------------------------------------------------------------------------------
+ at echo.
+
+mkdir %PACKAGE_DIR%\Python25
+
+copy %OSGEO4W_DIR%\apps\Python25\* %PACKAGE_DIR%\Python25
+
+xcopy %OSGEO4W_DIR%\apps\Python25\DLLs %PACKAGE_DIR%\Python25\DLLs /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python25\include %PACKAGE_DIR%\Python25\include /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python25\Lib %PACKAGE_DIR%\Python25\Lib /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python25\libs %PACKAGE_DIR%\Python25\libs /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python25\Scripts %PACKAGE_DIR%\Python25\Scripts /S/V/F/I
+
+ at echo.
+ at echo -----------------------------------------------------------------------------------------------------------------------
@echo Packaging Completed
+ at echo Remove lines 11-16 from %PACKAGE_DIR%\msys\msys.bat
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
pause
\ No newline at end of file
Modified: grass/branches/releasebranch_6_4/mswindows/README.html
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/README.html 2009-04-12 10:07:24 UTC (rev 36698)
+++ grass/branches/releasebranch_6_4/mswindows/README.html 2009-04-12 13:29:00 UTC (rev 36699)
@@ -145,12 +145,11 @@
<p><a href="#Introduction">Introduction</a></p>
<p><ol>
-<li><a href="#Install MSYS">Install MSYS</a></li>
-<li><a href="#Install MinGW">Install MinGW</a></li>
-<li><a href="#Install the GRASS MSYS Environment">Install the GRASS MSYS Environment</a></li>
-<li><a href="#Build and Install GRASS">Build and Install GRASS</a></li>
+<li><a href="#Install OSGeo4w Tree and Compile Grass">Install OSGeo4w Tree and Compile Grass</a></li>
<li><a href="#Create a GRASS self-contained Package">Create a GRASS self-contained Package</a></li>
+<li><a href="#Remove OSGeo4W Traces from Package">Remove OSGeo4W Traces from Package</a></li>
<li><a href="#Install NSIS">Install NSIS</a></li>
+<li><a href="#Install NSIS: Untgz Plugin">Install NSIS: Untgz Plugin</a></li>
<li><a href="#Create the WinGRASS Installer">Create the WinGRASS Installer</a></li>
</ol></p>
@@ -176,217 +175,90 @@
-<div id="Install MSYS">
+<div id="Install OSGeo4w Tree and Compile Grass">
-<p><h3>1. Install MSYS (1.0.11)</h3></p>
+<p><h3>1. Install OSGeo4w Tree and Compile Grass</h3></p>
-<p>Download the <a target="_blank" href="http://prdownloads.sourceforge.net/mingw/MSYS-1.0.11-2004.04.30-1.exe">MSYS installer</a></p>
+<p>Follow the instructions <a target="_blank" href="http://trac.osgeo.org/grass/wiki/CompileOnWindows">here</a> to download the OSGeo4W installer, install the required dependencies, and build Grass from source.</p>
-<p>Install to <code>c:\msys</code></p>
-
-<p>At the command prompt question for post install, type <code>n</code> and then enter.</p>
-
-<p>Download the <a target="_blank" href="http://downloads.sourceforge.net/mingw/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2">MSYS coreutils package</a></p>
-
-<p>Unpack it to a temporary folder, then copy all the content of the <code>coreutils-5.97</code> folder to <code>c:\msys</code>
-(overwrite the existing files when asked)</p>
-
+<p>Do not move on to step two until you have successfully <a target="_blank" href="http://trac.osgeo.org/grass/wiki/HowToTestGrass6">tested</a> your new version of Grass.</p>
</div>
-<div id="Install MinGW">
+<div id="Create a GRASS self-contained Package">
-<p><h3>2. Install MinGW (5.1.4)</h3></p>
+<p><h3>2. Create a GRASS self-contained Package</h3></p>
-<p>Download the <a target="_blank" href="http://downloads.sourceforge.net/mingw/MinGW-5.1.4.exe">MinGW installer</a></p>
+<p>Copy all the content of the mswindows folder to a temporary directory, for example <code>c:\temp</code>.</p>
-<p>Select "Download and Install Current Version";</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.0RC3</code>.</p>
-<p>Install only "g++ compiler" and "MinGW Make";</p>
+<p>Launch the file <code>c:\temp\GRASS-Packager.bat</code> and select the option number 1.</p>
-<p>Install to <code>c:\msys\mingw</code></p>
+<p>When finished, you should have a GRASS self-contained release package in <code>c:\temp\GRASS-Release-Package</code>.</p>
</div>
-<div id="Install the GRASS MSYS Environment">
+<div id="Remove OSGeo4W Traces from Package">
-<p><h3>3. Install the GRASS MSYS Environment</h3></p>
+<p><h3>3. Remove OSGeo4W Traces from Package</h3></p>
-<p>Download the <a target="_blank" href="http://grass.osgeo.org/grass63/binary/mswindows/native/GRASS_MSYS_Environment.zip">
-GRASS MSYS Environment</a></p>
+<p>Open <code>c:\temp\GRASS-Release-Package\msys\msys.bat</code> and remove lines 11-16.</p>
-<p>Extract the whole package to <code>c:\msys\local</code></p>
+<p>At the end of line 88 change:
+<pre><code>--login -i</code></pre>
+To:
+<pre><code>--login -c "%*"</code></pre>
</div>
-<div id="Build and Install GRASS">
+<div id="Install NSIS">
-<p><h3>4. Build and Install GRASS (6.3.0)</h3></p>
+<p><h3>4. Install NSIS (2.38)</h3></p>
-<p>Download the <a target="_blank" href="http://grass.osgeo.org/grass63/source/grass-6.3.0.tar.gz">GRASS source code</a></p>
+<p>Download the <a target="_blank" href="http://prdownloads.sourceforge.net/nsis/nsis-2.38-setup.exe">NSIS installer</a></p>
-<p>Unpack to <code>c:\msys\local\src</code></p>
+<p>Install to <code>c:\DevTools</code></p>
-<p>Open <code>c:\msys\local\src\grass-6.3.0\man\Makefile</code></p>
-
-<p>At line 13, replace:</p>
-<pre><code>default: $(MANPAGES)</pre></code>
-
-<p>with:</p>
-<pre><code>default:</pre></code>
-
-<p>In MSYS console, type:</p>
-<pre><code>cd /usr/local/src/grass-6.3.0
-./configure \
---prefix=/usr/local \
---with-includes=/usr/local/include \
---with-libs=/usr/local/lib \
---disable-x11 \
---without-x \
---with-cxx \
---enable-shared \
---enable-largefile \
---with-opengl=windows \
---with-fftw \
---with-freetype \
---with-proj-share=/usr/local/share/proj \
---with-gdal=/usr/local/bin/gdal-config \
---with-tcltk --with-tcltk-includes=/usr/local/tcl-tk/include --with-tcltk-libs=/usr/local/tcl-tk/bin \
---with-sqlite --with-sqlite-includes=/usr/local/sqlite/include --with-sqlite-libs=/usr/local/sqlite/lib \
---with-postgres --with-postgres-includes=/usr/local/pgsql/include --with-postgres-libs=/usr/local/pgsql/lib</code></pre>
-
-<p>When finished, you should have the following screen output:</p>
-<pre><code>GRASS is now configured for: i686-pc-mingw32
-
- Source directory: /usr/local/src/grass-6.3.0
- Build directory: /usr/local/src/grass-6.3.0
- Installation directory: ${prefix}/grass-6.3.0
- Startup script in directory: ${exec_prefix}/bin
- C compiler: gcc -g -O2
- C++ compiler: c++ -g -O2
- Building shared libraries: yes
- 64bit support: no
- OpenGL platform: Windows
-
- NVIZ: yes
-
- BLAS support: no
- C++ support: yes
- DWG support: no
- FFMPEG support: no
- FFTW support: yes
- FreeType support: yes
- GDAL support: yes
- GLw support: no
- JPEG support: yes
- LAPACK support: no
- Large File Support (LFS): yes
- Motif support: no
- MySQL support: no
- NLS support: no
- ODBC support: no
- OGR support: yes
- OpenGL support: yes
- PNG support: yes
- PostgreSQL support: yes
- Python support: no
- Readline support: no
- SQLite support: yes
- Tcl/Tk support: yes
- wxWidgets support: no
- TIFF support: yes
- X11 support: no
- MacOSX application: no</code></pre>
-
-Having GRASS successfully configured, now you can build it:
-<pre><code>export PATH="/usr/local/bin:/usr/local/tcl-tk/bin:/usr/local/sqlite/bin:/usr/local/pgsql/lib:$PATH"
-make</code></pre>
-
-<p>When finished, you should have the following compilation log:</p>
-
-<pre><code>GRASS GIS compilation log
--------------------------
-Started compilation: Mon Jun 16 09:08:19 GMT 2008
---
-Errors in:
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.daemon
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.edgedensity
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.patchdensity
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.patchnum
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.shape
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.simpson
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.shannon
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.mps
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.mpa
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.padcv
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.padsd
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.padrange
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.cwed
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.richness
-/usr/local/src/grass-6.3.0/raster/r.li/r.li.dominance
---
-In case of errors please change into the directory with error and run 'make'.
-If you get multiple errors, you need to deal with them in the order they
-appear in the error log. If you get an error building a library, you will
-also get errors from anything which uses the library.
---
-Finished compilation: Mon Jun 16 10:11:17 GMT 2008
-make: *** [default] Error 1</code></pre>
-
-<p>Then install GRASS:</p>
-
-<pre><code>make install</code></pre>
-
-<p>Now GRASS should be installed in <code>c:\msys\local\grass-6.3.0</code></p>
-
</div>
-<div id="Create a GRASS self-contained Package">
+<div id="Install NSIS: Untgz Plugin">
-<p><h3>5. Create a GRASS self-contained Package</h3></p>
+<p><h3>5. Install NSIS: Untgz Plugin (1.0.15)</h3></p>
-<p>Copy all the content of the mswindows folder to a temporary directory, for example <code>c:\temp</code>.</p>
+<p>Download the <a target="_blank" href="http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip">NSIS Untgz Plugin</a></p>
-<p>Launch the file <code>c:\temp\GRASS-Packager.bat</code> and select the option number 1.</p>
+<p>Unzip to <code>c:\DevTools\Plugins\</code></p>
-<p>When finished, you should have a GRASS self-contained release package in <code>c:\temp\GRASS-Release-Package</code>.</p>
+<p>Copy <code>c:\DevTools\Plugins\untgz\untgz.dll</code> to <code>c:\DevTools\Plugins\</code></p>
</div>
-<div id="Install NSIS">
-
-<p><h3>6. Install NSIS (2.38)</h3></p>
-
-<p>Download the <a target="_blank" href="http://prdownloads.sourceforge.net/nsis/nsis-2.38-setup.exe">NSIS installer</a></p>
-
-<p>Install to <code>c:\DevTools</code></p>
-
-</div>
-
-
-
-
<div id="Create the WinGRASS Installer">
-<p><h3>7. Create the WinGRASS Installer</h3></p>
+<p><h3>6. Create the WinGRASS Installer</h3></p>
<p>Open the the file <code>c:\temp\GRASS-Installer.nsi</code>.</p>
-<p>At line 17 set the <code>INSTALLER_TYPE</code> variable to <code>"Release"</code>, then, at lines 23-25, set the
+<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.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>
<p>Finally, right click on the file <code>c:\temp\GRASS-Installer.nsi</code> and select <code>Compile NSIS Script</code>.</p>
@@ -402,12 +274,13 @@
<p><h3>Credits and Contacts</h3></p>
-<p>The GRASS MSYS Environment and the GRASS Packager and Installer scripts are provided by Marco Pasetti.</p>
+<p>The GRASS MSYS Environment and the GRASS Packager and Installer scripts were created by Marco Pasetti, and updated for use on the
+osgeo4w tree by Colin Nielsen</p>
-<p>To contact him, e-mail to: GRASS Development Mailing List
+<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>Edited by Marco Pasetti on 14 July 2008.</p>
+<p>Last edited by Colin Nielsen on 06 April 2009.</p>
</div>
More information about the grass-commit
mailing list