You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2011/12/09 19:51:58 UTC
svn commit: r1212574 - in /tcl/rivet/trunk: ChangeLog Makefile.in
configure.ac src/Makefile.am src/apache-2/Makefile.am src/parserPkgInit.c
src/rivetPkgInit.c
Author: mxmanghi
Date: Fri Dec 9 18:51:57 2011
New Revision: 1212574
URL: http://svn.apache.org/viewvc?rev=1212574&view=rev
Log:
2011-12-09 Massimo Manghi <mx...@apache.org>
* src/rivetPkgInit.c,src/parserPkgInit.c: libs now are fully based on stubs and
the tcl version parameter passed with Tcl_InitStubs is the same Tcl version their
linked against. Probably too strict, but a cautious point as we are moving towards
Tcl8.6 and Tcl9, which will probably require recompilation of the whole Tcl software
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/configure.ac
tcl/rivet/trunk/src/Makefile.am
tcl/rivet/trunk/src/apache-2/Makefile.am
tcl/rivet/trunk/src/parserPkgInit.c
tcl/rivet/trunk/src/rivetPkgInit.c
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1212574&r1=1212573&r2=1212574&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Fri Dec 9 18:51:57 2011
@@ -1,3 +1,9 @@
+2011-12-09 Massimo Manghi <mx...@apache.org>
+ * src/rivetPkgInit.c,src/parserPkgInit.c: libs now are fully based on stubs and
+ the tcl version parameter passed with Tcl_InitStubs is the same Tcl version their
+ linked against. Probably too strict, but a cautious point as we are moving towards
+ Tcl8.6 and Tcl9, which will probably require recompilation of the whole Tcl software
+
2011-12-08 Massimo Manghi <mx...@apache.org>
* trunk/: Final commit merging changes to scoping commands in the ::rivet namespace
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1212574&r1=1212573&r2=1212574&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Fri Dec 9 18:51:57 2011
@@ -52,8 +52,6 @@ DIST_COMMON = README $(am__configure_dep
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 \
Modified: tcl/rivet/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/configure.ac?rev=1212574&r1=1212573&r2=1212574&view=diff
==============================================================================
--- tcl/rivet/trunk/configure.ac (original)
+++ tcl/rivet/trunk/configure.ac Fri Dec 9 18:51:57 2011
@@ -218,7 +218,7 @@ TEA_MAKE_LIB
# We have to either find a working tclsh or be told where it is
# using --with-tclsh
-AC_ARG_WITH(tclsh, [ --with-tclsh=FILE location of a working tclsh executable], with_tclsh=${withval})
+AC_ARG_WITH(tclsh, [ --with-tclsh=FILE location of a working tclsh executable], with_tclsh=${withval})
#
# allow them to override the tclsh we think we found
Modified: tcl/rivet/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/Makefile.am?rev=1212574&r1=1212573&r2=1212574&view=diff
==============================================================================
--- tcl/rivet/trunk/src/Makefile.am (original)
+++ tcl/rivet/trunk/src/Makefile.am Fri Dec 9 18:51:57 2011
@@ -53,7 +53,7 @@ lib_libexec_LTLIBRARIES = librivetlib.la
librivetlib_la_SOURCES = rivetList.c rivetCrypt.c rivetWWW.c rivetPkgInit.c
librivetlib_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
librivetlib_la_LIBADD = @APXS_LIBS@
-librivetlib_la_CPPFLAGS = @MOD_RIVET_INCLUDES@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS=1
+librivetlib_la_CPPFLAGS = @MOD_RIVET_INCLUDES@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
#
# Rivet Parser Library
@@ -61,7 +61,7 @@ librivetlib_la_CPPFLAGS = @MOD_RIVET_INC
librivetparser_la_SOURCES = rivetParser.c parserPkgInit.c
librivetparser_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
librivetparser_la_LIBADD = @APXS_LIBS@
-librivetparser_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS=1
+librivetparser_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
SUBDIRS = @apache_version_dir@
Modified: tcl/rivet/trunk/src/apache-2/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/Makefile.am?rev=1212574&r1=1212573&r2=1212574&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/Makefile.am (original)
+++ tcl/rivet/trunk/src/apache-2/Makefile.am Fri Dec 9 18:51:57 2011
@@ -44,7 +44,7 @@ mod_rivet_la_SOURCES = \
mod_rivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
mod_rivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
-mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
# APXS_CPPFLAGS_SHLIB
Modified: tcl/rivet/trunk/src/parserPkgInit.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/parserPkgInit.c?rev=1212574&r1=1212573&r2=1212574&view=diff
==============================================================================
--- tcl/rivet/trunk/src/parserPkgInit.c (original)
+++ tcl/rivet/trunk/src/parserPkgInit.c Fri Dec 9 18:51:57 2011
@@ -154,9 +154,9 @@ Rivetparser_SafeInit( Tcl_Interp *interp
*/
#ifdef USE_TCL_STUBS
- if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
#else
- if (Tcl_PkgRequire(interp, "Tcl", "8.5", 0) == NULL) {
+ if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
#endif
return TCL_ERROR;
}
Modified: tcl/rivet/trunk/src/rivetPkgInit.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/rivetPkgInit.c?rev=1212574&r1=1212573&r2=1212574&view=diff
==============================================================================
--- tcl/rivet/trunk/src/rivetPkgInit.c (original)
+++ tcl/rivet/trunk/src/rivetPkgInit.c Fri Dec 9 18:51:57 2011
@@ -81,6 +81,7 @@ Rivet_GetNamespace( Tcl_Interp* interp)
*
*-----------------------------------------------------------------------------
*/
+
int
Rivetlib_Init( Tcl_Interp *interp )
{
@@ -88,10 +89,10 @@ Rivetlib_Init( Tcl_Interp *interp )
Tcl_Namespace *rivet_ns = Rivet_GetNamespace(interp);;
#endif
-#ifdef USE_TCL_STUBS
- if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+#ifdef RIVET_USE_TCL_STUBS
+ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
#else
- if (Tcl_PkgRequire(interp, "Tcl", "8.5", 0) == NULL) {
+ if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
#endif
return TCL_ERROR;
}
@@ -99,14 +100,13 @@ Rivetlib_Init( Tcl_Interp *interp )
Rivet_InitList (interp);
Rivet_InitCrypt(interp);
Rivet_InitWWW (interp);
-
#if RIVET_NAMESPACE_EXPORT == 1
Tcl_Export(interp,rivet_ns,"*",0);
#endif
+
return Tcl_PkgProvide( interp, RIVETLIB_TCL_PACKAGE, "1.2" );
}
-
/*-----------------------------------------------------------------------------
* Rivetlib_SafeInit --
* Install the commands provided by librivet that are believed to be
@@ -119,6 +119,7 @@ Rivetlib_Init( Tcl_Interp *interp )
*-----------------------------------------------------------------------------
*/
+/*
int
Rivetlib_SafeInit( Tcl_Interp *interp )
{
@@ -126,10 +127,10 @@ Rivetlib_SafeInit( Tcl_Interp *interp )
Tcl_Namespace *rivet_ns = Rivet_GetNamespace(interp);
#endif
-#ifdef USE_TCL_STUBS
- if (Tcl_InitStubs(interp, "8.5", 0) == NULL) {
+#ifdef RIVET_USE_TCL_STUBS
+ if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) {
#else
- if (Tcl_PkgRequire(interp, "Tcl", "8.5", 0) == NULL) {
+ if (Tcl_PkgRequire(interp, "Tcl", TCL_VERSION, 0) == NULL) {
#endif
return TCL_ERROR;
}
@@ -143,4 +144,4 @@ Rivetlib_SafeInit( Tcl_Interp *interp )
#endif
return Tcl_PkgProvide( interp, RIVETLIB_TCL_PACKAGE, "1.2" );
}
-
+*/
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org