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

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Apr 30 02:59:46 PDT 2013


Author: hamish
Date: 2013-04-30 02:59:46 -0700 (Tue, 30 Apr 2013)
New Revision: 56046

Modified:
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
   grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl
   grass/branches/releasebranch_6_4/mswindows/env.bat
Log:
merge updates from devbr6 from the last few days

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl	2013-04-30 09:51:32 UTC (rev 56045)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi.tmpl	2013-04-30 09:59:46 UTC (rev 56046)
@@ -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'
@@ -834,13 +834,13 @@
 	;${StrReplace} "$UNIX_LIKE_GIS_DATABASE_PATH" "\" "/" "$GIS_DATABASE"
 
 	SetShellVarContext current  
-	${If} ${FileExists} "$APPDATA\GRASS at GRASS_VERSION_MAJOR@\rc"
-	      DetailPrint "File $APPDATA\GRASS at GRASS_VERSION_MAJOR@\rc already exists. Skipping."
+	${If} ${FileExists} "$APPDATA\GRASS at GRASS_VERSION_MAJOR@\grassrc6"
+	      DetailPrint "File $APPDATA\GRASS at GRASS_VERSION_MAJOR@\grassrc6 already exists. Skipping."
 	${Else}
-	      ;create $APPDATA\GRASS at GRASS_VERSION_MAJOR@\rc
+	      ;create $APPDATA\GRASS at GRASS_VERSION_MAJOR@\grassrc6
 	      ClearErrors
 	      CreateDirectory	$APPDATA\GRASS at GRASS_VERSION_MAJOR@
-	      FileOpen $0 $APPDATA\GRASS at GRASS_VERSION_MAJOR@\rc w
+	      FileOpen $0 $APPDATA\GRASS at GRASS_VERSION_MAJOR@\grassrc6 w
 	      IfErrors done_create_grass_rc
 	      FileWrite $0 'GISDBASE: $GIS_DATABASE$\r$\n'
 	      FileWrite $0 'LOCATION_NAME: demolocation$\r$\n'
@@ -863,21 +863,32 @@
                  
 SectionEnd
 
-Function DownloadDataSet
+;--------------------------------------------------------------------------
 
+Function DownloadInstallMSRuntime
+
 	IntOp $ARCHIVE_SIZE_MB $ARCHIVE_SIZE_KB / 1024
-	
-	StrCpy $DOWNLOAD_MESSAGE_ "The installer will download the $EXTENDED_ARCHIVE_NAME sample data set.$\r$\n"
+
+	StrCpy $DOWNLOAD_MESSAGE_ "The installer will download the $EXTENDED_ARCHIVE_NAME.$\r$\n"
 	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$\r$\n"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_These system libraries from Microsoft are needed for programs"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ built with Microsoft's Visual C++ compiler, such as Python and"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ GDAL which ship with GRASS, since MS does not include them by"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ default. You might already have them installed by other software,"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ if so you don't need to install them again, but if not GRASS will"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ fail to start and you will see errors like 'Missing MSVCR71.dll"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ or MSVCP100.dll'.$\r$\n"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$\r$\n"
 	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_The archive is about $ARCHIVE_SIZE_MB MB and may take"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ several minutes to be downloaded.$\r$\n"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ several minutes to download.$\r$\n"
 	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$\r$\n"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_The $EXTENDED_ARCHIVE_NAME will be copyed to:$\r$\n"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$GIS_DATABASE\$CUSTOM_UNTAR_FOLDER.$\r$\n"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_The $EXTENDED_ARCHIVE_NAME will be copied to:$\r$\n"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$TEMP\$CUSTOM_UNTAR_FOLDER.$\r$\n"
 	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$\r$\n"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_Press OK to continue or Cancel to skip the download and complete the GRASS"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ installation without the $EXTENDED_ARCHIVE_NAME data set.$\r$\n"
-	
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_Press OK to continue and install the runtimes, or Cancel"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ to skip the download and complete the GRASS"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ installation without the $EXTENDED_ARCHIVE_NAME.$\r$\n"
+
 	MessageBox MB_OKCANCEL "$DOWNLOAD_MESSAGE_" IDOK download IDCANCEL cancel_download
 	
 	download:	
