svn:eol-style + native (merge from relbr6)

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

mswindows/GRASS-Packager.bat

@@ -1,211 +1,211 @@
-@echo off
-
-rem --------------------------------------------------------------------------------------------------------------------------
-rem Set the script variables
-rem --------------------------------------------------------------------------------------------------------------------------
-
-set GRASS_RELEASE_PACKAGE_DIR=.\GRASS-Release-Package
-set GRASS_6_DEV_PACKAGE_DIR=.\GRASS-6-Dev-Package
-set GRASS_7_DEV_PACKAGE_DIR=.\GRASS-7-Dev-Package
-
-set OSGEO4W_DIR=c:\osgeo4w
-
-set GRASS_RELEASE_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.4.0RC4
-set GRASS_6_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.5.svn
-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
-@echo Revised for OSGeo4W by: Colin Nielsen
-@echo Last Update: 30 March 2009
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Select the GRASS version to pack:
-@echo.
-@echo 1. Current GRASS Release Version
-@echo.
-@echo 2. Current GRASS-6 Development Version
-@echo.
-@echo 3. Current GRASS-7 Development Version
-@echo.
-
-set /p SELECTION=Enter your selection (1/2/3):
-
-if %SELECTION%==1 (
-set PACKAGE_DIR=%GRASS_RELEASE_PACKAGE_DIR%
-set GRASS_PREFIX=%GRASS_RELEASE_INSTALL_FOLDER%
-)
-
-if %SELECTION%==2 (
-set PACKAGE_DIR=%GRASS_6_DEV_PACKAGE_DIR%
-set GRASS_PREFIX=%GRASS_6_DEV_INSTALL_FOLDER%
-)
-
-if %SELECTION%==3 (
-set PACKAGE_DIR=%GRASS_7_DEV_PACKAGE_DIR%
-set GRASS_PREFIX=%GRASS_7_DEV_INSTALL_FOLDER%
-)
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Remove the previous Selected Package and create a new PACKAGE_DIR
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-
-pause
-
-if exist %PACKAGE_DIR% rmdir /S/Q %PACKAGE_DIR%
-mkdir %PACKAGE_DIR%
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Copy %GRASS_PREFIX% content to PACKAGE_DIR
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-
-xcopy %GRASS_PREFIX% %PACKAGE_DIR% /S/V/F
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Copy Extralibs to PACKAGE_DIR\extralib
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-
-mkdir %PACKAGE_DIR%\extralib
-
-copy %OSGEO4W_DIR%\bin\*.dll %PACKAGE_DIR%\extralib
-rem copy %OSGEO4W_DIR%\pgsql\lib\libpq.dll %PACKAGE_DIR%\extralib
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Copy Extrabins to PACKAGE_DIR\extrabin
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-
-mkdir %PACKAGE_DIR%\extrabin
-
-copy %OSGEO4W_DIR%\bin\*.exe %PACKAGE_DIR%\extrabin
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Copy SQLite content to PACKAGE_DIR\sqlite
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-
-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
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-
-mkdir %PACKAGE_DIR%\gpsbabel
-
-copy %OSGEO4W_DIR%\gpsbabel.exe %PACKAGE_DIR%\gpsbabel
-rem copy %OSGEO4W_DIR%\libexpat.dll %PACKAGE_DIR%\gpsbabel
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Copy shared PROJ.4 files to PACKAGE_DIR\proj
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-
-xcopy %OSGEO4W_DIR%\share\proj %PACKAGE_DIR%\proj /S/V/F/I
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Copy Tcl/Tk content to PACKAGE_DIR\tcl-tk
-@echo -----------------------------------------------------------------------------------------------------------------------
-@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 %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 %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 %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 %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 %OSGEO4W_DIR%\lib\tk8.5\ttk %PACKAGE_DIR%\tcl-tk\lib\tk8.5\ttk /S/V/F/I
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Copy MSYS files to PACKAGE_DIR\msys
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-
-mkdir %PACKAGE_DIR%\msys
-
-copy %OSGEO4W_DIR%\apps\msys\* %PACKAGE_DIR%\msys
-
-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 -----------------------------------------------------------------------------------------------------------------------
-@echo Copy Python content to PACKAGE_DIR\Python25
-@echo -----------------------------------------------------------------------------------------------------------------------
-@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
-
-@echo.
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo Packaging Completed
-@echo Remove lines 11-16 from %PACKAGE_DIR%\msys\msys.bat
-@echo -----------------------------------------------------------------------------------------------------------------------
-@echo.
-pause
+@echo off
+
+rem --------------------------------------------------------------------------------------------------------------------------
+rem Set the script variables
+rem --------------------------------------------------------------------------------------------------------------------------
+
+set GRASS_RELEASE_PACKAGE_DIR=.\GRASS-Release-Package
+set GRASS_6_DEV_PACKAGE_DIR=.\GRASS-6-Dev-Package
+set GRASS_7_DEV_PACKAGE_DIR=.\GRASS-7-Dev-Package
+
+set OSGEO4W_DIR=c:\osgeo4w
+
+set GRASS_RELEASE_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.4.0RC4
+set GRASS_6_DEV_INSTALL_FOLDER=%OSGEO4W_DIR%\apps\grass\grass-6.5.svn
+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
+@echo Revised for OSGeo4W by: Colin Nielsen
+@echo Last Update: 30 March 2009
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Select the GRASS version to pack:
+@echo.
+@echo 1. Current GRASS Release Version
+@echo.
+@echo 2. Current GRASS-6 Development Version
+@echo.
+@echo 3. Current GRASS-7 Development Version
+@echo.
+
+set /p SELECTION=Enter your selection (1/2/3):
+
+if %SELECTION%==1 (
+set PACKAGE_DIR=%GRASS_RELEASE_PACKAGE_DIR%
+set GRASS_PREFIX=%GRASS_RELEASE_INSTALL_FOLDER%
+)
+
+if %SELECTION%==2 (
+set PACKAGE_DIR=%GRASS_6_DEV_PACKAGE_DIR%
+set GRASS_PREFIX=%GRASS_6_DEV_INSTALL_FOLDER%
+)
+
+if %SELECTION%==3 (
+set PACKAGE_DIR=%GRASS_7_DEV_PACKAGE_DIR%
+set GRASS_PREFIX=%GRASS_7_DEV_INSTALL_FOLDER%
+)
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Remove the previous Selected Package and create a new PACKAGE_DIR
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+pause
+
+if exist %PACKAGE_DIR% rmdir /S/Q %PACKAGE_DIR%
+mkdir %PACKAGE_DIR%
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Copy %GRASS_PREFIX% content to PACKAGE_DIR
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+xcopy %GRASS_PREFIX% %PACKAGE_DIR% /S/V/F
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Copy Extralibs to PACKAGE_DIR\extralib
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+mkdir %PACKAGE_DIR%\extralib
+
+copy %OSGEO4W_DIR%\bin\*.dll %PACKAGE_DIR%\extralib
+rem copy %OSGEO4W_DIR%\pgsql\lib\libpq.dll %PACKAGE_DIR%\extralib
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Copy Extrabins to PACKAGE_DIR\extrabin
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+mkdir %PACKAGE_DIR%\extrabin
+
+copy %OSGEO4W_DIR%\bin\*.exe %PACKAGE_DIR%\extrabin
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Copy SQLite content to PACKAGE_DIR\sqlite
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+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
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+mkdir %PACKAGE_DIR%\gpsbabel
+
+copy %OSGEO4W_DIR%\gpsbabel.exe %PACKAGE_DIR%\gpsbabel
+rem copy %OSGEO4W_DIR%\libexpat.dll %PACKAGE_DIR%\gpsbabel
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Copy shared PROJ.4 files to PACKAGE_DIR\proj
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+xcopy %OSGEO4W_DIR%\share\proj %PACKAGE_DIR%\proj /S/V/F/I
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Copy Tcl/Tk content to PACKAGE_DIR\tcl-tk
+@echo -----------------------------------------------------------------------------------------------------------------------
+@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 %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 %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 %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 %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 %OSGEO4W_DIR%\lib\tk8.5\ttk %PACKAGE_DIR%\tcl-tk\lib\tk8.5\ttk /S/V/F/I
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Copy MSYS files to PACKAGE_DIR\msys
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+mkdir %PACKAGE_DIR%\msys
+
+copy %OSGEO4W_DIR%\apps\msys\* %PACKAGE_DIR%\msys
+
+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 -----------------------------------------------------------------------------------------------------------------------
+@echo Copy Python content to PACKAGE_DIR\Python25
+@echo -----------------------------------------------------------------------------------------------------------------------
+@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
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo Packaging Completed
+@echo Remove lines 11-16 from %PACKAGE_DIR%\msys\msys.bat
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+pause

