[GRASS-SVN] r44053 - grass/branches/releasebranch_6_4/mswindows

[svn_grass at osgeo.org]

Author: hellik
Date: 2010-10-27 14:23:30 -0700 (Wed, 27 Oct 2010)
New Revision: 44053

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

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-10-27 07:35:52 UTC (rev 44052)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-10-27 21:23:30 UTC (rev 44053)
@@ -671,11 +671,14 @@
 	FileWrite $0 'set GRASS_PROJSHARE=%GRASSDIR%\proj$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem Set GDAL_DATA$\r$\n'	
-	FileWrite $0 'set GDAL_DATA=%GRASSDIR%\etc\ogr_csv$\r$\n'
+	FileWrite $0 'set GDAL_DATA=%GRASSDIR%\share\gdal$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem Set PROJ_LIB$\r$\n'	
 	FileWrite $0 'set PROJ_LIB=%GRASSDIR%\proj$\r$\n'
 	FileWrite $0 '$\r$\n'
+	FileWrite $0 'rem Set GEOTIFF_CSV$\r$\n'	
+	FileWrite $0 'set GEOTIFF_CSV=%GRASSDIR%\share\epsg_csv$\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 'if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python$\r$\n'
@@ -792,11 +795,14 @@
 	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 '# 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 '# 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 'exec "$$GISBASE/etc/Init.sh" "$$@"'
 	FileClose $0
@@ -961,11 +967,12 @@
 	RMDir /r "$INSTDIR\locale"
 	RMDir /r "$INSTDIR\msys"
 	RMDir /r "$INSTDIR\proj"
+	RMDir /r "$INSTDIR\share"
 	RMDir /r "$INSTDIR\Python25"
 	RMDir /r "$INSTDIR\scripts"
 	RMDir /r "$INSTDIR\sqlite"
 	RMDir /r "$INSTDIR\tcl-tk"
-	RMDir /r "$INSTDIR\tools"	
+	RMDir /r "$INSTDIR\tools"
 	
 	;if empty, remove the install folder
 	RMDir "$INSTDIR"

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat	2010-10-27 07:35:52 UTC (rev 44052)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat	2010-10-27 21:23:30 UTC (rev 44053)
@@ -107,6 +107,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.