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

[svn_grass at osgeo.org]

Author: hellik
Date: 2010-10-27 14:26:49 -0700 (Wed, 27 Oct 2010)
New Revision: 44055

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi
   grass/trunk/mswindows/GRASS-Packager.bat
Log:
use correct set GDAL_DATA and GEOTIFF_CSV variables and include required files #1201

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2010-10-27 21:25:24 UTC (rev 44054)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2010-10-27 21:26:49 UTC (rev 44055)
@@ -739,11 +739,14 @@
 	FileWrite $0 'set GRASS_PROJSHARE=%GISBASE%\proj$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem Set GDAL_DATA$\r$\n'	
-	FileWrite $0 'set GDAL_DATA=%GISBASE%\etc\ogr_csv$\r$\n'
+	FileWrite $0 'set GDAL_DATA=%GISBASE%\share\gdal$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem Set PROJ_LIB$\r$\n'	
 	FileWrite $0 'set PROJ_LIB=%GISBASE%\proj$\r$\n'
 	FileWrite $0 '$\r$\n'
+	FileWrite $0 'rem Set GEOTIFF_CSV$\r$\n'	
+	FileWrite $0 'set GEOTIFF_CSV=%GISBASE%\share\epsg_csv$\r$\n'
+	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem Path to the python directory$\r$\n'
 	FileWrite $0 'set PYTHONHOME=%GISBASE%\Python25$\r$\n'
 	FileWrite $0 'if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python$\r$\n'
@@ -874,13 +877,17 @@
 	FileWrite $0 'export GRASS_PROJSHARE$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 '# Set the GDAL_DATA variable$\r$\n'
-	FileWrite $0 'GDAL_DATA="$INSTALL_DIR\etc\ogr_csv"$\r$\n'
+	FileWrite $0 'GDAL_DATA="$INSTALL_DIR\share\gdal"$\r$\n'
 	FileWrite $0 'export GDAL_DATA$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 '# Set the PROJ_LIB variable$\r$\n'
 	FileWrite $0 'PROJ_LIB="$INSTALL_DIR\proj"$\r$\n'
 	FileWrite $0 'export PROJ_LIB $\r$\n'
 	FileWrite $0 '$\r$\n'
+	FileWrite $0 '# Set the GEOTIFF_CSV variable$\r$\n'
+	FileWrite $0 'GEOTIFF_CSV="$INSTALL_DIR\share\epsg_csv"$\r$\n'
+	FileWrite $0 'export GEOTIFF_CSV$\r$\n'
+	FileWrite $0 '$\r$\n'
 	FileWrite $0 '"$$GRASS_PYTHON $$GISBASE/grass70.py" "$$@"'
 	FileClose $0
 	done_create_grass_command:

Modified: grass/trunk/mswindows/GRASS-Packager.bat
===================================================================
--- grass/trunk/mswindows/GRASS-Packager.bat	2010-10-27 21:25:24 UTC (rev 44054)
+++ grass/trunk/mswindows/GRASS-Packager.bat	2010-10-27 21:26:49 UTC (rev 44055)
@@ -117,6 +117,25 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
+ at echo Copy shared GDAL files to PACKAGE_DIR\share\gdal
+ at echo -----------------------------------------------------------------------------------------------------------------------
+ at echo.
+
+mkdir %PACKAGE_DIR%\share
+mkdir %PACKAGE_DIR%\share\gdal
+xcopy %OSGEO4W_DIR%\share\gdal %PACKAGE_DIR%\share\gdal /S/V/F/I
+
+ at echo.
+ at echo -----------------------------------------------------------------------------------------------------------------------
+ at echo Copy shared GEOTIFF files to PACKAGE_DIR\share\epsg_csv
+ at echo -----------------------------------------------------------------------------------------------------------------------
+ at echo.
+
+mkdir %PACKAGE_DIR%\share\epsg_csv
+xcopy %OSGEO4W_DIR%\share\epsg_csv %PACKAGE_DIR%\share\epsg_csv /S/V/F/I
+
+ at echo.
+ at echo -----------------------------------------------------------------------------------------------------------------------
 @echo Copy Tcl/Tk content to PACKAGE_DIR\tcl-tk
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.