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 2015/12/14 22:23:18 UTC
svn commit: r1720018 - in /tcl/rivet/branches/2.2: ChangeLog VERSION
configure.ac src/apache-2/mod_rivet.c src/librivet/rivetPkgInit.c
src/rivetcmds/rivetCore.c
Author: mxmanghi
Date: Mon Dec 14 21:23:17 2015
New Revision: 1720018
URL: http://svn.apache.org/viewvc?rev=1720018&view=rev
Log:
* src/apache-2/mod_rivet.c: now exporting the ::rivet namespace during
Tcl interpreter set up
* src/librivet/rivetPkgInit.c: removed redundant code to export namespace
* src/rivetcmds/rivetCore.c: removed redundant code to export namespace
* VERSION,configure.ac: bumping version number up to 2.2.5
Modified:
tcl/rivet/branches/2.2/ChangeLog
tcl/rivet/branches/2.2/VERSION
tcl/rivet/branches/2.2/configure.ac
tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c
tcl/rivet/branches/2.2/src/librivet/rivetPkgInit.c
tcl/rivet/branches/2.2/src/rivetcmds/rivetCore.c
Modified: tcl/rivet/branches/2.2/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/ChangeLog?rev=1720018&r1=1720017&r2=1720018&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/ChangeLog (original)
+++ tcl/rivet/branches/2.2/ChangeLog Mon Dec 14 21:23:17 2015
@@ -1,3 +1,10 @@
+2015-12-14 Massimo Manghi <mx...@apache.org>
+ * src/apache-2/mod_rivet.c: now exporting the ::rivet namespace during
+ Tcl interpreter set up
+ * src/librivet/rivetPkgInit.c: removed redundant code to export namespace
+ * src/rivetcmds/rivetCore.c: removed redundant code to export namespace
+ * VERSION,configure.ac: bumping version number up to 2.2.5
+
2015-12-04 Massimo Manghi <mx...@apache.org>
* 2.2: releasing current version as 2.2.4
Modified: tcl/rivet/branches/2.2/VERSION
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/VERSION?rev=1720018&r1=1720017&r2=1720018&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/VERSION (original)
+++ tcl/rivet/branches/2.2/VERSION Mon Dec 14 21:23:17 2015
@@ -1 +1 @@
-2.2.4
+2.2.5
Modified: tcl/rivet/branches/2.2/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/configure.ac?rev=1720018&r1=1720017&r2=1720018&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/configure.ac (original)
+++ tcl/rivet/branches/2.2/configure.ac Mon Dec 14 21:23:17 2015
@@ -22,7 +22,7 @@ dnl
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
-AC_INIT([Rivet],[2.2.4])
+AC_INIT([Rivet],[2.2.5])
TEA_INIT([3.9])
# we are storing here the configure command line, as recursive
Modified: tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c?rev=1720018&r1=1720017&r2=1720018&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/2.2/src/apache-2/mod_rivet.c Mon Dec 14 21:23:17 2015
@@ -942,6 +942,10 @@ Rivet_PerInterpInit(server_rec *s, rivet
exit(1);
}
+#if RIVET_NAMESPACE_EXPORT == 1
+ Tcl_Export(interp,globals->rivet_ns,"*",0);
+#endif
+
/* If rivet is configured to export the ::rivet namespace commands we set the
* array variable ::rivet::module_conf(export_namespace_commands) before calling init.tcl
* This array will be unset after commands are exported.
Modified: tcl/rivet/branches/2.2/src/librivet/rivetPkgInit.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/src/librivet/rivetPkgInit.c?rev=1720018&r1=1720017&r2=1720018&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/src/librivet/rivetPkgInit.c (original)
+++ tcl/rivet/branches/2.2/src/librivet/rivetPkgInit.c Mon Dec 14 21:23:17 2015
@@ -27,55 +27,6 @@
#include "mod_rivet.h"
/*-----------------------------------------------------------------------------
- * Rivet_GetNamespace --
- *
- * Get the rivet namespace pointer. The procedure attempts to retrieve a
- * pointer to the Tcl_Namespace structure for the ::rivet namespace. This
- * pointer is stored in the interpreter's associated data (pointing to a
- * rivet_interp_globals structure) if the interpreter is passed by mod_rivet.
- * Otherwise a new ::rivet namespace is created and its Tcl_Namespace
- * pointer is returned
- *
- * Parameters:
- *
- * o interp - Interpreter to add commands to.
- *
- * Returned value:
- *
- * o rivet_ns - Tcl_Namespace* pointer to the RIVET_NS (::rivet) namespace
- *
- *-----------------------------------------------------------------------------
- */
-
-#if RIVET_NAMESPACE_EXPORT == 1
-
-static Tcl_Namespace*
-Rivet_GetNamespace( Tcl_Interp* interp)
-{
- rivet_interp_globals *globals;
- Tcl_Namespace *rivet_ns;
-
- globals = Tcl_GetAssocData(interp, "rivet", NULL);
- if (globals != NULL)
- {
- rivet_ns = globals->rivet_ns;
- }
- else
- {
-// fprintf(stderr,"no Associated data found, running standalone\n");
- rivet_ns = Tcl_FindNamespace(interp, RIVET_NS, NULL, TCL_GLOBAL_ONLY);
- if (rivet_ns == NULL) {
- /* The namespace does not exist, create it */
- rivet_ns = Tcl_CreateNamespace (interp, RIVET_NS, NULL,
- (Tcl_NamespaceDeleteProc *)NULL);
- }
- }
-
- return rivet_ns;
-}
-#endif
-
-/*-----------------------------------------------------------------------------
* Rivetlib_Init --
*
* Install the commands provided by librivet into an interpreter.
@@ -90,9 +41,6 @@ Rivet_GetNamespace( Tcl_Interp* interp)
int
Rivetlib_Init( Tcl_Interp *interp )
{
-#if RIVET_NAMESPACE_EXPORT == 1
- Tcl_Namespace *rivet_ns;
-#endif
#ifdef USE_TCL_STUBS
if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
@@ -105,10 +53,6 @@ Rivetlib_Init( Tcl_Interp *interp )
Rivet_InitList (interp);
Rivet_InitCrypt(interp);
Rivet_InitWWW (interp);
-#if RIVET_NAMESPACE_EXPORT == 1
- rivet_ns = Rivet_GetNamespace(interp);
- Tcl_Export(interp,rivet_ns,"*",0);
-#endif
return Tcl_PkgProvide( interp, RIVETLIB_TCL_PACKAGE, RIVET_VERSION );
}
@@ -128,9 +72,6 @@ Rivetlib_Init( Tcl_Interp *interp )
int
Rivetlib_SafeInit( Tcl_Interp *interp )
{
-#if RIVET_NAMESPACE_EXPORT == 1
- Tcl_Namespace *rivet_ns;
-#endif
#ifdef USE_TCL_STUBS
if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
@@ -144,9 +85,5 @@ Rivetlib_SafeInit( Tcl_Interp *interp )
Rivet_InitCrypt(interp);
Rivet_InitWWW(interp);
-#if RIVET_NAMESPACE_EXPORT == 1
- rivet_ns = Rivet_GetNamespace(interp);
- Tcl_Export(interp,rivet_ns,"*",0);
-#endif
return Tcl_PkgProvide( interp, RIVETLIB_TCL_PACKAGE, RIVET_VERSION );
}
Modified: tcl/rivet/branches/2.2/src/rivetcmds/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.2/src/rivetcmds/rivetCore.c?rev=1720018&r1=1720017&r2=1720018&view=diff
==============================================================================
--- tcl/rivet/branches/2.2/src/rivetcmds/rivetCore.c (original)
+++ tcl/rivet/branches/2.2/src/rivetcmds/rivetCore.c Mon Dec 14 21:23:17 2015
@@ -1609,14 +1609,6 @@ TestpanicCmd(dummy, interp, argc, argv)
int
Rivet_InitCore( Tcl_Interp *interp )
{
-#if RIVET_NAMESPACE_EXPORT == 1
- rivet_interp_globals *globals = NULL;
- Tcl_Namespace *rivet_ns;
-
- globals = Tcl_GetAssocData(interp, "rivet", NULL);
- rivet_ns = globals->rivet_ns;
-#endif
-
RIVET_OBJ_CMD ("makeurl",Rivet_MakeURL);
RIVET_OBJ_CMD ("headers",Rivet_Headers);
RIVET_OBJ_CMD ("load_env",Rivet_LoadEnv);
@@ -1641,10 +1633,5 @@ Rivet_InitCore( Tcl_Interp *interp )
RIVET_OBJ_CMD ("testpanic",TestpanicCmd);
#endif
-#if RIVET_NAMESPACE_EXPORT == 1
- Tcl_Export(interp,rivet_ns,"*",0);
-#endif
-
-// return Tcl_PkgProvide( interp,RIVET_TCL_PACKAGE,"1.2");
return TCL_OK;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org