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/11/05 00:51:02 UTC
svn commit: r1538804 - in /tcl/rivet/trunk: ChangeLog configure.ac
src/Makefile.am src/apache-2/Makefile.am src/librivet/Makefile.am
tests/parsepackage.test tests/runtests.tcl
Author: mxmanghi
Date: Mon Nov 4 23:51:02 2013
New Revision: 1538804
URL: http://svn.apache.org/r1538804
Log: (empty)
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/configure.ac
tcl/rivet/trunk/src/Makefile.am
tcl/rivet/trunk/src/apache-2/Makefile.am
tcl/rivet/trunk/src/librivet/Makefile.am
tcl/rivet/trunk/tests/parsepackage.test
tcl/rivet/trunk/tests/runtests.tcl
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1538804&r1=1538803&r2=1538804&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Mon Nov 4 23:51:02 2013
@@ -1,3 +1,10 @@
+2013-11-04 Massimo Manghi <mx...@apache.org>
+ * src/Makefile.am: this Makefile.am is now in charge for building mod_rivet
+ librivet.so and librivetparser.so. This fixes and problem with the 'distclean'
+ target and keeps us from further customization of automake (subdir-objects
+ property)
+ * src/runtests.tcl: changed path to mod_rivet.so and librivetparser.so
+
2013-10-15 Massimo Manghi <mx...@apache.org>
* src/rivetcmds/rivetCore.c: 'headers redirect' used to return TCL_RETURN
to force the caller to terminate and interrupt the processing. It didn't
Modified: tcl/rivet/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/configure.ac?rev=1538804&r1=1538803&r2=1538804&view=diff
==============================================================================
--- tcl/rivet/trunk/configure.ac (original)
+++ tcl/rivet/trunk/configure.ac Mon Nov 4 23:51:02 2013
@@ -26,7 +26,6 @@ AC_INIT([Rivet],[2.1.3])
TEA_INIT([3.9])
AC_CONFIG_AUX_DIR(tclconfig)
-AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
@@ -51,7 +50,7 @@ AX_PREFIX_CONFIG_H([rivet_config.h],[riv
# Init automake stuff
#
AC_DISABLE_STATIC
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
#--------------------------------------------------------------------
# Load the tclConfig.sh file
@@ -705,7 +704,7 @@ if test "$print_fileevent_msg" = "1"; th
AC_MSG_NOTICE([Nonetheless Rivet scripts are working with Tcl >= 8.5.10 provided])
AC_MSG_NOTICE([you do not have to rely on the event loop to do I/O (e.g. you])
AC_MSG_NOTICE([cannot use the 'fileevent' command to set up callbacks)])
- AC_MSG_NOTICE([see issue https://issues.apache.org/bugzilla/show_bug.cgi?id=55153])
+ AC_MSG_NOTICE([see https://issues.apache.org/bugzilla/show_bug.cgi?id=55153])
AC_MSG_NOTICE([========================================================================])
fi
Modified: tcl/rivet/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/Makefile.am?rev=1538804&r1=1538803&r2=1538804&view=diff
==============================================================================
--- tcl/rivet/trunk/src/Makefile.am (original)
+++ tcl/rivet/trunk/src/Makefile.am Mon Nov 4 23:51:02 2013
@@ -14,11 +14,51 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = librivet parser @apache_version_dir@
+#SUBDIRS = librivet @apache_version_dir@
+
+lib_libexecdir = @RIVET_TCL_TARGET@
+lib_libexec_LTLIBRARIES = librivetparser.la librivetlib.la
+
+#
+# Rivet Parser Library
+#
+librivetparser_la_SOURCES = parser/rivetParser.c parser/parserPkgInit.c
+librivetparser_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
+librivetparser_la_LIBADD = @APXS_LIBS@
+librivetparser_la_CPPFLAGS = @apache_include@ -I@apache_version_dir@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
+
+#
+# Rivet Library
+#
+librivetlib_la_SOURCES = librivet/rivetList.c librivet/rivetCrypt.c librivet/rivetWWW.c librivet/rivetPkgInit.c
+librivetlib_la_LDFLAGS = @TCL_STUB_LIB_SPEC@ @APXS_LDFLAGS@ @APR_LDFLAGS@ -module -avoid-version
+librivetlib_la_LIBADD = @APXS_LIBS@
+librivetlib_la_CPPFLAGS = -I@apache_version_dir@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
+
+#
+# mod_rivet
+#
+apxs_libexecdir = @APXS_LIBEXECDIR@
+apxs_libexec_LTLIBRARIES = mod_rivet.la
+
+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 = -I@apache_version_dir@ @apache_include@ -I@RIVET_BASE_INCLUDE@ -Iparser @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+
+
+mod_rivet_la_SOURCES = @apache_version_dir@/apache_multipart_buffer.c \
+ @apache_version_dir@/apache_request.c \
+ @apache_version_dir@/mod_rivet.c \
+ @apache_version_dir@/TclWebapache.c \
+ rivetcmds/rivetCore.c \
+ rivetcmds/rivetInspect.c \
+ rivetChannel.c \
+ parser/rivetParser.c
# Removing libtool .la files from installation
install-data-hook:
echo 'removing unwanted libtool .la files'
rm -f $(DESTDIR)/$(lib_libexecdir)/*.la
+ rm -f $(DESTDIR)/$(apxs_libexecdir)/*.la
Modified: tcl/rivet/trunk/src/apache-2/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/Makefile.am?rev=1538804&r1=1538803&r2=1538804&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/Makefile.am (original)
+++ tcl/rivet/trunk/src/apache-2/Makefile.am Mon Nov 4 23:51:02 2013
@@ -14,44 +14,44 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-AUTOMAKE_OPTIONS = subdir-objects
+#AUTOMAKE_OPTIONS = subdir-objects
-# AM_CFLAGS = @TCL_INCLUDES@ @GM_CPPFLAGS@
+## AM_CFLAGS = @TCL_INCLUDES@ @GM_CPPFLAGS@
-# The weird and wild magic of auto* associates these two.
-apxs_libexecdir = @APXS_LIBEXECDIR@
-apxs_libexec_LTLIBRARIES = mod_rivet.la
+## The weird and wild magic of auto* associates these two.
+#apxs_libexecdir = @APXS_LIBEXECDIR@
+#apxs_libexec_LTLIBRARIES = mod_rivet.la
#AM_CPPFLAGS =
-# ... and these two. We want to put the libs in the package path,
-# rather than the standard library location for the system.
-##lib_libexecdir = @TCL_PACKAGE_PATH@/rivet
-##lib_libexec_LTLIBRARIES = librivet.la librivetparser.la
-
-#
-# Apache Rivet Module, mod_rivet.so / mod_rivet.dll
-#
-mod_rivet_la_SOURCES = \
- apache_multipart_buffer.c \
- apache_request.c \
- mod_rivet.c \
- TclWebapache.c \
- ../rivetcmds/rivetCore.c \
- ../rivetcmds/rivetInspect.c \
- ../rivetChannel.c \
- ../parser/rivetParser.c
-
-##mod_rivet_la_SOURCES = mod_rivet.c mod_rivet.h
-
-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 = @apache_include@ -I@RIVET_BASE_INCLUDE@ -I../parser @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+## ... and these two. We want to put the libs in the package path,
+## rather than the standard library location for the system.
+###lib_libexecdir = @TCL_PACKAGE_PATH@/rivet
+###lib_libexec_LTLIBRARIES = librivet.la librivetparser.la
+
+##
+## Apache Rivet Module, mod_rivet.so / mod_rivet.dll
+##
+#mod_rivet_la_SOURCES = \
+# apache_multipart_buffer.c \
+# apache_request.c \
+# mod_rivet.c \
+# TclWebapache.c \
+# ../rivetcmds/rivetCore.c \
+# ../rivetcmds/rivetInspect.c \
+# ../rivetChannel.c \
+# ../parser/rivetParser.c
+
+###mod_rivet_la_SOURCES = mod_rivet.c mod_rivet.h
+
+#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 = @apache_include@ -I@RIVET_BASE_INCLUDE@ -I../parser @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_CPPFLAGS@ @APR_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
# APXS_CPPFLAGS_SHLIB
-# Removing libtool .la files from installation
-
-install-data-hook:
- echo 'removing unwanted libtool .la files'
- rm -f $(DESTDIR)/$(apxs_libexecdir)/*.la
+## Removing libtool .la files from installation
+#
+#install-data-hook:
+# echo 'removing unwanted libtool .la files'
+# rm -f $(DESTDIR)/$(apxs_libexecdir)/*.la
Modified: tcl/rivet/trunk/src/librivet/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/librivet/Makefile.am?rev=1538804&r1=1538803&r2=1538804&view=diff
==============================================================================
--- tcl/rivet/trunk/src/librivet/Makefile.am (original)
+++ tcl/rivet/trunk/src/librivet/Makefile.am Mon Nov 4 23:51:02 2013
@@ -20,15 +20,15 @@
# ... and these two. We want to put the libs in the package path,
# rather than the standard library location for the system.
-lib_libexecdir = @RIVET_TCL_TARGET@
-lib_libexec_LTLIBRARIES = librivetlib.la
+#lib_libexecdir = @RIVET_TCL_TARGET@
+#lib_libexec_LTLIBRARIES = librivetlib.la
-#
-# Rivet Library
-#
+##
+## Rivet Library
+##
-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 = -I.. -I../@apache_version_dir@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
+#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 = -I.. -I../@apache_version_dir@ @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ @APR_INCLUDES@ @APR_CPPFLAGS@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"' -DUSE_TCL_STUBS
Modified: tcl/rivet/trunk/tests/parsepackage.test
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/parsepackage.test?rev=1538804&r1=1538803&r2=1538804&view=diff
==============================================================================
--- tcl/rivet/trunk/tests/parsepackage.test (original)
+++ tcl/rivet/trunk/tests/parsepackage.test Mon Nov 4 23:51:02 2013
@@ -3,7 +3,7 @@
package require tcltest
package require tclrivetparser
-load [file join [pwd] .. src parser .libs librivetparser[info sharedlibext]]
+load [file join [pwd] .. src .libs librivetparser[info sharedlibext]]
::tcltest::test parserivetdata-1.1 {parserivetdata command} {
set fl [open hello.rvt]
Modified: tcl/rivet/trunk/tests/runtests.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/tests/runtests.tcl?rev=1538804&r1=1538803&r2=1538804&view=diff
==============================================================================
--- tcl/rivet/trunk/tests/runtests.tcl (original)
+++ tcl/rivet/trunk/tests/runtests.tcl Mon Nov 4 23:51:02 2013
@@ -85,7 +85,7 @@ if {$httpd_version == 1} {
}
apachetest::makeconf server.conf {
- LoadModule rivet_module [file join $CWD .. src/apache-$apachetest::httpd_version .libs mod_rivet[info sharedlibextension]]
+ LoadModule rivet_module [file join $CWD .. src/.libs mod_rivet[info sharedlibextension]]
# User and Group directives removed to ease dependency of test suite from the output of command 'id' (from which
# the values for these directives were inferred (Bug #53396)
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org