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 2012/05/08 12:19:59 UTC

svn commit: r1335404 - in /tcl/rivet/trunk: ChangeLog doc/xml/install.xml src/rivetPkgInit.c

Author: mxmanghi
Date: Tue May  8 10:19:59 2012
New Revision: 1335404

URL: http://svn.apache.org/viewvc?rev=1335404&view=rev
Log:
    * src/rivetPkgInit.c: reinstated safe interpreters initialization
    * doc/xml/install.xml: corrections and further elaboration of explanation for
    the --disable-import-rivet-commands


Modified:
    tcl/rivet/trunk/ChangeLog
    tcl/rivet/trunk/doc/xml/install.xml
    tcl/rivet/trunk/src/rivetPkgInit.c

Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1335404&r1=1335403&r2=1335404&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue May  8 10:19:59 2012
@@ -1,3 +1,8 @@
+2012-05-08 Massimo Manghi <mx...@apache.org>
+    * src/rivetPkgInit.c: reinstated safe interpreters initialization
+    * doc/xml/install.xml: corrections and further elaboration of explanation for
+    the --disable-import-rivet-commands
+
 2012-05-07 Massimo Manghi <mx...@apache.org>
     * src/apache-2/rivetCore.c: new command ::rivet::inspect implementing function
     Rivet_InspectCmd

Modified: tcl/rivet/trunk/doc/xml/install.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/xml/install.xml?rev=1335404&r1=1335403&r2=1335404&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/xml/install.xml (original)
+++ tcl/rivet/trunk/doc/xml/install.xml Tue May  8 10:19:59 2012
@@ -201,10 +201,11 @@ tar -xvf rivet-X.X.X.tar.gz</programlist
             <varlistentry>
             	<term>--disable-import-rivet-commands</term>
             	<listitem>
-            		Rivet commands can be imported imported into the global namespace. This
-            		is done by default and can be disabled using this option. In future
-            		versions of Rivet the default will be changed to off and eventually
-            		removed altogether. 
+            		By default Rivet commands are implicitly imported into the global namespace.
+            		This action can be disabled using the option --disable-import-rivet-commands. 
+                    In future versions of Rivet the default will be changed to off and eventually
+            		removed altogether, forcing the programmer to explicitly import the commands
+                    from the ::rivet namespace.
             		<note>This option implicitly sets --enable-rivet-commands-export</note>
             	</listitem>
             </varlistentry>
@@ -212,31 +213,30 @@ tar -xvf rivet-X.X.X.tar.gz</programlist
             </para>
             <para>
                 Example: configuring the build system to compile Rivet for an apache 2.x server, using tcl8.5 and
-                specifying a custom name for the apxs program. 
+                specifying a custom name for the apxs program (as it's done for Debian Apache 2.2). 
             </para>
         <programlisting>
-    ./configure --with-tcl=/usr/lib/tcl8.5/ --with-tclsh=/usr/bin/tclsh8.5 \
-            --with-apxs=/usr/bin/apxs2 --with-apache=/usr --with-apache-version=2
+    ./configure --with-tcl=/usr/lib/tcl8.5/ --with-tclsh=/usr/bin/tclsh8.5 --with-apxs=/usr/bin/apxs2 --with-apache=/usr --with-apache-version=2
         </programlisting>
           </step>
           <step>
             <title>Run make</title>
             <para>
-              At this point, you are ready to run make, which should
-              run to completion without any errors (a warning or two
-              is ok, generally).
+                At this point, you are ready to run make, which should
+                run to completion without any errors (a warning or two
+                is ok, generally). Running 'make clean' beforehand can be useful
+                if you are rebuilding after having changed some parameters passed
+                to 'configure'
             </para>
           </step>
           <step>
             <title>Install</title>
             <para>
-                Now, you are ready to run the <command>make
-                install</command> to install the resulting files.
-                This should copy the shared object (like
-                <filename>mod_rivet.so</filename>, if one was
-                successfully created, into Apache's
-                <filename>libexec</filename> directory, as well as
-                install some support scripts and various code.
+                Now, you are ready to run the <command>make install</command> 
+                to install the resulting files. This should copy the shared object 
+                (like <filename>mod_rivet.so</filename>, if one was successfully
+                created, into Apache's <filename>libexec</filename> directory, 
+                as well as install some support scripts and various code.
             </para>
           </step>
         </substeps>

Modified: tcl/rivet/trunk/src/rivetPkgInit.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/rivetPkgInit.c?rev=1335404&r1=1335403&r2=1335404&view=diff
==============================================================================
--- tcl/rivet/trunk/src/rivetPkgInit.c (original)
+++ tcl/rivet/trunk/src/rivetPkgInit.c Tue May  8 10:19:59 2012
@@ -86,7 +86,7 @@ int
 Rivetlib_Init( Tcl_Interp *interp )
 {
 #if RIVET_NAMESPACE_EXPORT == 1
-    Tcl_Namespace *rivet_ns = Rivet_GetNamespace(interp);; 
+    Tcl_Namespace *rivet_ns = Rivet_GetNamespace(interp); 
 #endif
 
 #ifdef RIVET_USE_TCL_STUBS
@@ -119,7 +119,6 @@ Rivetlib_Init( Tcl_Interp *interp )
  *-----------------------------------------------------------------------------
  */
 
-/*
 int
 Rivetlib_SafeInit( Tcl_Interp *interp )
 {
@@ -144,4 +143,3 @@ 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