You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by da...@apache.org on 2003/03/26 02:18:19 UTC
cvs commit: tcl-rivet/src/buildscripts aardvark.tcl parsetclConfig.tcl
davidw 2003/03/25 17:18:18
Modified: . ChangeLog
debian control
src Makefile apache_multipart_buffer.c apache_request.c
make.tcl
src/buildscripts aardvark.tcl parsetclConfig.tcl
Removed: doc dtcl.gif logoLarge.gif split.tcl
Log:
Committed some recent changes.
Revision Changes Path
1.100 +57 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ChangeLog 22 Feb 2003 02:48:36 -0000 1.99
+++ ChangeLog 26 Mar 2003 01:18:17 -0000 1.100
@@ -1,3 +1,60 @@
+2003-03-25 David N. Welton <da...@dedasys.com>
+
+ * debian/copyright: Added copyright file for debian.
+
+ * debian/dirs: Added dirs file that lists directories used by
+ Rivet on Debian.
+
+ * debian/control: Added debian/control file with information about
+ Rivet for the debian package.
+
+ * debian/changelog: Added debian changelog file to track versions
+ of the debian package.
+
+ * debian/rules: Use 'rules' file from mod_dtcl.
+
+2003-03-14 David N. Welton <da...@dedasys.com>
+
+ * src/mod_rivet.c (Rivet_AppendToScript): Don't append
+ Before/After/Error scripts. Just override them.
+ (Rivet_UserConf): Switch back to usig Rivet_AppendToScript.
+ (Rivet_SetScript): Change Rivet_AppendToScript to Rivet_SetScript
+ to reflect the fact that it doesn't always append - specifically,
+ in After/Before/Error scripts.
+
+ * doc/rivet.xml: Use eyebrowse link instead of apachelabs for
+ mailing list.
+
+2003-03-13 David N. Welton <da...@dedasys.com>
+
+ * src/mod_rivet.h: Backed out extra entries in rivet_server_conf -
+ they aren't necessary, as the overrides are taken care of for us.
+ The only things we really need are 1) to use the flag
+ user_scripts_updated to recompile scripts when UserConf variables
+ have changed 2) to not append to existing scripts, but instead
+ create new ones.
+
+2003-03-12 David N. Welton <da...@dedasys.com>
+
+ * src/mod_rivet.c (Rivet_UserConf): Set user_scripts_updated flag.
+ (Rivet_ParseExecFile): Check and clear flag.
+
+ * src/mod_rivet.h: Added user_scripts_updated flag to signal that
+ UserConf options have been set. This means that we need to
+ recompile the script.
+
+2003-03-01 David N. Welton <da...@dedasys.com>
+
+ * debian/debian.tcl: Helper file for generating .debs.
+
+2003-02-28 David N. Welton <da...@dedasys.com>
+
+ * src/Makefile (all): Clean out Makefile - force use of make.tcl.
+
+ * src/buildscripts/aardvark.tcl (aardvark::runbuildcommand): Use
+ 'w' for shell command pipe, in order to not get broken pipes with
+ commands that output something to stdout (such as tcl scripts!).
+
2003-02-21 David N. Welton <da...@dedasys.com>
* tests/config.test: Test to see if Rivet picks up changes in
1.3 +1 -1 tcl-rivet/debian/control
Index: control
===================================================================
RCS file: /home/cvs/tcl-rivet/debian/control,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- control 26 Mar 2003 01:05:45 -0000 1.2
+++ control 26 Mar 2003 01:18:17 -0000 1.3
@@ -1,5 +1,5 @@
Source: rivet
-Section: unknown
+Section: web
Priority: optional
Maintainer: David N. Welton <da...@debian.org>
Build-Depends: apache-dev, tcl8.4, tcl8.4-dev, debhelper (>> 3.0.0)
1.4 +4 -72 tcl-rivet/src/Makefile
Index: Makefile
===================================================================
RCS file: /home/cvs/tcl-rivet/src/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile 20 Mar 2002 02:14:29 -0000 1.3
+++ Makefile 26 Mar 2003 01:18:17 -0000 1.4
@@ -1,74 +1,6 @@
# $Id$
-# Changed to use the Tcl variables from tclConfig.sh
+# Use make.tcl instead.
-# You may have to change these if 'builddtcl.sh' and 'findconfig.tcl'
-# don't work.
-
-# You must change the following line unless you have the Debian
-# apache-dev package
-
-INC=$(INCLUDES) -I$(TCL_PREFIX)/include
-
-STATICLIB=mod_rivet.a
-SHLIB=mod_rivet$(TCL_SHLIB_SUFFIX)
-
-APREQ_OBJECTS=apache_cookie.o apache_multipart_buffer.o apache_request.o
-OBJECTS=mod_rivet.o rivetCore.o parser.o channel.o $(APREQ_OBJECTS)
-
-# The following TCL_* variables are all exported from builddtcl.sh
-
-COMPILE=$(TCL_CC) $(TCL_CFLAGS_DEBUG) $(TCL_CFLAGS_OPTIMIZE) $(TCL_CFLAGS_WARNING) $(TCL_SHLIB_CFLAGS) -c $(INC) $(CFLAGS) $(TCL_EXTRA_CFLAGS) $(EXTRA_FLAGS) $<
-
-all: builddtcl_test shared
-
-static: $(OBJECTS) docs/documentation.html
- $(TCL_STLIB_LD) $(STATICLIB) $(OBJECTS)
-
-shared: $(OBJECTS) docs/documentation.html
- $(TCL_SHLIB_LD) -o $(SHLIB) $(OBJECTS) $(TCL_LIB_SPEC) $(TCL_LIBS)
-
-# I don't have too many C files, so it's just clearer to do things by
-# hand
-
-apache_cookie.o: apache_cookie.c apache_cookie.h
- $(COMPILE)
-apache_multipart_buffer.o: apache_multipart_buffer.c apache_multipart_buffer.h
- $(COMPILE)
-apache_request.o: apache_request.c apache_request.h
- $(COMPILE)
-mod_rivet.o: mod_rivet.c mod_rivet.h rivetCore.h apache_request.h parser.h parser.h
- $(COMPILE) -DDTCL_VERSION=`cat VERSION`
-rivetCore.o: rivetCore.c rivetCore.h mod_rivet.h
- $(COMPILE)
-parser.o: parser.c mod_rivet.h parser.h
- $(COMPILE)
-channel.o: channel.c mod_rivet.h channel.h
- $(COMPILE)
-
-clean:
- -rm -f $(STATICLIB) $(SHLIB) *.o *~ docs/documentation.txt docs/documentation.html
-
-version:
- ./cvsversion.tcl
-
-docs/documentation.html:
- $(TCLSH) ./docs/split.tcl docs/install.html docs/directives.html docs/commands.html docs/other.html > docs/documentation.html
-
-docs/documentation.txt: docs/documentation.html
- if test -x `which html2text` ; then html2text ./docs/documentation.html > ./docs/documentation.txt ; else echo "You need html2text to create documentation.txt from documentation.html" ; fi
-
-dist: clean docs/documentation.txt version
- (cd .. ; tar -czvf mod_rivet-`cat mod_rivet/VERSION`.tar.gz mod_rivet/ ; )
-
-install: static
- -mkdir $(APACHE)src/modules/mod_rivet/
- cp $(STATICLIB) $(APACHE)src/modules/mod_rivet/
- cp Makefile.dummy $(APACHE)src/modules/mod_rivet/Makefile
-
-# This forces mod_rivet to be built with the shell script, so please
-# comment it out if you need to.
-
-.SILENT: builddtcl_test
-builddtcl_test:
- if [ "$(BUILDDTCL)" != "YES" ] ; then echo; echo "You should use make.tcl to build mod_rivet"; echo; exit 1 ; fi
+all:
+ ./make.tcl
1.4 +1 -1 tcl-rivet/src/apache_multipart_buffer.c
Index: apache_multipart_buffer.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/apache_multipart_buffer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apache_multipart_buffer.c 5 Nov 2002 01:13:24 -0000 1.3
+++ apache_multipart_buffer.c 26 Mar 2003 01:18:17 -0000 1.4
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.5 +1 -1 tcl-rivet/src/apache_request.c
Index: apache_request.c
===================================================================
RCS file: /home/cvs/tcl-rivet/src/apache_request.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- apache_request.c 14 Dec 2002 19:04:35 -0000 1.4
+++ apache_request.c 26 Mar 2003 01:18:17 -0000 1.5
@@ -1,7 +1,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.30 +4 -2 tcl-rivet/src/make.tcl
Index: make.tcl
===================================================================
RCS file: /home/cvs/tcl-rivet/src/make.tcl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- make.tcl 22 Feb 2003 01:04:24 -0000 1.29
+++ make.tcl 26 Mar 2003 01:18:17 -0000 1.30
@@ -14,7 +14,9 @@
findapxs.tcl
}
-foreach script $scripts { source [file join . buildscripts $script] }
+foreach script $scripts {
+ source [file join [file dirname [info script]] buildscripts $script]
+}
# Do we have a threaded Tcl?
1.12 +4 -5 tcl-rivet/src/buildscripts/aardvark.tcl
Index: aardvark.tcl
===================================================================
RCS file: /home/cvs/tcl-rivet/src/buildscripts/aardvark.tcl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- aardvark.tcl 22 Feb 2003 01:04:24 -0000 1.11
+++ aardvark.tcl 26 Mar 2003 01:18:17 -0000 1.12
@@ -45,7 +45,7 @@
puts "Output: $txt"
}
node {
- puts -nonewline "$txt-> "
+ puts -nonewline "$txt -> "
}
result {
puts "Result: $txt"
@@ -121,7 +121,7 @@
if { [info exists ::errorCode] } {
unset ::errorCode
}
- set fd [eval [list open "| $sh" r]]
+ set fd [eval [list open "| $sh" w]]
if { [catch {
close $fd
} err] } {
@@ -230,9 +230,8 @@
}
proc aardvark::Run { } {
- global ::argv
variable grph
- set start [ lindex $::argv 0 ]
+ set start [lindex $::argv 0]
if { [catch {
if { $start != "" } {
$grph walk $start -order post -command runbuildcommand
1.3 +8 -8 tcl-rivet/src/buildscripts/parsetclConfig.tcl
Index: parsetclConfig.tcl
===================================================================
RCS file: /home/cvs/tcl-rivet/src/buildscripts/parsetclConfig.tcl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- parsetclConfig.tcl 4 Aug 2002 02:44:37 -0000 1.2
+++ parsetclConfig.tcl 26 Mar 2003 01:18:18 -0000 1.3
@@ -2,22 +2,22 @@
# the next line restarts using tclsh \
exec tclsh "$0" "$@"
-source [ file join . buildscripts findconfig.tcl ]
+source [file join [file dirname [info script]] findconfig.tcl]
-set config [ FindTclConfig ]
+set config [FindTclConfig]
proc parseconfig { config } {
- set fl [ open $config r ]
- while { ! [ eof $fl ] } {
+ set fl [open $config r]
+ while { ! [eof $fl] } {
gets $fl line
- if { [ string index $line 0 ] != "#" } {
+ if { [string index $line 0] != "#" } {
set line [ split $line = ]
- if { [ llength $line ] == 2 } {
+ if { [llength $line] == 2 } {
set val ""
- set var [ lindex $line 0 ]
+ set var [lindex $line 0]
global $var
catch {
- set val [ subst [ string trim [ lindex $line 1 ] ' ] ]
+ set val [subst [string trim [lindex $line 1] ']]
}
set $var $val
}
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org