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 2017/10/31 11:07:32 UTC
svn commit: r1813874 - in /tcl/rivet/trunk: ChangeLog Makefile.in
doc/xml/cmake.xml tests/broken.test
Author: mxmanghi
Date: Tue Oct 31 11:07:32 2017
New Revision: 1813874
URL: http://svn.apache.org/viewvc?rev=1813874&view=rev
Log:
* tests/broken.test: the error message form has changed with the Tcl based new request handling procedure
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/doc/xml/cmake.xml
tcl/rivet/trunk/tests/broken.test
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1813874&r1=1813873&r2=1813874&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue Oct 31 11:07:32 2017
@@ -1,5 +1,7 @@
2017-10-31 Massimo Manghi <mx...@apache.org>
* merging branch cmake back into trunk
+ * tests/broken.test: the error message form has changed with
+ the Tcl based new request handling procedure
2017-10-28 Massimo Manghi <mx...@apache.org>
* docs/xml/cmake.xml: draft manual page for cmake build system
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1813874&r1=1813873&r2=1813874&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Tue Oct 31 11:07:32 2017
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -669,7 +669,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -695,7 +695,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -713,7 +713,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -723,7 +723,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Modified: tcl/rivet/trunk/doc/xml/cmake.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/cmake.xml?rev=1813874&r1=1813873&r2=1813874&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/cmake.xml (original)
+++ tcl/rivet/trunk/doc/xml/cmake.xml Tue Oct 31 11:07:32 2017
@@ -2,12 +2,13 @@
<title>Building Rivet &version; with CMake</title>
<section>
<para>
- With this version Rivet has adopted <ulink href="http://cmake.org/">CMake</ulink>
- as an alternate build system. The choice of introducing also CMake was motivated by the
- need of an easy to use and reliable build system for Windows installations. Nonetheless the usability of
- CMake is by no means restricted to that OS and user familiar with this alternative can
- adopt it to build mod_rivet also on Linux and other systems. The current CMake script
- requires CMake 3.2 or later. The <ulink href="https://cmake.org/documentation/">CMake documentation</ulink>
+ Starting with &version; Rivet has adopted <ulink href="http://cmake.org/">CMake</ulink>
+ as an alternate build system. The choice of introducing CMake was motivated by the
+ need of an easy to use and reliable build system for Windows installations. Nonetheless
+ the usability of CMake is by no means restricted to that OS and user familiar with this
+ alternative can adopt it to build mod_rivet also on Linux and other systems.
+ The current CMake script requires CMake 3.2 or later.
+ The <ulink href="https://cmake.org/documentation/">CMake documentation</ulink>
page has a complete reference of CMake features
</para>
<title>CMake build procedure and examples</title>
@@ -22,7 +23,7 @@ cmake --build build --target all --clean
cmake --build build --target install</programlisting>
</para>
<para>
- Installation on a Windows system with using a custom installation of the Apache HTTP web server
+ Installation on a Windows system with a custom installation of the Apache HTTP web server
<programlisting>cmake -E make_directory build
cmake -E chdir build cmake -DAPACHE_ROOT=G:/Apache24 ..
cmake --build build --config Release --target install</programlisting>
Modified: tcl/rivet/trunk/tests/broken.test
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/broken.test?rev=1813874&r1=1813873&r2=1813874&view=diff
==============================================================================
--- tcl/rivet/trunk/tests/broken.test (original)
+++ tcl/rivet/trunk/tests/broken.test Tue Oct 31 11:07:32 2017
@@ -13,28 +13,14 @@ set testfilename1 broken.rvt
} {<pre>invalid command name "broken"
while executing
"broken"
- (in namespace eval "::request" script line 5)
+ (in namespace eval "::request" script line 4)
invoked from within
-"namespace eval request {
-puts -nonewline ""
+"namespace eval ::request $script"
+ ("::try" body line 12)<hr/><p>OUTPUT BUFFER:</p>puts -nonewline ""
# non-existent command
broken
puts -nonewline "
"
-
-}"
- ("uplevel" body line 1)
- invoked from within
-"uplevel #0 $script"<hr/><p>OUTPUT BUFFER:</p>namespace eval request {
-puts -nonewline ""
-
-# non-existent command
-broken
-
-puts -nonewline "
-"
-
-}
</pre>}
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org