[GRASS-SVN] r53754 - in grass/trunk: db/drivers/mysql display/d.what.vect doc gui/wxpython/docs gui/wxpython/lmgr gui/wxpython/mapdisp include mswindows/osgeo4w raster3d/r3.in.v5d raster3d/r3.out.v5d
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 9 07:04:15 PST 2012
Author: martinl
Date: 2012-11-09 07:04:14 -0800 (Fri, 09 Nov 2012)
New Revision: 53754
Modified:
grass/trunk/db/drivers/mysql/Makefile
grass/trunk/display/d.what.vect/Makefile
grass/trunk/doc/debugging.txt
grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html
grass/trunk/gui/wxpython/lmgr/layertree.py
grass/trunk/gui/wxpython/mapdisp/frame.py
grass/trunk/include/config.h.in
grass/trunk/mswindows/osgeo4w/config.h.vc
grass/trunk/raster3d/r3.in.v5d/vis5d.h
grass/trunk/raster3d/r3.out.v5d/vis5d.h
Log:
remove rest of TCL/TK artefacts
Modified: grass/trunk/db/drivers/mysql/Makefile
===================================================================
--- grass/trunk/db/drivers/mysql/Makefile 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/db/drivers/mysql/Makefile 2012-11-09 15:04:14 UTC (rev 53754)
@@ -14,7 +14,7 @@
LIBES = $(DBMIDRIVERLIB) $(DBMIBASELIB) $(DBSTUBSLIB) \
$(GISLIB) $(DATETIMELIB)
-EXTRA_CFLAGS = $(MYSQLINCPATH) $(TCLINCDIR) $(TKINCDIR)
+EXTRA_CFLAGS = $(MYSQLINCPATH)
EXTRA_LDFLAGS = $(MYSQLLIBPATH)
ifeq ($(PGM),mysql)
Modified: grass/trunk/display/d.what.vect/Makefile
===================================================================
--- grass/trunk/display/d.what.vect/Makefile 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/display/d.what.vect/Makefile 2012-11-09 15:04:14 UTC (rev 53754)
@@ -1,4 +1,3 @@
-
MODULE_TOPDIR = ../..
PGM = d.what.vect
@@ -12,12 +11,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
-# substitute OSX arch flags for tcltk
-ifneq ($(MACOSX_ARCHS),)
-CFLAGS := $(subst $(MACOSX_ARCHS),,$(CFLAGS)) $(MACOSX_ARCHS_TCLTK)
-LDFLAGS := $(subst $(MACOSX_ARCHS),,$(LDFLAGS)) $(MACOSX_ARCHS_TCLTK)
-endif
-
default: cmd
Modified: grass/trunk/doc/debugging.txt
===================================================================
--- grass/trunk/doc/debugging.txt 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/doc/debugging.txt 2012-11-09 15:04:14 UTC (rev 53754)
@@ -20,51 +20,8 @@
'-Werror-implicit-function-declaration'
Give a warning (or error) whenever a function is used before being
declared.
-
----------------------------------------------------
-Tcl/TK:
-A) Pure Tcl code:
-
- Typically you need to add "trace" commands to the code
- in question.
-
-B) To debug TCL code which uses C (including hybrid C+Tcl
- code, e.g. NVIZ, v.digit, run (example):
-
-GRASS:~> g.gisenv set="DEBUG=1"
-GRASS:~> d.text.freetype > dtf_tcl.txt
-
-then edit 'dtf_tcl.txt' to remove the "| wish &" from the end.
-
-then '. dtf_tcl.txt > dtf.tcl' to get rid of the echo-proofing chars.
-
-then 'wish < dtf.tcl' to test it.
-
-References:
-"Is white space significant in Tcl" http://wiki.tcl.tk/981
-"Tcl quoting hell" http://wiki.tcl.tk/1726
-"1 minute intro to tcl" http://www.pconline.com/~erc/tcl.htm
-
-NVIZ debug tip:
- at the start of nviz2.2_script, change the DEBUG setting to:
- set DEBUG 1
-
-To debug NVIZ:
-
-$ gdb $GISBASE/etc/nviz2.2/nviz
-> run -f $GISBASE/etc/nviz2.2/scripts/nviz2.2_script <any args>
-
-If you don't need to debug the startup, you can start NVIZ then
-"attach" to the process. E.g.
-
-$ gdb $GISBASE/etc/nviz2.2/nviz
-> attach <pid>
-> break Create_OS_Ctx
-> cont
-
-----------------------------------------------------
-
To make gcc less tolerant in accepting errors and code flaws, compile
with (see also ../INSTALL):
Modified: grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html
===================================================================
--- grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/gui/wxpython/docs/wxGUI.Nviz.html 2012-11-09 15:04:14 UTC (rev 53754)
@@ -382,8 +382,6 @@
Command-line module <em><a href="m.nviz.image.html">m.nviz.image</a></em>.
<br><br>
-Original <a href="nviz.html">TCL/TK-based</a> Nviz.
-
<h2>AUTHORS</h2>
<a href="http://geo.fsv.cvut.cz/gwiki/Landa">Martin
Modified: grass/trunk/gui/wxpython/lmgr/layertree.py
===================================================================
--- grass/trunk/gui/wxpython/lmgr/layertree.py 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/gui/wxpython/lmgr/layertree.py 2012-11-09 15:04:14 UTC (rev 53754)
@@ -40,7 +40,7 @@
from core.debug import Debug
from core.settings import UserSettings, GetDisplayVectSettings
from vdigit.main import haveVDigit
-from core.gcmd import GWarning
+from core.gcmd import GWarning, GError
from gui_core.toolbars import BaseIcons
from icons.icon import MetaIcon
@@ -631,20 +631,11 @@
if not haveVDigit:
from vdigit import errorMsg
- msg = _("Unable to start wxGUI vector digitizer.\nDo you want to start "
- "TCL/TK digitizer (v.digit) instead?\n\n"
- "Details: %s" % errorMsg)
self.mapdisplay.toolbars['map'].combo.SetValue (_("2D view"))
- dlg = wx.MessageDialog(parent = self.mapdisplay,
- message = msg,
- caption=_("Vector digitizer failed"),
- style = wx.YES_NO | wx.CENTRE)
- if dlg.ShowModal() == wx.ID_YES:
- self.lmgr.goutput.RunCmd(['v.digit', 'map=%s' % maplayer.GetName()],
- switchPage = False)
- dlg.Destroy()
+ GError(_("Unable to start wxGUI vector digitizer.\n"
+ "Details: %s") % errorMsg, parent = self)
return
if not self.mapdisplay.GetToolbar('vdigit'): # enable tool
Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py 2012-11-09 15:04:14 UTC (rev 53754)
@@ -194,22 +194,11 @@
if not haveVDigit:
from vdigit import errorMsg
- msg = _("Unable to start wxGUI vector digitizer.\nDo you want to start "
- "TCL/TK digitizer (v.digit) instead?\n\n"
- "Details: %s" % errorMsg)
self.toolbars['map'].combo.SetValue(_("2D view"))
- dlg = wx.MessageDialog(parent = self,
- message = msg,
- caption=_("Vector digitizer failed"),
- style = wx.YES_NO | wx.CENTRE)
- if dlg.ShowModal() == wx.ID_YES:
- mapName = self.tree.GetPyData(self.tree.layer_selected)[0]['maplayer'].GetName()
- self._layerManager.goutput.RunCmd(['v.digit', 'map=%s' % mapName],
- switchPage = False)
- dlg.Destroy()
- self.toolbars['map'].combo.SetValue(_("2D view"))
+ GError(_("Unable to start wxGUI vector digitizer.\n"
+ "Details: %s") % errorMsg, parent = self)
return
if self._layerManager:
Modified: grass/trunk/include/config.h.in
===================================================================
--- grass/trunk/include/config.h.in 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/include/config.h.in 2012-11-09 15:04:14 UTC (rev 53754)
@@ -206,9 +206,6 @@
/* define if NLS requested */
#undef USE_NLS
-/* define if TclTk exists */
-#undef HAVE_TCLTK
-
/* define if putenv() exists */
#undef HAVE_PUTENV
Modified: grass/trunk/mswindows/osgeo4w/config.h.vc
===================================================================
--- grass/trunk/mswindows/osgeo4w/config.h.vc 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/mswindows/osgeo4w/config.h.vc 2012-11-09 15:04:14 UTC (rev 53754)
@@ -221,9 +221,6 @@
/* define if <X11/GLw/GLwMDrawA.h> exists */
/* #undef HAVE_X11_GLW_GLWMDRAWA_H */
-/* define if TclTk exists */
-#define HAVE_TCLTK 1
-
/* define if putenv() exists */
#ifndef HAVE_PUTENV
#define HAVE_PUTENV 1
Modified: grass/trunk/raster3d/r3.in.v5d/vis5d.h
===================================================================
--- grass/trunk/raster3d/r3.in.v5d/vis5d.h 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/raster3d/r3.in.v5d/vis5d.h 2012-11-09 15:04:14 UTC (rev 53754)
@@ -54,10 +54,6 @@
#define USAFILE "OUTLUSAM"
-/* Default filename of Tcl startup commands: */
-#define TCL_STARTUP_FILE "vis5d.tcl"
-
-
/* Default directory to search for user functions: */
#define FUNCTION_PATH "userfuncs"
Modified: grass/trunk/raster3d/r3.out.v5d/vis5d.h
===================================================================
--- grass/trunk/raster3d/r3.out.v5d/vis5d.h 2012-11-09 14:52:34 UTC (rev 53753)
+++ grass/trunk/raster3d/r3.out.v5d/vis5d.h 2012-11-09 15:04:14 UTC (rev 53754)
@@ -54,10 +54,6 @@
#define USAFILE "OUTLUSAM"
-/* Default filename of Tcl startup commands: */
-#define TCL_STARTUP_FILE "vis5d.tcl"
-
-
/* Default directory to search for user functions: */
#define FUNCTION_PATH "userfuncs"
More information about the grass-commit
mailing list