mswindows/README.html

@@ -1,292 +1,292 @@
-<html>
-
-<head>
-
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="Content-Language" content="en" />
-<meta name="Author" content="Marco Pasetti" />
-<meta name="Description" content="SVN mswindows README" />
-
-<title>SVN mswindows README</title>
-
-<style type="text/css" />
-
-/* Wiki Pages Styles */
-
-/* TableOfContents */
-
-.table-of-contents	{ 
-					border: 1px solid #bbbbbb;
-					color: black; background-color: #eeeeee;
-					font-size: small;
-					text-align:left;
-					margin: 0.5em; padding-left: 1em;
-					width: 360;
-					}
-
-/* Contents */
-
-html	{
-		background-color: white;
-		color: black;
-		font-family: Arial, Lucida Grande, sans-serif;
-		font-size: 10pt;
-		}
-		
-body	{
-		margin: 30;
-		}
-		
-ol	{
-	font-family: Arial, Lucida Grande, sans-serif;
-	font-size: 10pt;
-	margin-top: 0;
-	margin-bottom: 0;
-	margin-left: 0;
-	}
-
-h1	{
-	font-family: Arial, Lucida Grande, sans-serif;
-	font-size: 18pt;
-	margin-top: 0;
-	margin-bottom: 50;
-	}
-
-h2	{
-	font-family: Arial, Lucida Grande, sans-serif;
-	font-size: 16pt;
-	margin-top: 60;
-	margin-bottom: 20;
-	}
-	
-h3	{
-	font-family: Arial, Lucida Grande, sans-serif;
-	font-size: 14pt;
-	margin-top: 60;
-	margin-bottom: 20;
-	}
-
-h4	{
-	font-family: Arial, Lucida Grande, sans-serif;
-	font-size: 11pt;
-	margin-top: 0;
-	margin-bottom: 0;
-	}
-
-p	{
-	font-family: Arial, Lucida Grande, sans-serif;
-	font-size: 10pt;
-	margin-top: 10;
-	margin-bottom: 10;
-	}
-
-code	{
-		font-family: Courier-new, monospace;
-		font-size: 10pt;
-		margin-top: 10;
-		margin-bottom: 10;
-		}
-		
-pre	{
-	padding: 1em;
-	border: 1px dashed #2f6fab;
-	color: black;
-	background-color: #f9f9f9;
-	line-height: 1.1em;
-	}
-	
-	
-/* Tables */
-
-table
-{
-	margin: 0.5em 0 0 0.5em;
-	border-collapse: collapse;
-}
-
-td
-{
-	padding: 0.25em 0.5em 0.25em 0.5em;
-	border: 0pt solid #ADB9CC;
-	font-family: Arial, Lucida Grande, sans-serif;
-	font-size: 10pt;
-}
-		
-
-/* Links */
-
-a	{
-	text-decoration: none;
-	color: #002bb8;
-	background: none;
-	}
-	
-a:hover {
-		text-decoration: underline;
-		color: green;
-		}
-	
-a:visited:hover	{
-				text-decoration: underline;
-				color: red;
-				}
-</style>
-
-</head>
-
-<body>
-
-<h1>How to prepare a WinGRASS Release</h1>
-
-<div class="table-of-contents">
-
-<p><strong>Table of Contents</strong></p>
-
-<p><a href="#Introduction">Introduction</a></p>
-
-<p><ol>
-<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>
-
-<p><a href="#Credits and Contacts">Credits and Contacts</a></p>
-
-<br>
-
-</div>
-
-
-
-<div id="Introduction">
-
-<p><h3>Introduction</h3></p>
-
-
-<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, we highly recommend to follow each step and command
-exactly as they are written in this document.</p>
-
-</div>
-
-
-
-
-<div id="Install OSGeo4w Tree and Compile Grass">
-
-<p><h3>1. Install OSGeo4w Tree and Compile Grass</h3></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>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="Create a GRASS self-contained Package">
-
-<p><h3>2. Create a GRASS self-contained Package</h3></p>
-
-<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 paths to your OSGeo4W tree (eg. <code>c:\OSGeo4W</code>) and the GRASS version being packaged (eg. <code>grass-7.0.svn</code>).</p>
-
-<p>Launch the file <code>c:\temp\GRASS-Packager.bat</code> and select 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>
-
-</div>
-
-
-
-
-<div id="Remove OSGeo4W Traces from Package">
-
-<p><h3>3. Remove OSGeo4W Traces from Package</h3></p>
-
-<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 (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>
-
-</div>
-
-
-
-
-<div id="Install NSIS">
-
-<p><h3>4. 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="Install NSIS: Untgz Plugin">
-
-<p><h3>5. Install NSIS: Untgz Plugin (1.0.15)</h3></p>
-
-<p>Download the <a target="_blank" href="http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip">NSIS Untgz Plugin</a></p>
-
-<p>Unzip to <code>c:\DevTools\Plugins\</code></p>
-
-<p>Copy <code>c:\DevTools\Plugins\untgz\untgz.dll</code> to <code>c:\DevTools\Plugins\</code></p>
-
-</div>
-
-
-
-
-<div id="Create the WinGRASS Installer">
-
-<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 13 set the <code>DEMOLOCATION_PATH</code> varibale to the demolocation folder in the source tree.
-For example, <code>c:\msys\local\src\grass-7.0.svn\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>
-
-<p>When finished, you should have the WinGRASS release installer in <code>c:\temp</code>.</p>
-
-</div>
-
-
-
-
-<div id="Credits and Contacts">
-
-<p><h3>Credits and Contacts</h3></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 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>
-
-</div>
-
-</body>
-
-</html>
-
+<html>
+
+<head>
+
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Language" content="en" />
+<meta name="Author" content="Marco Pasetti" />
+<meta name="Description" content="SVN mswindows README" />
+
+<title>SVN mswindows README</title>
+
+<style type="text/css" />
+
+/* Wiki Pages Styles */
+
+/* TableOfContents */
+
+.table-of-contents	{ 
+					border: 1px solid #bbbbbb;
+					color: black; background-color: #eeeeee;
+					font-size: small;
+					text-align:left;
+					margin: 0.5em; padding-left: 1em;
+					width: 360;
+					}
+
+/* Contents */
+
+html	{
+		background-color: white;
+		color: black;
+		font-family: Arial, Lucida Grande, sans-serif;
+		font-size: 10pt;
+		}
+		
+body	{
+		margin: 30;
+		}
+		
+ol	{
+	font-family: Arial, Lucida Grande, sans-serif;
+	font-size: 10pt;
+	margin-top: 0;
+	margin-bottom: 0;
+	margin-left: 0;
+	}
+
+h1	{
+	font-family: Arial, Lucida Grande, sans-serif;
+	font-size: 18pt;
+	margin-top: 0;
+	margin-bottom: 50;
+	}
+
+h2	{
+	font-family: Arial, Lucida Grande, sans-serif;
+	font-size: 16pt;
+	margin-top: 60;
+	margin-bottom: 20;
+	}
+	
+h3	{
+	font-family: Arial, Lucida Grande, sans-serif;
+	font-size: 14pt;
+	margin-top: 60;
+	margin-bottom: 20;
+	}
+
+h4	{
+	font-family: Arial, Lucida Grande, sans-serif;
+	font-size: 11pt;
+	margin-top: 0;
+	margin-bottom: 0;
+	}
+
+p	{
+	font-family: Arial, Lucida Grande, sans-serif;
+	font-size: 10pt;
+	margin-top: 10;
+	margin-bottom: 10;
+	}
+
+code	{
+		font-family: Courier-new, monospace;
+		font-size: 10pt;
+		margin-top: 10;
+		margin-bottom: 10;
+		}
+		
+pre	{
+	padding: 1em;
+	border: 1px dashed #2f6fab;
+	color: black;
+	background-color: #f9f9f9;
+	line-height: 1.1em;
+	}
+	
+	
+/* Tables */
+
+table
+{
+	margin: 0.5em 0 0 0.5em;
+	border-collapse: collapse;
+}
+
+td
+{
+	padding: 0.25em 0.5em 0.25em 0.5em;
+	border: 0pt solid #ADB9CC;
+	font-family: Arial, Lucida Grande, sans-serif;
+	font-size: 10pt;
+}
+		
+
+/* Links */
+
+a	{
+	text-decoration: none;
+	color: #002bb8;
+	background: none;
+	}
+	
+a:hover {
+		text-decoration: underline;
+		color: green;
+		}
+	
+a:visited:hover	{
+				text-decoration: underline;
+				color: red;
+				}
+</style>
+
+</head>
+
+<body>
+
+<h1>How to prepare a WinGRASS Release</h1>
+
+<div class="table-of-contents">
+
+<p><strong>Table of Contents</strong></p>
+
+<p><a href="#Introduction">Introduction</a></p>
+
+<p><ol>
+<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>
+
+<p><a href="#Credits and Contacts">Credits and Contacts</a></p>
+
+<br>
+
+</div>
+
+
+
+<div id="Introduction">
+
+<p><h3>Introduction</h3></p>
+
+
+<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, we highly recommend to follow each step and command
+exactly as they are written in this document.</p>
+
+</div>
+
+
+
+
+<div id="Install OSGeo4w Tree and Compile Grass">
+
+<p><h3>1. Install OSGeo4w Tree and Compile Grass</h3></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>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="Create a GRASS self-contained Package">
+
+<p><h3>2. Create a GRASS self-contained Package</h3></p>
+
+<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 paths to your OSGeo4W tree (eg. <code>c:\OSGeo4W</code>) and the GRASS version being packaged (eg. <code>grass-7.0.svn</code>).</p>
+
+<p>Launch the file <code>c:\temp\GRASS-Packager.bat</code> and select 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>
+
+</div>
+
+
+
+
+<div id="Remove OSGeo4W Traces from Package">
+
+<p><h3>3. Remove OSGeo4W Traces from Package</h3></p>
+
+<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 (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>
+
+</div>
+
+
+
+
+<div id="Install NSIS">
+
+<p><h3>4. 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="Install NSIS: Untgz Plugin">
+
+<p><h3>5. Install NSIS: Untgz Plugin (1.0.15)</h3></p>
+
+<p>Download the <a target="_blank" href="http://nsis.sourceforge.net/mediawiki/images/9/9d/Untgz.zip">NSIS Untgz Plugin</a></p>
+
+<p>Unzip to <code>c:\DevTools\Plugins\</code></p>
+
+<p>Copy <code>c:\DevTools\Plugins\untgz\untgz.dll</code> to <code>c:\DevTools\Plugins\</code></p>
+
+</div>
+
+
+
+
+<div id="Create the WinGRASS Installer">
+
+<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 13 set the <code>DEMOLOCATION_PATH</code> varibale to the demolocation folder in the source tree.
+For example, <code>c:\msys\local\src\grass-7.0.svn\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>
+
+<p>When finished, you should have the WinGRASS release installer in <code>c:\temp</code>.</p>
+
+</div>
+
+
+
+
+<div id="Credits and Contacts">
+
+<p><h3>Credits and Contacts</h3></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 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>
+
+</div>
+
+</body>
+
+</html>
+