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/29 22:58:28 UTC
svn commit: r1813714 - in /tcl/rivet/branches/2.3: ChangeLog Makefile.in
VERSION rivet/init.tcl
Author: mxmanghi
Date: Sun Oct 29 22:58:28 2017
New Revision: 1813714
URL: http://svn.apache.org/viewvc?rev=1813714&view=rev
Log:
* rivet/init.tcl: recreated from init.tcl.in
* VERSION: new version 2.3.5
Modified:
tcl/rivet/branches/2.3/ChangeLog
tcl/rivet/branches/2.3/Makefile.in
tcl/rivet/branches/2.3/VERSION
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=1813714&r1=1813713&r2=1813714&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/ChangeLog (original)
+++ tcl/rivet/branches/2.3/ChangeLog Sun Oct 29 22:58:28 2017
@@ -1,3 +1,7 @@
+2017-10-29 Massimo Manghi <mx...@apache.org>
+ * rivet/init.tcl: recreated from init.tcl.in
+ * VERSION: new version 2.3.5
+
2017-10-24 Massimo Manghi <mx...@apache.org>
* rivet/packages/dio/dio_Mysql.tcl: handling special field NULL
Modified: tcl/rivet/branches/2.3/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/Makefile.in?rev=1813714&r1=1813713&r2=1813714&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/Makefile.in (original)
+++ tcl/rivet/branches/2.3/Makefile.in Sun Oct 29 22:58:28 2017
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -666,7 +666,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) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -692,7 +692,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) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -710,7 +710,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -720,7 +720,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Modified: tcl/rivet/branches/2.3/VERSION
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/VERSION?rev=1813714&r1=1813713&r2=1813714&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/VERSION (original)
+++ tcl/rivet/branches/2.3/VERSION Sun Oct 29 22:58:28 2017
@@ -1 +1 @@
-2.3.4
+2.3.5
Modified: tcl/rivet/branches/2.3/rivet/init.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.3/rivet/init.tcl?rev=1813714&r1=1813713&r2=1813714&view=diff
==============================================================================
--- tcl/rivet/branches/2.3/rivet/init.tcl (original)
+++ tcl/rivet/branches/2.3/rivet/init.tcl Sun Oct 29 22:58:28 2017
@@ -170,15 +170,21 @@ namespace eval ::Rivet {
} ;## namespace eval ::Rivet
-## eventually we have to divert Tcl ::exit to ::rivet::exit
+## if we are running from within mod_rivet we have already
+## defined ::rivet::exit (mod_rivet.c: Rivet_PerInterpInit)
+## and we divert Tcl ::exit to ::rivet::exit
-rename ::exit ::Rivet::tclcore_exit
-proc ::exit {code} {
+if {[info commands ::rivet::exit] != ""} {
+
+ rename ::exit ::Rivet::tclcore_exit
+ proc ::exit {code} {
+
+ if {[string is integer $code]} {
+ eval ::rivet::exit $code
+ } else {
+ eval ::rivet::exit 0
+ }
- if {[string is integer $code]} {
- eval ::rivet::exit $code
- } else {
- eval ::rivet::exit 0
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org