@@ -889,22 +900,28 @@
 		
 	download_ok:	
 	InitPluginsDir
-	untgz::extract "-d" "$GIS_DATABASE" "$TEMP\$ARCHIVE_NAME"
+	untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME"
 	Pop $0
 	StrCmp $0 "success" untar_ok untar_failed
 	
-	untar_ok:       
-	Rename "$GIS_DATABASE\$ORIGINAL_UNTAR_FOLDER" "$GIS_DATABASE\$CUSTOM_UNTAR_FOLDER"
+	untar_ok:
+	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe /q"
+	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe /q"	
+	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe /q"
+	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTDIR\extralib"
 	Delete "$TEMP\$ARCHIVE_NAME"
+	RMDir /r "$TEMP\$ORIGINAL_UNTAR_FOLDER"
+	;the following doesn't work. Maybe because the installer is still running?
+	RMDir "$TEMP\$ORIGINAL_UNTAR_FOLDER"
 	Goto end
 	
 	download_failed:
 	DetailPrint "$0" ;print error message to log
-	MessageBox MB_OK "Download Failed.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME sample data set."
+	MessageBox MB_OK "Download Failed.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME."
 	Goto end
 	
 	cancel_download:
-	MessageBox MB_OK "Download Cancelled.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME sample data set."
+	MessageBox MB_OK "Download Cancelled.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME."
 	Goto end
 	
 	untar_failed:
@@ -914,69 +931,38 @@
 
 FunctionEnd
 
-Section /O "North Carolina (Wake County) Data Set" SecNorthCarolinaSDB
+Section /O "Important Microsoft Runtime DLLs" SecMSRuntime
 
 	;Set the size (in KB)  of the archive file
-	StrCpy $ARCHIVE_SIZE_KB 138629
+	StrCpy $ARCHIVE_SIZE_KB 12521
 	
 	;Set the size (in KB) of the unpacked archive file
-	AddSize 293314
-  
-  	StrCpy $HTTP_PATH "http://grass.osgeo.org/sampledata"
-	StrCpy $ARCHIVE_NAME "nc_spm_latest.tar.gz"
-	StrCpy $EXTENDED_ARCHIVE_NAME "North Carolina (Wake County)"
-	StrCpy $ORIGINAL_UNTAR_FOLDER "nc_spm_08"
-	StrCpy $CUSTOM_UNTAR_FOLDER "North-Carolina"
+	AddSize 13500
 	
-	Call DownloadDataSet	
+	StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/release/msvcrt/"
+	StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-7.tar.bz2"
+	StrCpy $EXTENDED_ARCHIVE_NAME "Microsoft Visual C++ Redistributable Packages"
+	StrCpy $ORIGINAL_UNTAR_FOLDER "install_msruntime"
 	
-SectionEnd
+	Call DownloadInstallMSRuntime
 
-Section /O "South Dakota (Spearfish County) Data Set" SecSpearfishSDB
-
-	;Set the size (in KB)  of the archive file
-	StrCpy $ARCHIVE_SIZE_KB 20803
-	
-	;Set the size (in KB) of the unpacked archive file
-	AddSize 42171
-	
-	StrCpy $HTTP_PATH "http://grass.osgeo.org/sampledata"
-	StrCpy $ARCHIVE_NAME "spearfish_grass60data-0.3.tar.gz"
-	StrCpy $EXTENDED_ARCHIVE_NAME "South Dakota (Spearfish County)"
-	StrCpy $ORIGINAL_UNTAR_FOLDER "spearfish60"
-	StrCpy $CUSTOM_UNTAR_FOLDER "Spearfish60"
-	
-	Call DownloadDataSet
-
 SectionEnd
 
-;----------------------------------------------------------------------------------------------------------------------------
+Function DownloadDataSet
 
-
-Function DownloadInstallMSRuntime
-
 	IntOp $ARCHIVE_SIZE_MB $ARCHIVE_SIZE_KB / 1024
