[GRASS-SVN] r55825 - grass/branches/develbranch_6/mswindows

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-04-16 00:28:54 -0700 (Tue, 16 Apr 2013)
New Revision: 55825

Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
   grass/branches/develbranch_6/mswindows/GRASS-Packager.bat.tmpl
   grass/branches/develbranch_6/mswindows/env.bat
Log:
gpsbabel moved to extrabin

Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2013-04-16 07:25:52 UTC (rev 55824)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi.tmpl	2013-04-16 07:28:54 UTC (rev 55825)
@@ -777,7 +777,7 @@
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 '# Set the PATH variable$\r$\n'
 	FileWrite $0 'PATH="$$GISBASE/extrabin:$$GISBASE/extralib:$$PATH"$\r$\n'
-	FileWrite $0 'PATH="$$GISBASE/tcl-tk/bin:$$GISBASE/sqlite/bin:$$GISBASE/gpsbabel:$$PATH"$\r$\n'
+	FileWrite $0 'PATH="$$GISBASE/tcl-tk/bin:$$GISBASE/sqlite/bin:$$PATH"$\r$\n'
 	FileWrite $0 'export PATH$\r$\n'
 	FileWrite $0 '# Set the PYTHONPATH variable$\r$\n'
 	FileWrite $0 'PYTHONPATH="$$GISBASE/etc/python:$$GISBASE/Python27:$$PYTHONPATH"$\r$\n'

Modified: grass/branches/develbranch_6/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Packager.bat.tmpl	2013-04-16 07:25:52 UTC (rev 55824)
+++ grass/branches/develbranch_6/mswindows/GRASS-Packager.bat.tmpl	2013-04-16 07:28:54 UTC (rev 55825)
@@ -109,17 +109,6 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy GPSBABEL executable and dll to PACKAGE_DIR\gpsbabel
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo.
-
-mkdir %PACKAGE_DIR%\gpsbabel
-
-copy %OSGEO4W_DIR%\gpsbabel.exe %PACKAGE_DIR%\gpsbabel
-rem copy %OSGEO4W_DIR%\libexpat.dll %PACKAGE_DIR%\gpsbabel
-
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
 @echo Copy shared PROJ.4 files to PACKAGE_DIR\proj
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.

Modified: grass/branches/develbranch_6/mswindows/env.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/env.bat	2013-04-16 07:25:52 UTC (rev 55824)
+++ grass/branches/develbranch_6/mswindows/env.bat	2013-04-16 07:28:54 UTC (rev 55825)
@@ -13,5 +13,5 @@
 
 set PATH=%GISBASE%\msys\bin;%PATH%
 set PATH=%GISBASE%\extrabin;%GISBASE%\extralib;%PATH%
-set PATH=%GISBASE%\tcl-tk\bin;%GISBASE%\sqlite\bin;%GISBASE%\gpsbabel;%PATH%
+set PATH=%GISBASE%\tcl-tk\bin;%GISBASE%\sqlite\bin;%PATH%
 set PATH=%GISBASE%\bin;%PATH%