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 2018/02/03 18:36:17 UTC
svn commit: r1823053 - in /tcl/rivet/trunk: ChangeLog Makefile.in
rivet/pkgIndex.tcl src/librivet/rivetPkgInit.c
Author: mxmanghi
Date: Sat Feb 3 18:36:17 2018
New Revision: 1823053
URL: http://svn.apache.org/viewvc?rev=1823053&view=rev
Log:
* src/librivet/rivetPkgInit.c: changing way we determine the
namespace pointer in order to avoid the necessity of gaining
access to the module globals and therefore avoid including
mod_rivet.h. The macro APLOG_USE_MODULE introduced in
mod_rivet.h makes the library load fail outside
mod_rivet and Apache
* rivet/pkgIndex.tcl: recreated from scratch
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/rivet/pkgIndex.tcl
tcl/rivet/trunk/src/librivet/rivetPkgInit.c
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1823053&r1=1823052&r2=1823053&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Sat Feb 3 18:36:17 2018
@@ -1,3 +1,12 @@
+2018-02-03 Massimo Manghi <mx...@apache.org>
+ * src/librivet/rivetPkgInit.c: changing way we determine the
+ namespace pointer in order to avoid the necessity of gaining
+ access to the module globals and therefore avoid including
+ mod_rivet.h. The macro APLOG_USE_MODULE introduced in
+ mod_rivet.h makes the library load fail outside
+ mod_rivet and Apache
+ * rivet/pkgIndex.tcl: recreated from scratch
+
2018-01-23 Massimo Manghi <mx...@apache.org>
* VERSION,configure.ac: bumping version number to 3.0.1
* doc/rivet.xml.in,doc/xml/request.xml: wrong links and information
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1823053&r1=1823052&r2=1823053&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Sat Feb 3 18:36:17 2018
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -669,7 +669,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) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -695,7 +695,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) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -713,7 +713,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -723,7 +723,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
Modified: tcl/rivet/trunk/rivet/pkgIndex.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/pkgIndex.tcl?rev=1823053&r1=1823052&r2=1823053&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/pkgIndex.tcl (original)
+++ tcl/rivet/trunk/rivet/pkgIndex.tcl Sat Feb 3 18:36:17 2018
@@ -12,10 +12,12 @@ package ifneeded AsciiGlyphs 0.1 [list s
package ifneeded Calendar 1.2 [list source [file join $dir packages/calendar/calendar.tcl]]
package ifneeded DIO 1.1 [list source [file join $dir packages/dio/dio.tcl]]
package ifneeded DIODisplay 1.0 [list source [file join $dir packages/dio/diodisplay.tcl]]
+package ifneeded Dtcl 1.0 [list source [file join $dir packages/dtcl/dtcl.tcl]]
package ifneeded Rivet 3.0 [list source [file join $dir init.tcl]]
package ifneeded RivetEntities 1.0 [list source [file join $dir packages/entities/entities.tcl]]
package ifneeded Session 1.0 [list source [file join $dir packages/session/session-class.tcl]]
-package ifneeded dio_Mysql 0.2 [list source [file join $dir packages/dio/dio_Mysql.tcl]]
+package ifneeded commserver 0.1 [list source [file join $dir packages/commserver/commserver.tcl]]
+package ifneeded dio_Mysql 0.3 [list source [file join $dir packages/dio/dio_Mysql.tcl]]
package ifneeded dio_Oracle 0.1 [list source [file join $dir packages/dio/dio_Oracle.tcl]]
package ifneeded dio_Postgresql 0.1 [list source [file join $dir packages/dio/dio_Postgresql.tcl]]
package ifneeded dio_Sqlite 0.1 [list source [file join $dir packages/dio/dio_Sqlite.tcl]]
@@ -23,7 +25,7 @@ package ifneeded dio_Tdbc 0.1 [list sour
package ifneeded form 1.0 [list source [file join $dir packages/form/form.tcl]]
package ifneeded form 2.1 [list source [file join $dir packages/form/form2.tcl]]
package ifneeded formbroker 1.0 [list source [file join $dir packages/formbroker/formbroker.tcl]]
-package ifneeded rivetlib 3.0.0 [list load [file join $dir librivetlib[info sharedlibextension]]]
-package ifneeded rivetparser 0.2 [list load [file join $dir librivetparser[info sharedlibextension]]]
+package ifneeded ncgi 1.0 [list source [file join $dir packages/rivet_ncgi/rivet_ncgi.tcl]]
+package ifneeded simpledb 0.1 [list source [file join $dir packages/simpledb/simpledb.tcl]]
package ifneeded tclrivet 0.1 [list source [file join $dir packages/tclrivet/tclrivet.tcl]]
package ifneeded tclrivetparser 0.1 [list source [file join $dir packages/tclrivet/tclrivetparser.tcl]]
Modified: tcl/rivet/trunk/src/librivet/rivetPkgInit.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/librivet/rivetPkgInit.c?rev=1823053&r1=1823052&r2=1823053&view=diff
==============================================================================
--- tcl/rivet/trunk/src/librivet/rivetPkgInit.c (original)
+++ tcl/rivet/trunk/src/librivet/rivetPkgInit.c Sat Feb 3 18:36:17 2018
@@ -30,7 +30,7 @@
# define EXTERN
#endif /* EXTERN */
#include "rivet.h"
-#include "mod_rivet.h"
+//#include "mod_rivet.h"
/*-----------------------------------------------------------------------------
* Rivet_GetNamespace --
@@ -58,23 +58,13 @@
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 = Tcl_FindNamespace(interp,RIVET_NS,NULL,TCL_GLOBAL_ONLY);
+ if (rivet_ns == 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);
- }
+ rivet_ns = Tcl_CreateNamespace (interp,RIVET_NS,NULL,
+ (Tcl_NamespaceDeleteProc *)NULL);
}
return rivet_ns;
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org