-
-	StrCpy $DOWNLOAD_MESSAGE_ "The installer will download the $EXTENDED_ARCHIVE_NAME.$\r$\n"
+	
+	StrCpy $DOWNLOAD_MESSAGE_ "The installer will download the $EXTENDED_ARCHIVE_NAME sample data set.$\r$\n"
 	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$\r$\n"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_These system libraries from Microsoft are needed for programs"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ built with Microsoft's Visual C++ compiler, such as Python and"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ GDAL which ship with GRASS, since MS does not include them by"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ default. You might already have them installed by other software,"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ if so you don't need to install them again, but if not GRASS will"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ fail to start and you will see errors like 'Missing MSVCR71.dll"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ or MSVCP100.dll'.$\r$\n"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$\r$\n"
 	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_The archive is about $ARCHIVE_SIZE_MB MB and may take"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ several minutes to be downloaded.$\r$\n"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ several minutes to download.$\r$\n"
 	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$\r$\n"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_The $EXTENDED_ARCHIVE_NAME will be copyed to:$\r$\n"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$TEMP\$CUSTOM_UNTAR_FOLDER.$\r$\n"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_The $EXTENDED_ARCHIVE_NAME dataset will be copied to:$\r$\n"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$GIS_DATABASE\$CUSTOM_UNTAR_FOLDER.$\r$\n"
 	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_$\r$\n"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_Press OK to continue and install the runtimes, or Cancel"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ to skip the download and complete the GRASS"
-	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ installation without the $EXTENDED_ARCHIVE_NAME.$\r$\n"
-
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_Press OK to continue or Cancel to skip the download and complete the GRASS"
+	StrCpy $DOWNLOAD_MESSAGE_ "$DOWNLOAD_MESSAGE_ installation without the $EXTENDED_ARCHIVE_NAME data set.$\r$\n"
+	
 	MessageBox MB_OKCANCEL "$DOWNLOAD_MESSAGE_" IDOK download IDCANCEL cancel_download
 	
 	download:	
@@ -988,26 +974,22 @@
 		
 	download_ok:	
 	InitPluginsDir
-	untgz::extract "-d" "$TEMP\$ORIGINAL_UNTAR_FOLDER" "-zbz2" "$TEMP\$ARCHIVE_NAME"
+	untgz::extract "-d" "$GIS_DATABASE" "$TEMP\$ARCHIVE_NAME"
 	Pop $0
 	StrCmp $0 "success" untar_ok untar_failed
 	
-	untar_ok:
-	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2005_x86.exe /q"
-	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2008_x86.exe /q"	
-	ExecWait "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\vcredist_2010_x86.exe /q"
-	CopyFiles "$TEMP\$ORIGINAL_UNTAR_FOLDER\bin\*.dll" "$INSTDIR\extralib"
+	untar_ok:       
+	Rename "$GIS_DATABASE\$ORIGINAL_UNTAR_FOLDER" "$GIS_DATABASE\$CUSTOM_UNTAR_FOLDER"
 	Delete "$TEMP\$ARCHIVE_NAME"
-	Delete "$TEMP\$ORIGINAL_UNTAR_FOLDER"
 	Goto end
 	
 	download_failed:
 	DetailPrint "$0" ;print error message to log
-	MessageBox MB_OK "Download Failed.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME."
+	MessageBox MB_OK "Download Failed.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME sample data set."
 	Goto end
 	
 	cancel_download:
-	MessageBox MB_OK "Download Cancelled.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME."
+	MessageBox MB_OK "Download Cancelled.$\r$\nGRASS will be installed without the $EXTENDED_ARCHIVE_NAME sample data set."
 	Goto end
 	
 	untar_failed:
@@ -1017,24 +999,43 @@
 
 FunctionEnd
 
-Section /O "Important Microsoft Runtime DLLs" SecMSRuntime
+Section /O "North Carolina (Wake County) Data Set" SecNorthCarolinaSDB
 
 	;Set the size (in KB)  of the archive file
