[GRASS-SVN] r53756 - in grass/trunk/mswindows: . osgeo4w
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 9 07:21:24 PST 2012
Author: martinl
Date: 2012-11-09 07:21:23 -0800 (Fri, 09 Nov 2012)
New Revision: 53756
Modified:
grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
grass/trunk/mswindows/GRASS-Packager.bat.tmpl
grass/trunk/mswindows/osgeo4w/package.sh
Log:
update wingrass files: no TCL/TK dependency
Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl 2012-11-09 15:08:29 UTC (rev 53755)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl 2012-11-09 15:21:23 UTC (rev 53756)
@@ -808,7 +808,6 @@
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 '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/trunk/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Packager.bat.tmpl 2012-11-09 15:08:29 UTC (rev 53755)
+++ grass/trunk/mswindows/GRASS-Packager.bat.tmpl 2012-11-09 15:21:23 UTC (rev 53756)
@@ -1,7 +1,7 @@
rem -----------------------------------------------------------------------------------------------------------------------
rem Self Contained GRASS Automated Packager
rem -----------------------------------------------------------------------------------------------------------------------
-rem Edited by: Marco Pasetti
+rem Original author: Marco Pasetti
rem Revised for OSGeo4W by: Colin Nielsen, Helmut Kudrnovsky, and Martin Landa
rem Last Update: $Id$
rem -----------------------------------------------------------------------------------------------------------------------
@@ -19,8 +19,6 @@
set GRASS_PREFIX=%OSGEO4W_DIR%\apps\grass\grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@
set GRASS_BIN_PREFIX=%OSGEO4W_DIR%\bin
-set SVN_PATH=c:\Subversion
-
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Remove the previous Selected Package and create a new PACKAGE_DIR
@@ -32,11 +30,10 @@
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy %GRASS_PREFIX% & %GRASS_BIN_PREFIX% content to PACKAGE_DIR
+ at echo Copy %GRASS_PREFIX% content to PACKAGE_DIR
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
-rem xcopy %GRASS_BIN_PREFIX%\grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py %PACKAGE_DIR% /S/V/F
xcopy %GRASS_PREFIX% %PACKAGE_DIR% /S/V/F
@echo.
@@ -51,7 +48,6 @@
del %PACKAGE_DIR%\extralib\libgrass_*6.4*.dll
del %PACKAGE_DIR%\extralib\libgrass_*6.5*.dll
del %PACKAGE_DIR%\extralib\Qt*4.dll
-rem copy %OSGEO4W_DIR%\pgsql\lib\libpq.dll %PACKAGE_DIR%\extralib
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@@ -79,45 +75,9 @@
@echo.
copy %OSGEO4W_DIR%\usr\src\grass_trunk\mswindows\external\rbatch\* %PACKAGE_DIR%\extrabin
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy SQLite content to PACKAGE_DIR\sqlite
- at echo -----------------------------------------------------------------------------------------------------------------------
- at 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 -----------------------------------------------------------------------------------------------------------------------
- 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.
@@ -145,44 +105,6 @@
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy Tcl/Tk content to PACKAGE_DIR\tcl-tk
- at echo -----------------------------------------------------------------------------------------------------------------------
- at 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
-mkdir %PACKAGE_DIR%\tcl-tk\lib\tcl8\8.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
-
-xcopy %OSGEO4W_DIR%\lib\tcl8\8.5 %PACKAGE_DIR%\tcl-tk\lib\tcl8\8.5 /S/V/F/I
-
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy MSYS files to PACKAGE_DIR\msys
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
@@ -201,7 +123,6 @@
rem delete msys.bat from osgeo4w because there is an adaption (for spaces in installation path) written by GRASS-Installer.nsi
del %PACKAGE_DIR%\msys\msys.bat
-
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy Python content to PACKAGE_DIR\Python27
@@ -220,16 +141,6 @@
@echo.
@echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy Subversion content to PACKAGE_DIR\extrabin & PACKAGE_DIR\extralib
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo.
-
-copy %SVN_PATH%\svn.exe %PACKAGE_DIR%\extrabin
-copy %SVN_PATH%\*.dll %PACKAGE_DIR%\extralib
-
-
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
@echo Copy env.bat
@echo -----------------------------------------------------------------------------------------------------------------------
@echo.
Modified: grass/trunk/mswindows/osgeo4w/package.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/package.sh 2012-11-09 15:08:29 UTC (rev 53755)
+++ grass/trunk/mswindows/osgeo4w/package.sh 2012-11-09 15:21:23 UTC (rev 53756)
@@ -131,7 +131,6 @@
--with-gdal=$PWD/mswindows/osgeo4w/gdal-config \
--with-geos=$PWD/mswindows/osgeo4w/geos-config \
--with-liblas=$PWD/mswindows/osgeo4w/liblas-config \
- --with-tcltk \
--with-sqlite \
--with-curses \
--with-regex \
More information about the grass-commit
mailing list