You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2013/07/06 18:52:32 UTC
svn commit: r1500304 - in /tcl/rivet/trunk: ChangeLog Makefile.in
rivet/packages/tclrivet/tclrivet.tcl src/apache-2/Makefile.am
src/apache-2/mod_rivet.c
Author: mxmanghi
Date: Sat Jul 6 16:52:32 2013
New Revision: 1500304
URL: http://svn.apache.org/r1500304
Log:
* src/parser/parserPkgInit.c: commands are created through the RIVET_OBJ_CMD macro
* rivet/packages/tclrivet/tclrivet.tcl: loading the rivetparser library caused
weird side effects and the interpreter failed when this package was required
by a script. It's still to be understood why librivetparser was loaded using
command 'load' in tclrivet.tcl
* src/apache-2/mod_rivet.c: reverting an attempt to include rivetparser
as package required by default.
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl
tcl/rivet/trunk/src/apache-2/Makefile.am
tcl/rivet/trunk/src/apache-2/mod_rivet.c
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1500304&r1=1500303&r2=1500304&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Sat Jul 6 16:52:32 2013
@@ -1,5 +1,11 @@
2013-07-06 Massimo Manghi <mx...@apache.org>
* src/parser/parserPkgInit.c: commands are created through the RIVET_OBJ_CMD macro
+ * rivet/packages/tclrivet/tclrivet.tcl: loading the rivetparser library caused
+ weird side effects and the interpreter failed when this package was required
+ by a script. It's still to be understood why librivetparser was loaded using
+ command 'load' in tclrivet.tcl
+ * src/apache-2/mod_rivet.c: reverting an attempt to include rivetparser
+ as package required by default.
2013-07-05 Massimo Manghi <mx...@apache.org>
* configure.ac: changed the default path for installation dir
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1500304&r1=1500303&r2=1500304&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Sat Jul 6 16:52:32 2013
@@ -18,7 +18,7 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 1496872 2013-06-26 10:19:02Z mxmanghi $
+# $Id: Makefile.am 1500301 2013-07-06 16:26:05Z mxmanghi $
#
# 2007/12/25: Added target uninistall-local that removes the tcl stuff (mxmanghi)
# 2010/06/22: target instal-data-local searches for pkgIndex.tcl files and deletes them
Modified: tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl?rev=1500304&r1=1500303&r2=1500304&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl (original)
+++ tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl Sat Jul 6 16:52:32 2013
@@ -18,8 +18,8 @@
package provide tclrivet 0.1
-load [file join [file dirname [info script]] .. .. \
- librivetparser[info sharedlibextension]]
+#load [file join [file dirname [info script]] .. .. \
+# librivetparser[info sharedlibextension]]
proc include { filename } {
set fl [ open $filename ]
Modified: tcl/rivet/trunk/src/apache-2/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/Makefile.am?rev=1500304&r1=1500303&r2=1500304&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/Makefile.am (original)
+++ tcl/rivet/trunk/src/apache-2/Makefile.am Sat Jul 6 16:52:32 2013
@@ -38,13 +38,13 @@ mod_rivet_la_SOURCES = \
TclWebapache.c \
rivetCore.c \
rivetConf.c \
- ../rivetChannel.c
-# ../parser/rivetParser.c
+ ../rivetChannel.c \
+ ../parser/rivetParser.c
##mod_rivet_la_SOURCES = mod_rivet.c mod_rivet.h
-mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version -L/usr/local/apache2/lib/rivet2.1
-mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@ -lrivetparser
+mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
+mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
# APXS_CPPFLAGS_SHLIB
Modified: tcl/rivet/trunk/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/mod_rivet.c?rev=1500304&r1=1500303&r2=1500304&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/trunk/src/apache-2/mod_rivet.c Sat Jul 6 16:52:32 2013
@@ -914,14 +914,6 @@ Rivet_PerInterpInit(server_rec *s, rivet
Rivet_InitServerVariables(interp, p );
// Rivet_PropagateServerConfArray( interp, rsc );
- if (Tcl_PkgRequire(interp, "rivetparser","0.2", 1) == NULL)
- {
- ap_log_error(APLOG_MARK, APLOG_ERR, APR_EGENERAL, s,
- MODNAME ": Error loading package rivetparser: %s",
- Tcl_GetStringResult(interp) );
- exit(1);
- }
-
/* Loading into the interpreter the commands provided by librivet.so */
/* Tcl Bug #3216070 has been solved with 8.5.10 and commands shipped with
* Rivetlib can be mapped at this stage
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org