-	StrCpy $ARCHIVE_SIZE_KB 12521
+	StrCpy $ARCHIVE_SIZE_KB 138629
 	
 	;Set the size (in KB) of the unpacked archive file
-	AddSize 13500
+	AddSize 293314
+  
+  	StrCpy $HTTP_PATH "http://grass.osgeo.org/sampledata"
+	StrCpy $ARCHIVE_NAME "nc_spm_latest.tar.gz"
+	StrCpy $EXTENDED_ARCHIVE_NAME "North Carolina (Wake County)"
+	StrCpy $ORIGINAL_UNTAR_FOLDER "nc_spm_08"
+	StrCpy $CUSTOM_UNTAR_FOLDER "North_Carolina"
 	
-	StrCpy $HTTP_PATH "http://download.osgeo.org/osgeo4w/release/msvcrt/"
-	StrCpy $ARCHIVE_NAME "msvcrt-1.0.1-7.tar.bz2"
-	StrCpy $EXTENDED_ARCHIVE_NAME "Microsoft Visual C++ Redistributable Packages"
-	StrCpy $ORIGINAL_UNTAR_FOLDER "install_msruntime"
+	Call DownloadDataSet	
 	
-	Call DownloadInstallMSRuntime
+SectionEnd
 
+Section /O "South Dakota (Spearfish County) Data Set" SecSpearfishSDB
+
+	;Set the size (in KB)  of the archive file
+	StrCpy $ARCHIVE_SIZE_KB 20803
+	
+	;Set the size (in KB) of the unpacked archive file
+	AddSize 42171
+	
+	StrCpy $HTTP_PATH "http://grass.osgeo.org/sampledata"
+	StrCpy $ARCHIVE_NAME "spearfish_grass60data-0.3.tar.gz"
+	StrCpy $EXTENDED_ARCHIVE_NAME "South Dakota (Spearfish County)"
+	StrCpy $ORIGINAL_UNTAR_FOLDER "spearfish60"
+	StrCpy $CUSTOM_UNTAR_FOLDER "Spearfish60"
+	
+	Call DownloadDataSet
+
 SectionEnd
 
-;----------------------------------------------------------------------------------------------------------------------------
+;--------------------------------------------------------------------------
 
 ;Uninstaller Section
 
@@ -1064,14 +1065,14 @@
 
 SectionEnd
 
-;----------------------------------------------------------------------------------------------------------------------------
+;--------------------------------------------------------------------------
 
 ;Installer Section Descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
 	!insertmacro MUI_DESCRIPTION_TEXT ${SecGRASS} "Install GRASS ${VERSION_NUMBER}"
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecMSRuntime} "Some software included in this installer (e.g. GDAL, Python) may need Microsoft's Visual C++ redistributable system libraries.$\r$\nDownload and install the Redistributable Package"	
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecNorthCarolinaSDB} "Download and install the North Carolina (Wake County) sample data set"
-	!insertmacro MUI_DESCRIPTION_TEXT ${SecSpearfishSDB} "Download and install the South Dakota (Spearfish County) sample data set"
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecMSRuntime} "Some software included in this installer (e.g. GDAL, Python) may need Microsoft's Visual C++ redistributable system libraries.$\r$\nDownload and install the Redistributable Package. (12 MB)"
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecNorthCarolinaSDB} "Download and install the North Carolina (Wake County) sample data set. (135 MB)"
+	!insertmacro MUI_DESCRIPTION_TEXT ${SecSpearfishSDB} "Download and install the South Dakota (Spearfish County) sample data set. (20 MB)"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
-;----------------------------------------------------------------------------------------------------------------------------
+;--------------------------------------------------------------------------

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl	2013-04-30 09:51:32 UTC (rev 56045)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat.tmpl	2013-04-30 09:59:46 UTC (rev 56046)
@@ -102,17 +102,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/releasebranch_6_4/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/env.bat	2013-04-30 09:51:32 UTC (rev 56045)
+++ grass/branches/releasebranch_6_4/mswindows/env.bat	2013-04-30 09:59:46 UTC (rev 56046)
@@ -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%



More information about the grass-commit mailing list