This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
The following commit(s) were added to refs/heads/master by this push:
new 9bfee6a defined m4 variable for rivet version
9bfee6a is described below
commit 9bfee6ae43bdc57b1e13e5ae1cd8408a5f1281f0
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Thu Apr 10 11:49:18 2025 +0200
defined m4 variable for rivet version
---
ChangeLog | 3 ++
configure.ac | 8 +++--
doc/rivet.xml | 2 +-
rivet/packages/session/session-class.tcl | 53 ++++++++++++++++----------------
4 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 74621f4..e47e617 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2025-04-10 Massimo Manghi <mxman...@apache.org>
+ * configure.ac: defined m4 variable for rivet version.
+
2024-11-26 Massimo Manghi <mxman...@apache.org>
* ChangeLog: reordered log entries that some past merge had misplaced
* VERSION: new version 3.2.7
diff --git a/configure.ac b/configure.ac
index 3ddbfcf..ef4b495 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,9 @@ dnl
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
-AC_INIT([Rivet],[m4_esyscmd_s([cat VERSION])],[rivet-...@tcl.apache.org])
+m4_define([rivet_VERSION],m4_esyscmd([cat VERSION | tr -d '\n']))
+
+AC_INIT([Rivet],m4_defn([rivet_VERSION]),[rivet-...@tcl.apache.org],[rivet-]m4_defn([rivet_VERSION]))
TEA_INIT([3.9])
# we are storing here the configure command line, as recursive
@@ -427,9 +429,9 @@ AC_DEFUN([APU_HANDLING],[
# Effect: If you're running Tcl < 8.5.10 we refuse to build Rivet...
AX_COMPARE_VERSION([$TCL_VERSION$TCL_PATCH_LEVEL],[lt],[8.5.10],[
- AC_MSG_ERROR([Rivet 2.1 requires Tcl > 8.5.10 (current is
$TCL_VERSION$TCL_PATCH_LEVEL)])
+ AC_MSG_ERROR([Rivet m4_defn([rivet_VERSION]) requires Tcl > 8.5.10
(current is $TCL_VERSION$TCL_PATCH_LEVEL)])
] , [
- AC_MSG_NOTICE([we are building Rivet with Tcl
$TCL_VERSION$TCL_PATCH_LEVEL])
+ AC_MSG_NOTICE([we are building Rivet m4_defn([rivet_VERSION]) with Tcl
$TCL_VERSION$TCL_PATCH_LEVEL])
])
diff --git a/doc/rivet.xml b/doc/rivet.xml
index dbca0e6..58cc5d8 100644
--- a/doc/rivet.xml
+++ b/doc/rivet.xml
@@ -36,7 +36,7 @@
<!ENTITY lazybridge.xml SYSTEM "xml/lazybridge.xml" >
<!ENTITY formbroker.xml SYSTEM "xml/formbroker.xml" >
<!ENTITY version "3.2" >
- <!ENTITY fullversion "3.2.6" >
+ <!ENTITY fullversion "3.2.7" >
<!ENTITY version2-series "2.0,2.1,2.2,2.3,2.4" >
<!ENTITY version2-generic "2.x" >
<!ENTITY version3-generic "3.x" >
diff --git a/rivet/packages/session/session-class.tcl
b/rivet/packages/session/session-class.tcl
index c047810..1a047a2 100644
--- a/rivet/packages/session/session-class.tcl
+++ b/rivet/packages/session/session-class.tcl
@@ -304,21 +304,20 @@ package require Itcl
# store the data in the rivet session cache
#
method store {packageName key data} {
- set a(session_id) [id]
- set a(package_) $packageName
- set a(key_) $key
+ set a(session_id) [id]
+ set a(package_) $packageName
+ set a(key_) $key
- regsub -all {\\} $data {\\\\} data
- set a(data) $data
+ regsub -all {\\} $data {\\\\} data
+ set a(data) $data
- debug "store session data, package_ '$packageName', key_ '$key', data
'$data'"
- set kf [list session_id package_ key_]
+ debug "store session data, package_ '$packageName', key_ '$key', data
'$data'"
+ set kf [list session_id package_ key_]
- if {![$dioObject store a -table $sessionCacheTable -keyfield $kf]} {
- debug "Failed to store $sessionCacheTable '$kf'"
- #parray a
- error [$dioObject errorinfo]
- }
+ if {![$dioObject store a -table $sessionCacheTable -keyfield $kf]} {
+ debug "Failed to store $sessionCacheTable '$kf'"
+ error [$dioObject errorinfo]
+ }
}
#
@@ -326,23 +325,23 @@ package require Itcl
# for this session
#
method fetch {packageName key} {
- set kf [list session_id package_ key_]
-
- set a(session_id) [id]
- set a(package_) $packageName
- set a(key_) $key
-
- set key [$dioObject makekey a $kf]
- if {![$dioObject fetch $key a -table $sessionCacheTable -keyfield $kf]}
{
- status [$dioObject errorinfo]
- debug "error: [$dioObject errorinfo]"
- debug "fetch session data failed, package_ '$packageName', key_
'$key', error '[$dioObject errorinfo]'"
- return ""
- }
+ set kf [list session_id package_ key_]
+
+ set a(session_id) [id]
+ set a(package_) $packageName
+ set a(key_) $key
+
+ set key [$dioObject makekey a $kf]
+ if {![$dioObject fetch $key a -table $sessionCacheTable -keyfield
$kf]} {
+ status [$dioObject errorinfo]
+ debug "error: [$dioObject errorinfo]"
+ debug "fetch session data failed, package_ '$packageName', key_
'$key', error '[$dioObject errorinfo]'"
+ return ""
+ }
- debug "fetch session data succeeded, package_ '$packageName', key_
'$key', result '$a(data)'"
+ debug "fetch session data succeeded, package_ '$packageName', key_
'$key', result '$a(data)'"
- return $a(data)
+ return $a(data)
}
#
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org
