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 2015/12/02 12:31:52 UTC
svn commit: r1717612 - in /tcl/rivet/branches/2.3: ChangeLog Makefile.in
doc/images/next.png doc/images/prev.png doc/images/up.png doc/rivet.css
doc/rivet.xml doc/xml/commands.xml doc/xml/intro.xml rivet/init.tcl
Author: mxmanghi
Date: Wed Dec 2 11:31:52 2015
New Revision: 1717612
URL: http://svn.apache.org/viewvc?rev=1717612&view=rev
Log:
* doc/images/*.png, doc/rivet.css: styles and navigation items color
changed to mark the difference with Rivet 2.2 and Rivet 2.1
* doc/xml/commands.xml,intro.xml: new commands ::rivet::exit and
::rivet::catch documented
* rivet/init.tcl: new version 2.3 of package Rivet
Modified:
tcl/rivet/branches/2.3/ChangeLog
tcl/rivet/branches/2.3/Makefile.in
tcl/rivet/branches/2.3/doc/images/next.png
tcl/rivet/branches/2.3/doc/images/prev.png
tcl/rivet/branches/2.3/doc/images/up.png
tcl/rivet/branches/2.3/doc/rivet.css
tcl/rivet/branches/2.3/doc/rivet.xml
tcl/rivet/branches/2.3/doc/xml/commands.xml
tcl/rivet/branches/2.3/doc/xml/intro.xml
tcl/rivet/branches/2.3/rivet/init.tcl
Modified: tcl/rivet/branches/2.3/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/ChangeLog?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/ChangeLog (original)
+++ tcl/rivet/branches/2.3/ChangeLog Wed Dec 2 11:31:52 2015
@@ -1,3 +1,10 @@
+2015-12-02 Massimo Manghi <mx...@apache.org>
+ * doc/images/*.png, doc/rivet.css: styles and navigation items color
+ changed to mark the difference with Rivet 2.2 and Rivet 2.1
+ * doc/xml/commands.xml,intro.xml: new commands ::rivet::exit and
+ ::rivet::catch documented
+ * rivet/init.tcl: new version 2.3 of package Rivet
+
2015-11-27 Massimo Manghi <mx...@apache.org>
* VERSION,configure.ac: version number increased to 2.3.0
Modified: tcl/rivet/branches/2.3/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/Makefile.in?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/Makefile.in (original)
+++ tcl/rivet/branches/2.3/Makefile.in Wed Dec 2 11:31:52 2015
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -24,17 +24,7 @@
# before invoking pkg_mkIndex.
# 2013/01/20: removing libtool created .la files
VPATH = @srcdir@
-am__is_gnu_make = { \
- if test -z '$(MAKELEVEL)'; then \
- false; \
- elif test -n '$(MAKE_HOST)'; then \
- true; \
- elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
- true; \
- else \
- false; \
- fi; \
-}
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
@@ -98,6 +88,18 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = .
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(top_srcdir)/rivet/init.tcl.in \
+ ChangeLog tclconfig/ChangeLog INSTALL README TODO \
+ tclconfig/compile tclconfig/config.guess tclconfig/config.sub \
+ tclconfig/depcomp tclconfig/install-sh tclconfig/missing \
+ tclconfig/ltmain.sh $(top_srcdir)/tclconfig/compile \
+ $(top_srcdir)/tclconfig/config.guess \
+ $(top_srcdir)/tclconfig/config.sub \
+ $(top_srcdir)/tclconfig/install-sh \
+ $(top_srcdir)/tclconfig/ltmain.sh \
+ $(top_srcdir)/tclconfig/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/ax_split_version.m4 \
@@ -107,8 +109,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
- $(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
@@ -172,17 +172,6 @@ ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/rivet/init.tcl.in \
- $(top_srcdir)/tclconfig/compile \
- $(top_srcdir)/tclconfig/config.guess \
- $(top_srcdir)/tclconfig/config.sub \
- $(top_srcdir)/tclconfig/install-sh \
- $(top_srcdir)/tclconfig/ltmain.sh \
- $(top_srcdir)/tclconfig/missing ChangeLog INSTALL README TODO \
- tclconfig/ChangeLog tclconfig/compile tclconfig/config.guess \
- tclconfig/config.sub tclconfig/depcomp tclconfig/install-sh \
- tclconfig/ltmain.sh tclconfig/missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -448,6 +437,7 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefi
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
+.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
@@ -680,15 +670,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
- @echo WARNING: "Support for distribution archives compressed with" \
- "legacy program 'compress' is deprecated." >&2
+ @echo WARNING: "Support for shar distribution archives is" \
+ "deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
- @echo WARNING: "Support for shar distribution archives is" \
- "deprecated." >&2
+ @echo WARNING: "Support for distribution archives compressed with" \
+ "legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
@@ -724,17 +714,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build/sub \
- && ../../configure \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
- --srcdir=../.. --prefix="$$dc_install_base" \
+ --srcdir=.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
@@ -912,8 +902,6 @@ uninstall-am: uninstall-local
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-local
-.PRECIOUS: Makefile
-
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
Modified: tcl/rivet/branches/2.3/doc/images/next.png
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/doc/images/next.png?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
Binary files - no diff available.
Modified: tcl/rivet/branches/2.3/doc/images/prev.png
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/doc/images/prev.png?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
Binary files - no diff available.
Modified: tcl/rivet/branches/2.3/doc/images/up.png
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/doc/images/up.png?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
Binary files - no diff available.
Modified: tcl/rivet/branches/2.3/doc/rivet.css
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/doc/rivet.css?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/doc/rivet.css (original)
+++ tcl/rivet/branches/2.3/doc/rivet.css Wed Dec 2 11:31:52 2015
@@ -30,14 +30,14 @@ PRE.PROGRAMLISTING
font-family: monospace;
white-space: pre;
width: 95%;
- background-color: #eeffee;
+ background-color: #ffeeee;
border: solid;
color: #000000;
- border-color: #009999;
- border-left: solid #009999 1px;
- border-right: solid #009999 1px;
- border-top: solid #009999 1px;
- border-bottom: solid #009999 1px;
+ border-color: #990099;
+ border-left: solid #990099 1px;
+ border-right: solid #990099 1px;
+ border-top: solid #990099 1px;
+ border-bottom: solid #990099 1px;
font-size: normal;
padding-top: 1em;
padding-left: 1em;
@@ -81,9 +81,9 @@ H2
{
COLOR: #ffffff ;
font-style: italic;
- BACKGROUND-color: #a0d0a0;
- BORDER: solid 3px #609060;
- PADDING: 5px
+ BACKGROUND-color: #d0a0a0;
+ BORDER: solid 3px #906060;
+ PADDING: 0.5em;
}
TABLE.IMPORTANT
@@ -262,11 +262,11 @@ P.C2 {
DIV.NAVFOOTER {
color: #000000;
- background-color: #DFFFDF;
+ background-color: #FFDFDF;
padding: 5px;
margin-top: 10px;
width: 100%;
- border: thin solid #a0a0d0;
+ border: 2px solid #d0a0a0;
}
DIV.NUKEFOOTER {
@@ -280,11 +280,11 @@ DIV.NUKEFOOTER {
DIV.NAVHEADER {
color: #000000;
- background-color: #DFFFDF;
+ background-color: #FFDFDF;
padding: 5px;
margin-bottom: 10px;
width: 100%;
- border: thin solid #a0a0d0;
+ border: 2px solid #d0a0a0;
}
DIV.SECT1,DIV.SECT2,DIV.SECT3 {
@@ -296,7 +296,7 @@ DIV.EXAMPLE,DIV.TOC {
padding-left: 10px;
padding-right: 10px;
color: #000000;
- background-color: #E8FFE8;
+ background-color: #FFE8E8;
}
DIV.EXAMPLE {
border: thin dotted #22AA22;
Modified: tcl/rivet/branches/2.3/doc/rivet.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/doc/rivet.xml?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/doc/rivet.xml (original)
+++ tcl/rivet/branches/2.3/doc/rivet.xml Wed Dec 2 11:31:52 2015
@@ -78,12 +78,6 @@
</author>
</articleinfo>
- <!--para>
- This document is also available in the following languages:
- <ulink url="index.it.html">Italian</ulink>,
- <ulink url="index.ru.html">Russian</ulink>
- </para-->
-
<para>
Document revision: $Revision$, last modified <?dbtimestamp format="Y-m-d X" ?>$ by $Author$.
</para>
Modified: tcl/rivet/branches/2.3/doc/xml/commands.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/doc/xml/commands.xml?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/doc/xml/commands.xml (original)
+++ tcl/rivet/branches/2.3/doc/xml/commands.xml Wed Dec 2 11:31:52 2015
@@ -336,6 +336,43 @@
</variablelist>
</refsect1>
</refentry>
+ <refentry id="catch">
+ <refnamediv>
+ <refname>catch</refname>
+ <refpurpose>wraps core command <command>catch</command> and handles in
+ a special way fake error conditions resulting from calls to <command>exit</command>
+ and <command>abort_page</command></refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>::rivet::catch</command>
+ <arg><replaceable>script</replaceable></arg>
+ <arg><replaceable>error_code_var_name</replaceable></arg>
+ <arg><replaceable>options_var_name</replaceable></arg>
+
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+ <title>Description</title>
+ <para>
+ <command>::rivet::catch</command> is a utility command wrapping of the core language's same command.
+ Within mod_rivet a script execution can be interrupted by either calling
+ <command>::rivet::exit</command> or <command>::rivet::abort_page</command> that
+ return an error code and hand the execution down to any <command>AbortScript</command> and
+ eventually to <command>AfterEveryScript</command>.
+ Any procedure fired under control of the core <command>::catch</command> would be trapped and
+ the error code should be checked and in case the error should be confirmed. <command>::rivet::catch</command>
+ checks for these conditions and in case handles the condition in a proper way interrupting the execution
+ and returning control to mod_rivet which in turn calls <link linkend="directives"><command>AbortScript</command></link>
+ </para>
+
+ <note>
+ This command is not exported from the <command>::rivet</command> namespace and therefore has
+ to be fully qualified.
+ </note>
+ </refsect1>
+ </refentry>
<!-- Reference page for command 'clock_to_rfc' -->
<refentry id="clock_to_rfc">
<refnamediv>
Modified: tcl/rivet/branches/2.3/doc/xml/intro.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/doc/xml/intro.xml?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/doc/xml/intro.xml (original)
+++ tcl/rivet/branches/2.3/doc/xml/intro.xml Wed Dec 2 11:31:52 2015
@@ -29,22 +29,27 @@
<simplesect>
<title>Acknowledgements</title>
<para>
- Rivet 2.2 development took advantage from contributions from
- several users who provided whole new componenents, bug fixes and
- enhancements.
+ Rivet 2.3 introduces 2 new commands <command>::rivet::exit</command>
+ and <command>::rivet::catch</command>
</para>
<itemizedlist>
- <listitem><emphasis>Damon Courtney</emphasis> (Apache Tcl Team member,
- he originally wrote mod_rivet) contributed with the new
- <command>::rivet::redirect</command> command.</listitem>
+ <listitem>
+ <command>::rivet::exit</command> was introduced to help mod_rivet to
+ give the command <command>exit</command> a more sensible behavior within
+ the context of the Apache HTTP Web Server. In fact the core command has
+ become an alias of <command>::rivet::exit</command> which interrupts the
+ script execution and hands control to any <command>AbortScript</command>,
+ completes the request and just before returning to the web server framework terminates
+ the child process by calling <command>Tcl_Exit</command>
+ </listitem>
<listitem>
- <emphasis>Harald Oehlmann</emphasis> (now member of the Apache Tcl Team)
- who wrote package RivetEntitites, command ::rivet::http_accept and filed
- several bug reports with relative patches
+ Since <command>::rivet::abort_page</command> and <command>::rivet::exit</command>
+ interrupt the execution returning a <emphasis>TCL_ERROR</emphasis> code any <command>catch</command>
+ could trap them and AbortScript could be executed only by throwing the error again. We introduced
+ the <command>::rivet::catch</command> in order to simplify these operations. If any real error occurs
+ during a script execution the procedure returns 1 and fills the optional arguments with their
+ expected values, otherwise interrupts execution and allows for passing control to <command>AbortScript</command>
</listitem>
- <listitem><emphasis>Cyril Shtumf</emphasis> filed several important bugfixes</listitem>
- <listitem><emphasis>Jeff Lawson</emphasis> who patched Rivet parser to add the
- shorthand syntax for string output and filed several bug reports</listitem>
</itemizedlist>
</simplesect>
</section>
Modified: tcl/rivet/branches/2.3/rivet/init.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/rivet/init.tcl?rev=1717612&r1=1717611&r2=1717612&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/rivet/init.tcl (original)
+++ tcl/rivet/branches/2.3/rivet/init.tcl Wed Dec 2 11:31:52 2015
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package provide Rivet 2.2
+package provide Rivet 2.3
namespace eval ::Rivet {
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org