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/11/05 01:26:55 UTC
svn commit: r1538844 - in /tcl/rivet/branches/modular: ./ doc/ doc/xml/
rivet/ rivet/packages/calendar/ src/ src/apache-2/ src/librivet/
src/rivetcmds/ tests/
Author: mxmanghi
Date: Tue Nov 5 00:26:54 2013
New Revision: 1538844
URL: http://svn.apache.org/r1538844
Log:
* src/Makefile.am: this Makefile.am is now in charge for building mod_rivet
librivet.so and librivetparser.so. This fixes and problem with the 'distclean'
target and keeps us from further customization of automake (subdir-objects
property)
* src/runtests.tcl: changed path to mod_rivet.so and librivetparser.so
Modified:
tcl/rivet/branches/modular/ (props changed)
tcl/rivet/branches/modular/ChangeLog
tcl/rivet/branches/modular/configure.ac
tcl/rivet/branches/modular/doc/ (props changed)
tcl/rivet/branches/modular/doc/xml/session.xml
tcl/rivet/branches/modular/rivet/packages/calendar/calendar.tcl
tcl/rivet/branches/modular/rivet/pkgIndex.tcl
tcl/rivet/branches/modular/src/Makefile.am
tcl/rivet/branches/modular/src/apache-2/Makefile.am
tcl/rivet/branches/modular/src/librivet/Makefile.am
tcl/rivet/branches/modular/src/rivetcmds/rivetCore.c
tcl/rivet/branches/modular/tests/parsepackage.test
tcl/rivet/branches/modular/tests/runtests.tcl
Propchange: tcl/rivet/branches/modular/
------------------------------------------------------------------------------
Merged /tcl/rivet/trunk:r1525299-1538805
Modified: tcl/rivet/branches/modular/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/ChangeLog?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/ChangeLog (original)
+++ tcl/rivet/branches/modular/ChangeLog Tue Nov 5 00:26:54 2013
@@ -1,3 +1,25 @@
+2013-11-04 Massimo Manghi <mx...@apache.org>
+ * src/Makefile.am: this Makefile.am is now in charge for building mod_rivet
+ librivet.so and librivetparser.so. This fixes and problem with the 'distclean'
+ target and keeps us from further customization of automake (subdir-objects
+ property)
+ * src/runtests.tcl: changed path to mod_rivet.so and librivetparser.so
+
+2013-10-15 Massimo Manghi <mx...@apache.org>
+ * src/rivetcmds/rivetCore.c: 'headers redirect' used to return TCL_RETURN
+ to force the caller to terminate and interrupt the processing. It didn't
+ actually worked exactly that way and starting with Tcl 8.6.1 it also failed
+ returning a Tcl invalid error code (Bug #55583). Turning it into TCL_OK
+ seems to cure the problem
+
+2013-09-26 Massimo Manghi <mx...@apache.org>
+ * doc/xml/session.xml: fixed code example indentation
+ * rivet/packages/calendar.xml: fixed class and tag for calendar banner
+
+2013-09-23 Massimo Manghi <mx...@apache.org>
+ * rivet/packages/calendar/calendar.tcl: fixed zero length argument list
+ calling method emit
+
2013-09-22 Massimo Manghi <mx...@apache.org>
* modular: committing changes from last merge
Modified: tcl/rivet/branches/modular/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/configure.ac?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/configure.ac (original)
+++ tcl/rivet/branches/modular/configure.ac Tue Nov 5 00:26:54 2013
@@ -26,8 +26,7 @@ AC_INIT([Rivet],[2.1.3])
TEA_INIT([3.9])
AC_CONFIG_AUX_DIR(tclconfig)
-AM_INIT_AUTOMAKE([subdir-objects])
-#AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -53,7 +52,7 @@ AX_PREFIX_CONFIG_H([rivet_config.h],[riv
# Init automake stuff
#
AC_DISABLE_STATIC
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
#--------------------------------------------------------------------
# Load the tclConfig.sh file
@@ -749,7 +748,7 @@ if test "$print_fileevent_msg" = "1"; th
AC_MSG_NOTICE([Nonetheless Rivet scripts are working with Tcl >= 8.5.10 provided])
AC_MSG_NOTICE([you do not have to rely on the event loop to do I/O (e.g. you])
AC_MSG_NOTICE([cannot use the 'fileevent' command to set up callbacks)])
- AC_MSG_NOTICE([see issue https://issues.apache.org/bugzilla/show_bug.cgi?id=55153])
+ AC_MSG_NOTICE([see https://issues.apache.org/bugzilla/show_bug.cgi?id=55153])
AC_MSG_NOTICE([========================================================================])
fi
Propchange: tcl/rivet/branches/modular/doc/
------------------------------------------------------------------------------
Merged /tcl/rivet/trunk/doc:r1523652-1538805
Modified: tcl/rivet/branches/modular/doc/xml/session.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/doc/xml/session.xml?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/doc/xml/session.xml (original)
+++ tcl/rivet/branches/modular/doc/xml/session.xml Tue Nov 5 00:26:54 2013
@@ -57,10 +57,8 @@
called <varname>DIO</varname> (the name of which can be
overridden). We get it by doing a</para>
- <programlisting>
- RivetServerConf ChildInitScript "package require DIO"
- RivetServerConf ChildInitScript "::DIO::handle Postgresql DIO -user www"
- </programlisting>
+ <programlisting>RivetServerConf ChildInitScript "package require DIO"
+RivetServerConf ChildInitScript "::DIO::handle Postgresql DIO -user www"</programlisting>
</section>
Modified: tcl/rivet/branches/modular/rivet/packages/calendar/calendar.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/rivet/packages/calendar/calendar.tcl?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/rivet/packages/calendar/calendar.tcl (original)
+++ tcl/rivet/branches/modular/rivet/packages/calendar/calendar.tcl Tue Nov 5 00:26:54 2013
@@ -18,13 +18,7 @@
# $Id: calendar.tcl 916 2010-07-03 00:37:44Z massimo.manghi $
#
-
-if {[catch {package require Tcl 8.5} e] || [catch {package require dict} e]} {
- return -code error -errorinfo "Tcl 8.5 or Tcl 8.4 with package 'dict' required ($e)" \
- "Tcl 8.5 or Tcl 8.4 with package 'dict' required ($e)"
-}
-
-package provide Calendar 1.0
+package provide Calendar 1.1
package require Itcl
# Calendar: base class to create a calendar table.
@@ -60,18 +54,18 @@ package require Itcl
public variable language en
private method numberOfDays { month year }
- private method cal { month year }
+ private method cal { month year }
- protected method weekdays { }
+ protected method weekdays { }
protected method banner { mth yr }
protected method header { mth yr }
- protected method first_week { mth yr wkday }
- protected method formatDayCell { day }
- protected method openRow { wkn }
- protected method closeRow { }
+ protected method first_week { mth yr wkday }
+ protected method formatDayCell { day }
+ protected method openRow { wkn }
+ protected method closeRow { }
protected method table { mth yr }
- protected method startOutput { }
- protected method closeOutput { }
+ protected method startOutput { }
+ protected method closeOutput { }
public method cal_processed {} { return $month_year_processed }
@@ -126,9 +120,6 @@ package require Itcl
# first_week returns as many blank cells as the number of weekdays starting from Sun up to the first day of the
# month.
#
-
-
-
::itcl::body Calendar::first_week {month_idx year weekday} {
return [string repeat " " $weekday]
}
@@ -191,14 +182,17 @@ package require Itcl
}
-# emit args: emit returns the text of the calendar. If one argument is passed
-# to this method its value is taken as a year number and the whole calendar for
-# that year is printed, thus cycling this same method for each month of the year and
-# concatenating the output in a single buffer.
-# If 2 arguments are passed emit interprets them as month and year. <month> can be
-# specified both in number (1-12) or abbreviated name (Jan,Feb,....,Dec). A minimal support
-# for other languages exists. If no arguments are passed to 'emit' the current month
-# calendar is displayed.
+# emit args:
+#
+# emit returns the text of the calendar. If one argument is passed
+# to this method its value is taken as a year number and the whole
+# calendar for that year is printed, thus cycling this same method
+# for each month of the year and concatenating the output in a single
+# buffer. If 2 arguments are passed emit interprets them as month
+# and year. <month> can be specified both in number (1-12) or
+# abbreviated name (Jan,Feb,....,Dec). A minimal support for other
+# languages exists. If no arguments are passed to 'emit' the current
+# month calendar is displayed.
#
::itcl::body Calendar::emit { args } {
@@ -290,10 +284,11 @@ package require Itcl
default {
# no arguments, we take today as reference
+
+ scan [clock format [clock seconds] -format %m] "%d" month
+ set year [format "%d" [clock format [clock sec] -format %Y]]
+ return [cal [incr month -1] $year]
- set month [clock format [clock sec] -format %m]
- set year [clock format [clock sec] -format %Y]
- return [cal [incr month -1] $year]
}
}
@@ -321,7 +316,7 @@ package require Itcl
# for every key a 'tag' and 'attr' key is defined. attr is a even-length list storing
# attribute-value pairs
- protected variable parameters
+ public variable parameters
# we are emitting (x)html code that has to be encapsulated
# in this root element. If the value is a list the first element is
@@ -377,7 +372,7 @@ package require Itcl
foot {tag "calfoot" attr "" } \
banner {tag "monthyear" attr "" } \
banner_month {tag "month" attr "" } \
- banner_year {tag "year" attr "" } \
+ banner_year {tag "year" attr "" } \
wkdays_bar {tag "weekdays" attr "" } \
wkday_cell {tag "wkday" attr "" } \
days_row {tag "week" attr "" } \
@@ -387,7 +382,6 @@ package require Itcl
::itcl::body XmlCalendar::getParameters {param what} {
if {[dict exists $parameters $param $what]} {
-# puts "getting $param ($what) from $parameters [dict get $parameters $param $what] "
return [dict get $parameters $param $what]
} else {
return ""
@@ -467,8 +461,8 @@ package require Itcl
set year_open_tag [mkOpenTag [getParameters banner_year tag] [getParameters banner_year attr]]
set banner_html [mkOpenTag $header_tag]
- append banner_html "${month_open_tag}${month_name}[mkCloseTag [getParameters month_cell tag]]"
- append banner_html "${year_open_tag}$yr[mkCloseTag [getParameters year_cell tag]]"
+ append banner_html "${month_open_tag}${month_name}[mkCloseTag [getParameters banner_month tag]]"
+ append banner_html "${year_open_tag}$yr[mkCloseTag [getParameters banner_year tag]]"
append banner_html [mkCloseTag $header_tag]
return $banner_html
}
Modified: tcl/rivet/branches/modular/rivet/pkgIndex.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/rivet/pkgIndex.tcl?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/rivet/pkgIndex.tcl (original)
+++ tcl/rivet/branches/modular/rivet/pkgIndex.tcl Tue Nov 5 00:26:54 2013
@@ -8,7 +8,7 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.
-package ifneeded Calendar 1.0 [list source [file join $dir packages/calendar/calendar.tcl]]
+package ifneeded Calendar 1.1 [list source [file join $dir packages/calendar/calendar.tcl]]
package ifneeded DIO 1.0 [list source [file join $dir packages/dio/dio.tcl]]
package ifneeded DIODisplay 1.0 [list source [file join $dir packages/dio/diodisplay.tcl]]
package ifneeded Dtcl 1.0 [list source [file join $dir packages/dtcl/dtcl.tcl]]
Modified: tcl/rivet/branches/modular/src/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/src/Makefile.am?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/src/Makefile.am (original)
+++ tcl/rivet/branches/modular/src/Makefile.am Tue Nov 5 00:26:54 2013
@@ -14,48 +14,52 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = librivet parser @apache_version_dir@
+#SUBDIRS = librivet parser @apache_version_dir@
-# The weird and wild magic of auto* associates these two.
-apxs_libexecdir = @APXS_LIBEXECDIR@
-apxs_libexec_LTLIBRARIES = mod_rivet.la
+lib_libexecdir = @RIVET_TCL_TARGET@
+lib_libexec_LTLIBRARIES = librivetparser.la librivetlib.la
#
-# Apache Rivet Module, mod_rivet.so / mod_rivet.dll
+# Rivet Parser Library
#
-mod_rivet_la_SOURCES = \
- @apache_request@/apache_multipart_buffer.c \
- @apache_request@/apache_request.c \
- @apache_version_dir@/mod_rivet.c \
- @apache_version_dir@/TclWebapache.c \
- @rivet_core_cmds@/rivetCore.c \
- @rivet_core_cmds@/rivetInspect.c \
- channel/rivetChannel.c \
- parser/rivetParser.c
-
-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='"?>"'
-
-# ... and these two. We want to put the libs in the package path,
-# rather than the standard library location for the system.
-lib_libexecdir = @RIVET_TCL_TARGET@
-lib_libexec_LTLIBRARIES = librivetlib.la
+librivetparser_la_SOURCES = parser/rivetParser.c parser/parserPkgInit.c
+librivetparser_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
+librivetparser_la_LIBADD = @APXS_LIBS@
+librivetparser_la_CPPFLAGS = @apache_include@ -I@apache_version_dir@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
#
# Rivet Library
#
-
librivetlib_la_SOURCES = librivet/rivetList.c librivet/rivetCrypt.c librivet/rivetWWW.c librivet/rivetPkgInit.c
librivetlib_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
librivetlib_la_LIBADD = @APXS_LIBS@
-librivetlib_la_CPPFLAGS = @apache_include@ -I@RIVET_BASE_INCLUDE@ -I@apache_version_dir@ -Iparser -I@apache_request@ -Ichannel @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
+librivetlib_la_CPPFLAGS = -I@apache_version_dir@ -I@apache_request@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
+#
+# mod_rivet
+#
+apxs_libexecdir = @APXS_LIBEXECDIR@
+apxs_libexec_LTLIBRARIES = mod_rivet.la
+
+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 = -I@apache_version_dir@ -Ichannel -Iparser -I@apache_request@ @apache_include@ -I@RIVET_BASE_INCLUDE@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+
+
+mod_rivet_la_SOURCES = \
+ @apache_request@/apache_multipart_buffer.c \
+ @apache_request@/apache_request.c \
+ @apache_version_dir@/mod_rivet.c \
+ @apache_version_dir@/TclWebapache.c \
+ @rivet_core_cmds@/rivetCore.c \
+ @rivet_core_cmds@/rivetInspect.c \
+ channel/rivetChannel.c \
+ parser/rivetParser.c
# Removing libtool .la files from installation
install-data-hook:
echo 'removing unwanted libtool .la files'
rm -f $(DESTDIR)/$(lib_libexecdir)/*.la
+ rm -f $(DESTDIR)/$(apxs_libexecdir)/*.la
Modified: tcl/rivet/branches/modular/src/apache-2/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/src/apache-2/Makefile.am?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/src/apache-2/Makefile.am (original)
+++ tcl/rivet/branches/modular/src/apache-2/Makefile.am Tue Nov 5 00:26:54 2013
@@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AUTOMAKE_OPTIONS = subdir-objects
+#AUTOMAKE_OPTIONS = subdir-objects
-# AM_CFLAGS = @TCL_INCLUDES@ @GM_CPPFLAGS@
+## AM_CFLAGS = @TCL_INCLUDES@ @GM_CPPFLAGS@
## The weird and wild magic of auto* associates these two.
#apxs_libexecdir = @APXS_LIBEXECDIR@
@@ -24,34 +24,34 @@ AUTOMAKE_OPTIONS = subdir-objects
#AM_CPPFLAGS =
-# ... and these two. We want to put the libs in the package path,
-# rather than the standard library location for the system.
-##lib_libexecdir = @TCL_PACKAGE_PATH@/rivet
-##lib_libexec_LTLIBRARIES = librivet.la librivetparser.la
+## ... and these two. We want to put the libs in the package path,
+## rather than the standard library location for the system.
+###lib_libexecdir = @TCL_PACKAGE_PATH@/rivet
+###lib_libexec_LTLIBRARIES = librivet.la librivetparser.la
##
## Apache Rivet Module, mod_rivet.so / mod_rivet.dll
##
-#mod_rivet_la_SOURCES = \
+#mod_rivet_la_SOURCES = \
# apache_multipart_buffer.c \
# apache_request.c \
# mod_rivet.c \
# TclWebapache.c \
-# rivetCore.c \
-# rivetConf.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
-mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
-mod_rivet_la_CPPFLAGS = @apache_include@ -I@RIVET_BASE_INCLUDE@ -I../parser -I../request -I../channel @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+# ../rivetcmds/rivetCore.c \
+# ../rivetcmds/rivetInspect.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
+#mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
+#mod_rivet_la_CPPFLAGS = @apache_include@ -I@RIVET_BASE_INCLUDE@ -I../parser @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
# APXS_CPPFLAGS_SHLIB
## Removing libtool .la files from installation
-
+#
#install-data-hook:
# echo 'removing unwanted libtool .la files'
# rm -f $(DESTDIR)/$(apxs_libexecdir)/*.la
Modified: tcl/rivet/branches/modular/src/librivet/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/src/librivet/Makefile.am?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/src/librivet/Makefile.am (original)
+++ tcl/rivet/branches/modular/src/librivet/Makefile.am Tue Nov 5 00:26:54 2013
@@ -23,12 +23,11 @@
#lib_libexecdir = @RIVET_TCL_TARGET@
#lib_libexec_LTLIBRARIES = librivetlib.la
-#
-# Rivet Library
-#
-
-librivetlib_la_SOURCES = rivetList.c rivetCrypt.c rivetWWW.c rivetPkgInit.c
-librivetlib_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
-librivetlib_la_LIBADD = @APXS_LIBS@
-librivetlib_la_CPPFLAGS = @apache_include@ -I@RIVET_BASE_INCLUDE@/@apache_version_dir@ -I@RIVET_BASE_INCLUDE@ -I@apache_request@ -I.. @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
+##
+## Rivet Library
+##
+#librivetlib_la_SOURCES = rivetList.c rivetCrypt.c rivetWWW.c rivetPkgInit.c
+#librivetlib_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
+#librivetlib_la_LIBADD = @APXS_LIBS@
+#librivetlib_la_CPPFLAGS = -I.. -I../@apache_version_dir@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
Modified: tcl/rivet/branches/modular/src/rivetcmds/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/src/rivetcmds/rivetCore.c?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/src/rivetcmds/rivetCore.c (original)
+++ tcl/rivet/branches/modular/src/rivetcmds/rivetCore.c Tue Nov 5 00:26:54 2013
@@ -323,7 +323,7 @@ TCL_CMD_HEADER( Rivet_Headers )
apr_table_set(globals->r->headers_out, "Location",
Tcl_GetStringFromObj (objv[2], (int *)NULL));
TclWeb_SetStatus(301, globals->req);
- return TCL_RETURN;
+ return TCL_OK;
}
else if (!strcmp("set", opt)) /* ### set ### */
{
Modified: tcl/rivet/branches/modular/tests/parsepackage.test
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/tests/parsepackage.test?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/tests/parsepackage.test (original)
+++ tcl/rivet/branches/modular/tests/parsepackage.test Tue Nov 5 00:26:54 2013
@@ -3,7 +3,7 @@
package require tcltest
package require tclrivetparser
-load [file join [pwd] .. src parser .libs librivetparser[info sharedlibext]]
+load [file join [pwd] .. src .libs librivetparser[info sharedlibext]]
::tcltest::test parserivetdata-1.1 {parserivetdata command} {
set fl [open hello.rvt]
Modified: tcl/rivet/branches/modular/tests/runtests.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/tests/runtests.tcl?rev=1538844&r1=1538843&r2=1538844&view=diff
==============================================================================
--- tcl/rivet/branches/modular/tests/runtests.tcl (original)
+++ tcl/rivet/branches/modular/tests/runtests.tcl Tue Nov 5 00:26:54 2013
@@ -85,7 +85,7 @@ if {$httpd_version == 1} {
}
apachetest::makeconf server.conf {
- LoadModule rivet_module [file join $CWD .. src/apache-$apachetest::httpd_version .libs mod_rivet[info sharedlibextension]]
+ LoadModule rivet_module [file join $CWD .. src/.libs mod_rivet[info sharedlibextension]]
# User and Group directives removed to ease dependency of test suite from the output of command 'id' (from which
# the values for these directives were inferred (Bug #53396)
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org