From: Ron F. <ro...@us...> - 2005-07-29 18:49:05
|
Update of /cvsroot/nsclspectcl/SpecTcl/TCL In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1268/TCL Modified Files: ClanguageTraceCallbacks.h Makefile.am Log Message: Some fixups to attempt to port to Cygwin. all should be ok for the Linux etc. versions. Index: Makefile.am =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/TCL/Makefile.am,v retrieving revision 5.2 retrieving revision 5.3 diff -C2 -d -r5.2 -r5.3 *** Makefile.am 3 Jun 2005 15:19:30 -0000 5.2 --- Makefile.am 29 Jul 2005 18:48:55 -0000 5.3 *************** *** 2,6 **** INCLUDES = -I.. -I. @TCL_FLAGS@ -I../Utility -I../NSCLException @XINCLUDES@ LDADD = -ltclPlus -lException -lXt -lX11 $(X11EXTRA_LDFLAGS) ! LDFLAGS = -L. @TCL_LDFLAGS@ lib_LTLIBRARIES = libtclPlus.la --- 2,6 ---- INCLUDES = -I.. -I. @TCL_FLAGS@ -I../Utility -I../NSCLException @XINCLUDES@ LDADD = -ltclPlus -lException -lXt -lX11 $(X11EXTRA_LDFLAGS) ! AM_LDFLAGS = -L. @TCL_LDFLAGS@ lib_LTLIBRARIES = libtclPlus.la *************** *** 17,20 **** --- 17,28 ---- CLanguageTraceCallbacks.cpp + testableOjbects = TCLInterpreter.o TCLProcessor.o \ + TCLVariable.o TCLString.o \ + TCLResult.o TCLTimer.o TCLFileHandler.o \ + TCLList.o TCLException.o \ + TCLInterpreterObject.o \ + TCLCommandPackage.o TCLIdleProcess.o \ + TCLObject.o TCLChannel.o TCLTracedVariable.o \ + CLanguageTraceCallbacks.o libtclPlus_la_SOURCES = TCLApplication.cpp $(testableSources) *************** *** 39,44 **** tracetests_SOURCES = TestRunner.cpp \ ccallbacktest.cpp \ ! tracevartest.cpp \ ! $(testableSources) tracetests_LDADD = $(CPPUNIT_LDFLAGS) $(X11EXTRA_LDFLAGS) \ --- 47,53 ---- tracetests_SOURCES = TestRunner.cpp \ ccallbacktest.cpp \ ! tracevartest.cpp ! ! tracetests_DEPENDENCIES = $(testableOjects) tracetests_LDADD = $(CPPUNIT_LDFLAGS) $(X11EXTRA_LDFLAGS) \ *************** *** 52,54 **** CLanguageTraceCallback.3 ! EXTRA_DIST = TCL.WC TCL.omt tkAppInit.c $(man_MANS) --- 61,63 ---- CLanguageTraceCallback.3 ! EXTRA_DIST = TCL.WC TCL.omt tkAppInit.c $(man_MANS) \ No newline at end of file Index: ClanguageTraceCallbacks.h =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/TCL/ClanguageTraceCallbacks.h,v retrieving revision 5.1 retrieving revision 5.2 diff -C2 -d -r5.1 -r5.2 *** ClanguageTraceCallbacks.h 3 Jun 2005 15:19:30 -0000 5.1 --- ClanguageTraceCallbacks.h 29 Jul 2005 18:48:55 -0000 5.2 *************** *** 10,12 **** */ ! #ifndef _ --- 10,57 ---- */ ! #ifndef __CLANGUAGETRACECALLBACKS_H ! #define __CLANGUAGETRACECALLBACKS_H ! ! ! #ifndef __VARIABLETRACECALLBACKS_H ! #include "VariableTraceCallback.h" ! #endif ! ! ! #ifndef __TCL_H ! #include <tcl.h> ! #ifndef __TCL_H ! #define __TCL_H ! #endif ! #endif ! ! class CTCLInterpreter; ! ! // This is what a callback's signature looks like. ! ! typedef char* (VariableTraceCallback)(Tcl_Interp*, char*, char*, int, void*); ! ! /*! ! This is a variable trace callback that interfaces to unbound ! functions (e.g. those written in C). ! */ ! class CLanguageTraceCallback : public CVariableTraceCallback ! { ! private: ! VariableTraceCallback* m_pCallback; ! void* m_pClientData; ! ! public: ! CLanguageTraceCallback(VariableTraceCallback* pCallback, ! void* pClientData); ! ! virtual char* operator()(CTCLInterpreter* pInterp, ! char* pVariable, ! char* pElement, ! int flags); ! }; ! ! ! ! ! #endif |