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/09/14 16:05:01 UTC
svn commit: r1523244 - in /tcl/rivet/branches/2.1: ./ doc/ doc/xml/
rivet/packages/calendar/ rivet/packages/dio/ rivet/rivet-tcl/
Author: mxmanghi
Date: Sat Sep 14 14:05:00 2013
New Revision: 1523244
URL: http://svn.apache.org/r1523244
Log:
* 2.1: merging latest changes from trunk
* rivet/packages/calendar/calendar.tcl: too restrictive test on Tcl versione fixed
* rivet/rivet-tcl/parray_table.tcl: also the parray putting out an HTML table
is now escaping SGML characters
* INSTALL: new installation instruction amending the rejected installation
approach done in 2.1.2 and restoring old target 'install' to get everything
moved to their final directory
* doc/xml/install.xml: same for INSTALL
* doc/xml/commands.xml: new 'parse -string' form documented
Modified:
tcl/rivet/branches/2.1/ (props changed)
tcl/rivet/branches/2.1/ChangeLog
tcl/rivet/branches/2.1/INSTALL
tcl/rivet/branches/2.1/Makefile.in
tcl/rivet/branches/2.1/doc/ (props changed)
tcl/rivet/branches/2.1/doc/xml/commands.xml
tcl/rivet/branches/2.1/doc/xml/install.xml
tcl/rivet/branches/2.1/rivet/packages/calendar/calendar.tcl
tcl/rivet/branches/2.1/rivet/packages/dio/dio_Mysql.tcl
tcl/rivet/branches/2.1/rivet/rivet-tcl/parray.tcl
tcl/rivet/branches/2.1/rivet/rivet-tcl/parray_table.tcl
Propchange: tcl/rivet/branches/2.1/
------------------------------------------------------------------------------
Merged /tcl/rivet/trunk:r1517866-1523235
Modified: tcl/rivet/branches/2.1/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/ChangeLog?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/ChangeLog (original)
+++ tcl/rivet/branches/2.1/ChangeLog Sat Sep 14 14:05:00 2013
@@ -1,3 +1,24 @@
+2013-09-14 Massimo Manghi <mx...@apache.org>
+ * 2.1: merging latest changes from trunk
+ * rivet/packages/calendar/calendar.tcl: too restrictive test on Tcl versione fixed
+ * rivet/rivet-tcl/parray_table.tcl: also the parray putting out an HTML table
+ is now escaping SGML characters
+ * INSTALL: new installation instruction amending the rejected installation
+ approach done in 2.1.2 and restoring old target 'install' to get everything
+ moved to their final directory
+ * doc/xml/install.xml: same for INSTALL
+ * doc/xml/commands.xml: new 'parse -string' form documented
+
+2013-09-13 Massimo Manghi <mx...@apache.org>
+ * rivet/packages/dio/dio_Mysql.tcl: attempting to correct detection of
+ SELECT query by checking if a SELECT keyword exists at the beginning of
+ query either following a '(' or only space characters (their trimmed away
+ in any case)
+
+2013-08-30 Massimo Manghi <mx...@apache.org>
+ * rivet/rivet-tcl/parray.tcl: escaping SGML characters that might appear
+ in the output to avoid cross scripting
+
2013-08-29 Massimo Manghi <mx...@apache.org>
* 2.1: committing changes merged from trunk after release of 2.1.2
@@ -41,7 +62,7 @@
2013-07-17 Massimo Manghi <mx...@apache.org>
* src/apache-2/mod_rivet.[h|c],rivetCore.c: reverting new command 'parsestr' and
-turning string parsing command into the support for the new -string modifier of the
+ turning string parsing command into the support for the new -string modifier of the
ordinary parse command
2013-07-06 Massimo Manghi <mx...@apache.org>
Modified: tcl/rivet/branches/2.1/INSTALL
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/INSTALL?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/INSTALL (original)
+++ tcl/rivet/branches/2.1/INSTALL Sat Sep 14 14:05:00 2013
@@ -27,6 +27,14 @@ make
sudo make install
+binary module and Tcl packages can be installed separately by calling
+
+make install-binaries
+
+and
+
+make install-packages
+
Along with the usual 'configure' variables Rivet's configure script
handles other specific options.
Modified: tcl/rivet/branches/2.1/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/Makefile.in?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/Makefile.in (original)
+++ tcl/rivet/branches/2.1/Makefile.in Sat Sep 14 14:05:00 2013
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -17,58 +18,30 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 1496871 2013-06-26 10:17:34Z mxmanghi $
+# $Id: Makefile.am 1517859 2013-08-27 16:08:31Z mxmanghi $
#
# 2007/12/25: Added target uninistall-local that removes the tcl stuff (mxmanghi)
# 2010/06/22: target instal-data-local searches for pkgIndex.tcl files and deletes them
# before invoking pkg_mkIndex.
# 2013/01/20: removing libtool created .la files
VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
+am__make_dryrun = \
+ { \
+ am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+ *) \
+ for am__flg in $$MAKEFLAGS; do \
+ case $$am__flg in \
+ *=*|--*) ;; \
+ *n*) am__dry=yes; break;; \
+ esac; \
+ done;; \
esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+ test $$am__dry = yes; \
+ }
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -88,19 +61,16 @@ 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 ChangeLog tclconfig/ChangeLog INSTALL \
- README TODO tclconfig/compile tclconfig/config.guess \
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/configure ChangeLog INSTALL TODO \
+ tclconfig/ChangeLog tclconfig/compile tclconfig/config.guess \
tclconfig/config.sub tclconfig/depcomp tclconfig/install-sh \
- tclconfig/missing tclconfig/ltmain.sh \
- $(top_srcdir)/tclconfig/config.guess \
- $(top_srcdir)/tclconfig/config.sub \
- $(top_srcdir)/tclconfig/install-sh \
- $(top_srcdir)/tclconfig/ltmain.sh \
- $(top_srcdir)/tclconfig/missing
+ tclconfig/ltmain.sh tclconfig/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/tclconfig/tcl.m4 \
$(top_srcdir)/tclconfig/libtool.m4 \
$(top_srcdir)/m4/ax_prefix_config_h.m4 \
@@ -113,28 +83,15 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
- ctags-recursive dvi-recursive html-recursive info-recursive \
- install-data-recursive install-dvi-recursive \
- install-exec-recursive install-html-recursive \
- install-info-recursive install-pdf-recursive \
- install-ps-recursive install-recursive installcheck-recursive \
- installdirs-recursive pdf-recursive ps-recursive \
- tags-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -142,33 +99,11 @@ am__can_run_installinfo = \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
- $(RECURSIVE_TARGETS) \
- $(RECURSIVE_CLEAN_TARGETS) \
- $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
- cscope distdir dist dist-all distcheck
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
- $(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+ distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
-CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
@@ -179,7 +114,6 @@ am__remove_distdir = \
&& rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -207,14 +141,12 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APR_CPPFLAGS = @APR_CPPFLAGS@
APR_INCLUDES = @APR_INCLUDES@
APR_LDFLAGS = @APR_LDFLAGS@
@@ -472,25 +404,22 @@ distclean-libtool:
-rm -f libtool config.lt
# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-# (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
- @fail=; \
- if $(am__make_keepgoing); then \
- failcom='fail=yes'; \
- else \
- failcom='exit 1'; \
- fi; \
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- for subdir in $$list; do \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -505,12 +434,57 @@ $(am__recursive_targets):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
+$(RECURSIVE_CLEAN_TARGETS):
+ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ mkid -fID $$unique
+tags: TAGS
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -526,7 +500,12 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagg
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- $(am__define_uniq_tagged_files); \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -538,11 +517,15 @@ tags-am: $(TAGS_DEPENDENCIES) $(am__tagg
$$unique; \
fi; \
fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -551,31 +534,9 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
- test ! -s cscope.files \
- || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
- -rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -643,36 +604,40 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
+
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
-dist dist-all:
- $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
- $(am__post_remove_distdir)
+dist dist-all: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -683,6 +648,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.lz*) \
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
@@ -694,9 +661,9 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir)
- chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
+ chmod -R a-w $(distdir); chmod u+w $(distdir)
+ mkdir $(distdir)/_build
+ mkdir $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -728,7 +695,7 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__post_remove_distdir)
+ $(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -864,14 +831,15 @@ ps-am:
uninstall-am: uninstall-local
-.MAKE: $(am__recursive_targets) all install-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+ ctags-recursive install-am install-strip tags-recursive
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- am--refresh check check-am clean clean-cscope clean-generic \
- clean-libtool cscope cscopelist-am ctags ctags-am dist \
- dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
- dist-xz dist-zip distcheck distclean distclean-generic \
- distclean-hdr distclean-libtool distclean-local distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-local distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-data-local install-dvi install-dvi-am \
@@ -881,7 +849,7 @@ uninstall-am: uninstall-local
installcheck installcheck-am installdirs installdirs-am \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags tags-am uninstall uninstall-am uninstall-local
+ tags tags-recursive uninstall uninstall-am uninstall-local
libtool: $(LIBTOOL_DEPS)
Propchange: tcl/rivet/branches/2.1/doc/
------------------------------------------------------------------------------
Merged /tcl/rivet/trunk/doc:r1517866-1523235
Modified: tcl/rivet/branches/2.1/doc/xml/commands.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/doc/xml/commands.xml?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/doc/xml/commands.xml (original)
+++ tcl/rivet/branches/2.1/doc/xml/commands.xml Sat Sep 14 14:05:00 2013
@@ -878,25 +878,26 @@ keyvalue_map(args) = 1 2 3 4 5</programl
<command>::rivet::inspect</command> can be called in three forms
</para>
<itemizedlist mark="square">
- <listitem>
- Passing one of the configuration directive definitions to
- <command>::rivet::inspect</command> the current value
- read from the configuration record is returned
- </listitem>
- <listitem>
- Passing simply the switch <arg>-all</arg> a dictionary is returned
- carrying the whole configuration
- </listitem>
+ <listitem>
+ Passing as argument the switch <arg>-all</arg> a dictionary
+ carrying the whole configuration is returned
+ </listitem>
+
+ <listitem>
+ With one argument (one of the Rivet configuration directives)
+ <command>::rivet::inspect</command> returns the current value
+ in the configuration record
+ </listitem>
+
<listitem>
With no argument the command returns a dictionary with 3
keys: server, dir, user. Each key is associated to a subdictionary
- where configuration lines explicitly set in the conf files
- are stored. The configuration directives are used as keys in
- the second level dictionary in order to retrieve a configuration
- value. In this form the command is meant to provide a way to create
- the global arrays RivetServerConf, RivetDirConf and RivetUserConf
- which are internally used by ::rivet::debug
- </listitem>>
+ carrying the configuration lines actually set. Configuration directives
+ are the keys in the second level dictionary. In this form the command is
+ meant to provide a way to create global arrays RivetServerConf,
+ RivetDirConf and RivetUserConf which are internally used by ::rivet::debug
+ </listitem>
+
</itemizedlist>
</refsect1>
</refentry>
Modified: tcl/rivet/branches/2.1/doc/xml/install.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/doc/xml/install.xml?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/doc/xml/install.xml (original)
+++ tcl/rivet/branches/2.1/doc/xml/install.xml Sat Sep 14 14:05:00 2013
@@ -185,8 +185,8 @@ tar -xvf rivet-X.X.X.tar.gz</programlist
</variablelist>
</para>
<para>
- Example: configuring the build system to compile Rivet for an apache 2.x server, using tcl8.5 and
- specifying a custom name for the apxs program.
+ Example: configuring the build system to compile Rivet for an apache 2.x server, using tcl8.5 and
+ specifying a custom name for the apxs program.
</para>
<programlisting>./configure --with-tcl=/usr/lib/tcl8.5/ --with-tclsh=/usr/bin/tclsh8.5 \
--with-apxs=/usr/bin/apxs2 --with-apache=/usr --with-apache-version=2</programlisting>
@@ -206,13 +206,11 @@ tar -xvf rivet-X.X.X.tar.gz</programlist
</para>
<programlisting>make install</programlisting>
<para>
- to install the resulting files.
- This should in turn invoke target <code>install-binaries</code>
- which copies the shared object <filename>mod_rivet.so</filename>
- into Apache's <filename>libexec</filename> directory as well as
- install some support scripts, and target
- <code>install-packages</code> which installs the utility
- packages.This commands creates a functional Rivet module with its
+ to install the resulting files. The <code>install</code> target
+ actually fires the <code>install-binaries</code> and
+ <code>install-packages</code> targets which in turn
+ copy the binary modules and Tcl packages to their destination
+ directories. This commands create a functional Rivet environment with its
core language.
</para>
</step>
Modified: tcl/rivet/branches/2.1/rivet/packages/calendar/calendar.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/rivet/packages/calendar/calendar.tcl?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/rivet/packages/calendar/calendar.tcl (original)
+++ tcl/rivet/branches/2.1/rivet/packages/calendar/calendar.tcl Sat Sep 14 14:05:00 2013
@@ -19,7 +19,7 @@
#
-if {[catch {package require Tcl 8.5} e] && [catch {package require dict} e]} {
+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)"
}
@@ -60,16 +60,16 @@ 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 banner { mth yr }
- protected method header { mth yr }
+ 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 table { mth yr }
+ protected method table { mth yr }
protected method startOutput { }
protected method closeOutput { }
Modified: tcl/rivet/branches/2.1/rivet/packages/dio/dio_Mysql.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/rivet/packages/dio/dio_Mysql.tcl?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/rivet/packages/dio/dio_Mysql.tcl (original)
+++ tcl/rivet/branches/2.1/rivet/packages/dio/dio_Mysql.tcl Sat Sep 14 14:05:00 2013
@@ -72,9 +72,12 @@ namespace eval DIO {
# select is a 6 characters word, so let's see if the query is a select
#
set q [::string trim $req]
- set q [::string tolower $q]
- set q [::string range $q 0 5]
- if {[::string match select $q]} { set cmd mysqlsel }
+
+# set q [::string tolower $q]
+# set q [::string range $q 0 5]
+# if {[::string match select $q]} { set cmd mysqlsel }
+
+ if {[regexp -nocase {^\(*\s*select\s+} $q]} { set cmd mysqlsel }
set errorinfo ""
if {[catch {$cmd $conn $req} error]} {
Modified: tcl/rivet/branches/2.1/rivet/rivet-tcl/parray.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/rivet/rivet-tcl/parray.tcl?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/rivet/rivet-tcl/parray.tcl (original)
+++ tcl/rivet/branches/2.1/rivet/rivet-tcl/parray.tcl Sat Sep 14 14:05:00 2013
@@ -27,8 +27,8 @@ namespace eval ::rivet {
puts stdout "<PRE><B>$arrayName</B>"
set maxl [expr {$maxl + [string length $arrayName] + 2}]
foreach name [lsort [array names array $pattern]] {
- set nameString [format %s(%s) $arrayName $name]
- puts stdout [format "%-*s = %s" $maxl $nameString $array($name)]
+ set nameString [format %s(%s) $arrayName [::rivet::escape_sgml_chars $name]]
+ puts stdout [format "%-*s = %s" $maxl $nameString [::rivet::escape_sgml_chars $array($name)]]
}
puts stdout "</PRE>"
}
Modified: tcl/rivet/branches/2.1/rivet/rivet-tcl/parray_table.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.1/rivet/rivet-tcl/parray_table.tcl?rev=1523244&r1=1523243&r2=1523244&view=diff
==============================================================================
--- tcl/rivet/branches/2.1/rivet/rivet-tcl/parray_table.tcl (original)
+++ tcl/rivet/branches/2.1/rivet/rivet-tcl/parray_table.tcl Sat Sep 14 14:05:00 2013
@@ -31,7 +31,8 @@ namespace eval ::rivet {
puts "><thead><tr><th colspan=\"2\">$arrayName</th></tr></thead>"
puts stdout "<tbody>"
foreach name [lsort [array names array $pattern]] {
- puts stdout [format "<tr><td>%s</td><td>%s</td></tr>" $name $array($name)]
+ puts stdout [format "<tr><td>%s</td><td>%s</td></tr>" [::rivet::escape_sgml_chars $name] \
+ [::rivet::escape_sgml_chars $array($name)]]
}
puts stdout "</tbody></table>"
}
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org