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 2013/08/30 00:55:56 UTC
svn commit: r1518850 - in /tcl/rivet/branches/modular: ./ ChangeLog INSTALL
Makefile.am Makefile.in configure.ac doc/ doc/xml/install.xml
rivet/packages/form/form.tcl rivet/packages/form/form2.tcl
Author: mxmanghi
Date: Thu Aug 29 22:55:55 2013
New Revision: 1518850
URL: http://svn.apache.org/r1518850
Log: (empty)
Modified:
tcl/rivet/branches/modular/ (props changed)
tcl/rivet/branches/modular/ChangeLog
tcl/rivet/branches/modular/INSTALL
tcl/rivet/branches/modular/Makefile.am
tcl/rivet/branches/modular/Makefile.in
tcl/rivet/branches/modular/configure.ac
tcl/rivet/branches/modular/doc/ (props changed)
tcl/rivet/branches/modular/doc/xml/install.xml
tcl/rivet/branches/modular/rivet/packages/form/form.tcl
tcl/rivet/branches/modular/rivet/packages/form/form2.tcl
Propchange: tcl/rivet/branches/modular/
------------------------------------------------------------------------------
Merged /tcl/rivet/trunk:r1512336-1518849
Modified: tcl/rivet/branches/modular/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/ChangeLog?rev=1518850&r1=1518849&r2=1518850&view=diff
==============================================================================
--- tcl/rivet/branches/modular/ChangeLog (original)
+++ tcl/rivet/branches/modular/ChangeLog Thu Aug 29 22:55:55 2013
@@ -1,3 +1,24 @@
+2013-08-29 Massimo Manghi <mx...@apache.org>
+ * branches/modular: merging latest changes from trunk
+
+2013-08-26 Massimo Manghi <mx...@apache.org>
+ * configure.ac: expanded warning message about broken implementations
+ of Tcl when using forks and the event loop
+ * Makefile.am: target 'install' now depends on targets install-binaries and
+ install-packages, thus install the whole Rivet code as it did before 2.1.2.
+ Packagers wanting to separated binary and Tcl code can draw on those 2
+ targets
+ * INSTALL,doc/xml/install.xml: changed documentation to reflect the restored
+ organization of install targets
+
+2013-08-12 Massimo Manghi <mx...@apache.org>
+ * rivet/packages/form/form2.tcl,form.tcl: form packages called Rivet's command
+ '::rivet::env' in its unqualified form. Fixed adding the ::rivet namespace
+ specification.
+ * src/apache-2/rivetCore.c: errata corrige for entry added on 2013-07-19:
+ command 'parse -string' superseded test command parsestr, thus removed from
+ rivetCore.c
+
2013-08-07 Massimo Manghi <mx...@apache.org>
* ./: merging changes done in trunk
@@ -6,7 +27,6 @@
* configure.ac: warning message about Tcl version not supporting fork correctly
moved to the end of configure.ac, so that it's more readable by the user
->>>>>>> .merge-right.r1512335
2013-08-06 Massimo Manghi <mx...@apache.org>
* rivetcmds/rivetCore.c,rivetInspect.c: moved core commands into this new directory.
Their code is (nearly) independent from Apache version and in future it might be shared
Modified: tcl/rivet/branches/modular/INSTALL
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/INSTALL?rev=1518850&r1=1518849&r2=1518850&view=diff
==============================================================================
--- tcl/rivet/branches/modular/INSTALL (original)
+++ tcl/rivet/branches/modular/INSTALL Thu Aug 29 22:55:55 2013
@@ -27,12 +27,6 @@ make
sudo make install
-4) Install Rivet utils with
-
-sudo make install-packages
-
-if your configuration doesn't require you to have administrative privileges.
-
Along with the usual 'configure' variables Rivet's configure script
handles other specific options.
Modified: tcl/rivet/branches/modular/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/Makefile.am?rev=1518850&r1=1518849&r2=1518850&view=diff
==============================================================================
--- tcl/rivet/branches/modular/Makefile.am (original)
+++ tcl/rivet/branches/modular/Makefile.am Thu Aug 29 22:55:55 2013
@@ -21,7 +21,9 @@ RIVET_LIBS_ARCH =
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
-install-data-local:
+install-data-local: install-binaries install-packages
+
+install-binaries:
$(mkinstalldirs) $(RIVETLIB_DESTDIR)
cp -v rivet/init.tcl $(RIVETLIB_DESTDIR)/
cp -rv rivet/rivet-tcl $(RIVETLIB_DESTDIR)/
@@ -33,6 +35,8 @@ uninstall-local:
rm -fr $(RIVETLIB_DESTDIR)/rivet-tcl
rm -f $(RIVETLIB_DESTDIR)/librivetlib.so
rm -f $(RIVETLIB_DESTDIR)/librivetparser.so
+ rm -fr $(RIVETLIB_DESTDIR)/packages
+ rm -f $(RIVETLIB_DESTDIR)/pkgIndex.tcl
@if [ -z '$(wildcard $(RIVETLIB_DESTDIR)/*)' ]; then \
rmdir $(RIVETLIB_DESTDIR); \
fi
Modified: tcl/rivet/branches/modular/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/Makefile.in?rev=1518850&r1=1518849&r2=1518850&view=diff
==============================================================================
--- tcl/rivet/branches/modular/Makefile.in (original)
+++ tcl/rivet/branches/modular/Makefile.in Thu Aug 29 22:55:55 2013
@@ -855,7 +855,9 @@ uninstall-am: uninstall-local
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
-install-data-local:
+install-data-local: install-binaries install-packages
+
+install-binaries:
$(mkinstalldirs) $(RIVETLIB_DESTDIR)
cp -v rivet/init.tcl $(RIVETLIB_DESTDIR)/
cp -rv rivet/rivet-tcl $(RIVETLIB_DESTDIR)/
@@ -867,6 +869,8 @@ uninstall-local:
rm -fr $(RIVETLIB_DESTDIR)/rivet-tcl
rm -f $(RIVETLIB_DESTDIR)/librivetlib.so
rm -f $(RIVETLIB_DESTDIR)/librivetparser.so
+ rm -fr $(RIVETLIB_DESTDIR)/packages
+ rm -f $(RIVETLIB_DESTDIR)/pkgIndex.tcl
@if [ -z '$(wildcard $(RIVETLIB_DESTDIR)/*)' ]; then \
rmdir $(RIVETLIB_DESTDIR); \
fi
Modified: tcl/rivet/branches/modular/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/configure.ac?rev=1518850&r1=1518849&r2=1518850&view=diff
==============================================================================
--- tcl/rivet/branches/modular/configure.ac (original)
+++ tcl/rivet/branches/modular/configure.ac Thu Aug 29 22:55:55 2013
@@ -735,12 +735,14 @@ AC_CONFIG_FILES([Makefile src/Makefile s
AC_OUTPUT
if test "$print_fileevent_msg" = "1"; then
- AC_MSG_NOTICE([========================================================================])
+ AC_MSG_NOTICE([=======================================================================])
AC_MSG_NOTICE([ WARNING!])
AC_MSG_NOTICE([========================================================================])
AC_MSG_NOTICE([The Tcl notifier (and consequently the event loop) might not be working ])
- AC_MSG_NOTICE([in Rivet running with Tcl $TCL_VERSION$TCL_PATCH_LEVEL and with the 'prefork' MPM.])
- AC_MSG_NOTICE([Recommended versions are Tcl >= 8.5.15 (8.5 version) or Tcl >= 8.6.1])
- AC_MSG_NOTICE([========================================================================])
+ AC_MSG_NOTICE([in Rivet running Tcl $TCL_VERSION$TCL_PATCH_LEVEL and the 'prefork' MPM of Apache.])
+ AC_MSG_NOTICE([Recommended versions are:])
+ AC_MSG_NOTICE([ - threaded builds: Tcl >= 8.5.15 (8.5 version) or Tcl >= 8.6.1])
+ AC_MSG_NOTICE([ - any non-threaded build of Tcl >= 8.5.10])
+ AC_MSG_NOTICE([=======================================================================])
fi
Propchange: tcl/rivet/branches/modular/doc/
------------------------------------------------------------------------------
Merged /tcl/rivet/trunk/doc:r1512336-1518849
Modified: tcl/rivet/branches/modular/doc/xml/install.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/doc/xml/install.xml?rev=1518850&r1=1518849&r2=1518850&view=diff
==============================================================================
--- tcl/rivet/branches/modular/doc/xml/install.xml (original)
+++ tcl/rivet/branches/modular/doc/xml/install.xml Thu Aug 29 22:55:55 2013
@@ -207,19 +207,13 @@ tar -xvf rivet-X.X.X.tar.gz</programlist
<programlisting>make install</programlisting>
<para>
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. This commands creates a functional Rivet module with its
- core language.
- </para>
- <para>
- Starting with 2.1.2 you need also to run
- </para>
- <programlisting>make install-packages</programlisting>
- <para>
- in order to have the Tcl packages (such as the
- <code>Session</code> or <code>form</code>) installed
- into their target directory
+ This should in turn invoke target <code>install-binaries</code>
+ which copies the shared object <filename>mod_rivet.so</filename>
+ into Apache's <filename>libexec</filename> directory as well as
+ install some support scripts, and target
+ <code>install-packages</code> which installs the utility
+ packages.This commands creates a functional Rivet module with its
+ core language.
</para>
</step>
</substeps>
Modified: tcl/rivet/branches/modular/rivet/packages/form/form.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/rivet/packages/form/form.tcl?rev=1518850&r1=1518849&r2=1518850&view=diff
==============================================================================
--- tcl/rivet/branches/modular/rivet/packages/form/form.tcl (original)
+++ tcl/rivet/branches/modular/rivet/packages/form/form.tcl Thu Aug 29 22:55:55 2013
@@ -35,7 +35,7 @@ package provide form 1.0
# set the form method to be a post and the action to be
# a refetching of the current page
set arguments(method) post
- set arguments(action) [env DOCUMENT_URI]
+ set arguments(action) [::rivet::env DOCUMENT_URI]
# use $this for the type for form-global stuff like form arguments
import_data form $this arguments $args
Modified: tcl/rivet/branches/modular/rivet/packages/form/form2.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/modular/rivet/packages/form/form2.tcl?rev=1518850&r1=1518849&r2=1518850&view=diff
==============================================================================
--- tcl/rivet/branches/modular/rivet/packages/form/form2.tcl (original)
+++ tcl/rivet/branches/modular/rivet/packages/form/form2.tcl Thu Aug 29 22:55:55 2013
@@ -27,7 +27,7 @@ package provide form 2.0
# set the form method to be a post and the action to be
# a refetching of the current page
set arguments(method) post
- set arguments(action) [env DOCUMENT_URI]
+ set arguments(action) [::rivet::env DOCUMENT_URI]
# use $this for the type for form-global stuff like form arguments
import_data form $this arguments $args
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org