You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2005/10/28 18:36:58 UTC
svn commit: r329240 - in /tcl/websh/trunk: INSTALL README doc/quickref.xml
src/ChangeLog src/apachetests/runtests.tcl src/win/README websh.spec
Author: ronnie
Date: Fri Oct 28 09:36:40 2005
New Revision: 329240
URL: http://svn.apache.org/viewcvs?rev=329240&view=rev
Log:
- moved all documentation and references from Websh 3.5 to Websh 3.6
Modified:
tcl/websh/trunk/INSTALL
tcl/websh/trunk/README
tcl/websh/trunk/doc/quickref.xml
tcl/websh/trunk/src/ChangeLog
tcl/websh/trunk/src/apachetests/runtests.tcl
tcl/websh/trunk/src/win/README
tcl/websh/trunk/websh.spec
Modified: tcl/websh/trunk/INSTALL
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/INSTALL?rev=329240&r1=329239&r2=329240&view=diff
==============================================================================
--- tcl/websh/trunk/INSTALL (original)
+++ tcl/websh/trunk/INSTALL Fri Oct 28 09:36:40 2005
@@ -6,7 +6,7 @@
compiling under UNIX.
-Compile Websh 3.5
+Compile Websh 3.6
=================
from the top level directory,
@@ -16,10 +16,6 @@
./configure
make
-If you want to compile Websh as an Apache module:
-
-make mod_websh.so
-
You may have to pass special options to configure, such as
--with-tcl to indicate where tclConfig.sh is located.
@@ -27,7 +23,6 @@
--with-tclinclude to indicate where the Tcl header files are.
--with-httpdinclude to indicate where the Apache header files are
- (only needed to compile the Apache module).
--enable-threads if you plan to use it with Apache 2
(don't forget to also compile Tcl with threads enabled).
@@ -36,11 +31,11 @@
Websh provides the following targets
====================================
-websh3.5.<patch>
+websh3.6.<patch>
standalone tclsh with websh package already loaded
-libwebsh3.5.<patch>.so
+libwebsh3.6.<patch>.so
Tcl package shared object (provides package websh)
-mod_websh3.5.<patch>.so
+mod_websh3.6.<patch>.so
Apache module for Apache 1.3 and Apache 2.0 respectively
Modified: tcl/websh/trunk/README
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/README?rev=329240&r1=329239&r2=329240&view=diff
==============================================================================
--- tcl/websh/trunk/README (original)
+++ tcl/websh/trunk/README Fri Oct 28 09:36:40 2005
@@ -1,8 +1,8 @@
- Websh, Version 3.5
+ Websh, Version 3.6
Copyright 1996-2001, Netcetera AG, Switzerland
- Copyright 2001-2002, Apache Software Foundation.
+ Copyright 2001-2005, Apache Software Foundation.
All rights reserved.
@@ -61,7 +61,7 @@
compiling under UNIX.
Websh is a pure Tcl extension, Tk is not required. You need
-Tcl8.3 or newer to compile and install Websh 3.5.
+Tcl8.3 or newer to compile and install Websh 3.6.
typically:
@@ -71,17 +71,18 @@
make
make test
-Make will create two targets: websh3.5.<patch>, which is the standalone
-Websh application (dynamically linked to Tcl) and libwebsh3.5.<patch>.so,
+Make will create two targets: websh3.6.<patch>, which is the standalone
+Websh application (dynamically linked to Tcl) and libwebsh3.6.<patch>.so,
which is a TEA (Tcl Extension Architecture) shared object that can
-be dynamically loaded from within Tcl using [load libwebsh3.5.<patch>.so].
+be dynamically loaded from within Tcl using [load libwebsh3.6.<patch>.so].
Both provide the Tcl package websh.
If you have several versions of Tcl installed on your system, you
might want to specify which one should be used for Websh, e.g.
./configure --with-tcl=/usr/local/tcl8.3.4/lib \
- --with-tclinclude=/usr/local/tcl8.3.4/include/
+ --with-tclinclude=/usr/local/tcl8.3.4/include \
+ --with_httpd-include=/usr/local/httpd-2.0/include
Note that to compile mod_websh for Apache 2, the corresponding Tcl
library must be compiled using threads.
Modified: tcl/websh/trunk/doc/quickref.xml
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/doc/quickref.xml?rev=329240&r1=329239&r2=329240&view=diff
==============================================================================
--- tcl/websh/trunk/doc/quickref.xml (original)
+++ tcl/websh/trunk/doc/quickref.xml Fri Oct 28 09:36:40 2005
@@ -20,7 +20,7 @@
<section id="general_remarks">
<title>General remarks</title>
<para>
- Websh 3.5 (pronounced "web shell") embeds a Tcl interpreter,
+ Websh 3.6 (pronounced "web shell") embeds a Tcl interpreter,
(version 8.3 or higher) and all Tcl commands are available.
</para>
<para>
@@ -1273,7 +1273,7 @@
% web::put "Hello, world\n"
Content-Type: text/html
Set-Cookie: my cookie that contains data
-Generator: websh3.5.1
+Generator: websh3.6.0
Hello, world
% </programlisting>
Modified: tcl/websh/trunk/src/ChangeLog
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/ChangeLog?rev=329240&r1=329239&r2=329240&view=diff
==============================================================================
--- tcl/websh/trunk/src/ChangeLog (original)
+++ tcl/websh/trunk/src/ChangeLog Fri Oct 28 09:36:40 2005
@@ -1,6 +1,36 @@
+2005-10-28 Brunner Ronnie <ro...@netcetera.ch>
+
+ * <various sources>:
+ Changed version to Websh 3.6.0b2
+
+ * src/unix/configure.in, src/unix/Makefile.in:
+ Adapted for Tcl 8.5
+ Major cleanup started
+ Changed version to Websh 3.6.0b2 (too many changes in the
+ commands for a successor Websh 3.5.x version)
+
+ * src/generic/mod_websh.c:
+ Fixed call to ap_log_error for Apache 2 (prevent compiler
+ warning due to NULL to 0 conversion)
+
+ * doc/Makefile, doc/quickref.xml:
+ Documentation of recent changes in logging
+ Renamed web::logfilter to new web::loglevel
+ Various minor fixes
+
+ * src/generic/log.[hc], src/tests/log.test:
+ Renamed web::logfilter to web::loglevel
+ (web::logfilter is still available for backward compatibility,
+ but considered deprecated)
+ Adapted tests accordingly
+
+ * src/generic/script.ws3, src/tests/*.test:
+ Use new web::loglevel instead of web::logfilter, which is
+ now deprecated.
+
2005-10-27 Brunner Ronnie <ro...@netcetera.ch>
- * generic/script.ws3, tests/log.test:
+ * src/generic/script.ws3, src/tests/log.test:
Moved cleanup from web::ap::perReqInit to web::ap::perReqCleanup
to speed up request handling
Delete only log filters and destinations created during the
@@ -8,7 +38,7 @@
in web::initializer
Wrote a test for it
- * generic/log.[hc], generic/modwebsh_ap.c, generic/modwebsh_cgi.c:
+ * src/generic/log.[hc], src/generic/modwebsh_ap.c, src/generic/modwebsh_cgi.c:
Added keep flag to LogDest and LogLevel structs to keep track of
levels and filters to keep across requests (the ones created in
web::initializer code)
Modified: tcl/websh/trunk/src/apachetests/runtests.tcl
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/apachetests/runtests.tcl?rev=329240&r1=329239&r2=329240&view=diff
==============================================================================
--- tcl/websh/trunk/src/apachetests/runtests.tcl (original)
+++ tcl/websh/trunk/src/apachetests/runtests.tcl Fri Oct 28 09:36:40 2005
@@ -8,7 +8,7 @@
apachetest::makeconf server.conf {
-LoadModule websh_module [file join $CWD .. unix "mod_websh3.5.0[info sharedlibextension]"]
+LoadModule websh_module [file join $CWD .. unix "mod_websh3.6.0[info sharedlibextension]"]
AddHandler websh .ws3
WebshConfig [file join $CWD websh.conf]
Modified: tcl/websh/trunk/src/win/README
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/src/win/README?rev=329240&r1=329239&r2=329240&view=diff
==============================================================================
--- tcl/websh/trunk/src/win/README (original)
+++ tcl/websh/trunk/src/win/README Fri Oct 28 09:36:40 2005
@@ -1,19 +1,19 @@
-Websh 3.5 Windows version
+Websh 3.6 Windows version
=========================
Please note that the Windows version is not being maintained properly at
this time. Any volunteers?
-Compiling Websh3.5
-------------------
+Compiling Websh 3.6
+-------------------
-Websh3.5 needs a file src\win\script.h which is not in the distribution.
+Websh 3.6 needs a file src\win\script.h which is not in the distribution.
This file is created from some tcl sources in the src\generic directory.
To create this file, open your favorite command shell ;-) and change to
the directory src\win. The command
-tclsh83.exe ..\generic\tcldecmt.tcl ..\generic\context.tcl ..\generic\script.ws3 ..\generic\cookie.ws3 ..\generic\sessctx.ws3 > script.h
+tclsh84.exe ..\generic\tcldecmt.tcl ..\generic\context.tcl ..\generic\script.ws3 ..\generic\cookie.ws3 ..\generic\sessctx.ws3 > script.h
will do the trick.
Modified: tcl/websh/trunk/websh.spec
URL: http://svn.apache.org/viewcvs/tcl/websh/trunk/websh.spec?rev=329240&r1=329239&r2=329240&view=diff
==============================================================================
--- tcl/websh/trunk/websh.spec (original)
+++ tcl/websh/trunk/websh.spec Fri Oct 28 09:36:40 2005
@@ -3,7 +3,7 @@
Summary: Tcl scripting for the web, both a CGI and Apache module.
Name: websh
-Version: 3.5.0
+Version: 3.6.0
Release: 1
Copyright: Freely distributable and usable
Group: System Environment/Daemons
@@ -27,9 +27,8 @@
%build
cd src/unix
-./configure --with-tclinclude=/usr/include/tcl8.3 --with-tcl=/usr/lib/tcl8.3/ --prefix=/usr --with-httpdinclude=/usr/include/apache-1.3/
+./configure --with-tclinclude=/usr/include/tcl8.4 --with-tcl=/usr/lib/tcl8.4/ --prefix=/usr --with-httpdinclude=/usr/include/httpd-2.0/
make
-make mod_websh.so
%install
cd src/unix
@@ -48,6 +47,9 @@
%{_libdir}/apache/mod_websh%{version}.so
%changelog
+* Fri Oct 28 2005 Ronnie Brunner <ro...@netcetera.ch>
+- moved to version 3.6.0
+- removed make mod_websh.so (now in default)
* Fri Aug 01 2002 Ronnie Brunner <ro...@netcetera.ch>
- dynamic version number of mod_websh
- also make and install websh itself
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org