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 2010/06/22 18:45:49 UTC
svn commit: r956947 - in /tcl/rivet/trunk: ChangeLog Makefile.am Makefile.in
rivet/packages/commserver/server.tcl rivet/packages/tclrivet/parse.tcl
rivet/packages/tclrivet/tclrivet.tcl
Author: mxmanghi
Date: Tue Jun 22 16:45:49 2010
New Revision: 956947
URL: http://svn.apache.org/viewvc?rev=956947&view=rev
Log:
2010-06-22 Massimo Manghi <mx...@apache.org>
* Makefile.am: Rivet install target deletes every pkgIndex.tcl file that might have been
left around in the Rivet directory tree, before calling pkg_mkIndex.tcl to regenerate
the library index file in the root directory.
* rivet/packages/tclrivet/parse.tcl,rivet/packages/commserver/server.tcl: add existence test on
argv variable that wept during the installation process. If not set exits silently (variable is
required for a sensible use of the procedures)
* rivet/packages/tclrivet/tclrivet.tcl: wrong path to librivetparser.[so|dll] corrected
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.am
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/rivet/packages/commserver/server.tcl
tcl/rivet/trunk/rivet/packages/tclrivet/parse.tcl
tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=956947&r1=956946&r2=956947&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue Jun 22 16:45:49 2010
@@ -1,3 +1,12 @@
+2010-06-22 Massimo Manghi <mx...@apache.org>
+ * Makefile.am: Rivet install target deletes every pkgIndex.tcl file that might have been
+ left around in the Rivet directory tree, before calling pkg_mkIndex.tcl to regenerate
+ the library index file in the root directory.
+ * rivet/packages/tclrivet/parse.tcl,rivet/packages/commserver/server.tcl: add existence test on
+ argv variable that wept during the installation process. If not set exits silently (variable is
+ required for a sensible use of the procedures)
+ * rivet/packages/tclrivet/tclrivet.tcl: wrong path to librivetparser.[so|dll] corrected
+
2010-06-19 Massimo Manghi <mx...@apache.org>
* src/apache-2/mod_rivet.c: filled SERVER_CONF variable in the 'server' array with value generated
by the build system of the directory holding the conf files.
Modified: tcl/rivet/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.am?rev=956947&r1=956946&r2=956947&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.am (original)
+++ tcl/rivet/trunk/Makefile.am Tue Jun 22 16:45:49 2010
@@ -8,7 +8,7 @@
#
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST=LICENSE contrib debian doc rivet win/nmakehlp.c src/testing.c src/TclWebcgi.c
+EXTRA_DIST = LICENSE contrib debian doc rivet win/nmakehlp.c src/testing.c src/TclWebcgi.c
SUBDIRS = src doc
RIVETLIB_DESTDIR = @RIVET_TCL_TARGET@
@@ -18,7 +18,9 @@ libtool: $(LIBTOOL_DEPS)
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(RIVETLIB_DESTDIR)
cp -r rivet/* $(DESTDIR)$(RIVETLIB_DESTDIR)
- -( cd $(DESTDIR)$(RIVETLIB_DESTDIR) ; echo 'eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join *[info sharedlibextension]]]' | @TCLSH_PROG@ ; )
+ -( cd $(DESTDIR)$(RIVETLIB_DESTDIR); \
+ echo 'eval file delete [glob [file join packages * pkgIndex.tcl]] pkgIndex.tcl' | @TCLSH_PROG@ ; \
+ echo 'eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join *[info sharedlibextension]]]' | @TCLSH_PROG@ ; )
uninstall-local:
rm -fr $(DESTDIR)$(RIVETLIB_DESTDIR)
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=956947&r1=956946&r2=956947&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Tue Jun 22 16:45:49 2010
@@ -801,7 +801,9 @@ libtool: $(LIBTOOL_DEPS)
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(RIVETLIB_DESTDIR)
cp -r rivet/* $(DESTDIR)$(RIVETLIB_DESTDIR)
- -( cd $(DESTDIR)$(RIVETLIB_DESTDIR) ; echo 'eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join *[info sharedlibextension]]]' | @TCLSH_PROG@ ; )
+ -( cd $(DESTDIR)$(RIVETLIB_DESTDIR); \
+ echo 'eval file delete [glob [file join packages * pkgIndex.tcl]] pkgIndex.tcl' | @TCLSH_PROG@ ; \
+ echo 'eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join *[info sharedlibextension]]]' | @TCLSH_PROG@ ; )
uninstall-local:
rm -fr $(DESTDIR)$(RIVETLIB_DESTDIR)
Modified: tcl/rivet/trunk/rivet/packages/commserver/server.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/packages/commserver/server.tcl?rev=956947&r1=956946&r2=956947&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/packages/commserver/server.tcl (original)
+++ tcl/rivet/trunk/rivet/packages/commserver/server.tcl Tue Jun 22 16:45:49 2010
@@ -27,6 +27,8 @@
package require comm
+if {![info exists argv]} { return }
+
set Port [lindex $argv 0]
if { [catch {
comm::comm config -port $Port
Modified: tcl/rivet/trunk/rivet/packages/tclrivet/parse.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/packages/tclrivet/parse.tcl?rev=956947&r1=956946&r2=956947&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/packages/tclrivet/parse.tcl (original)
+++ tcl/rivet/trunk/rivet/packages/tclrivet/parse.tcl Tue Jun 22 16:45:49 2010
@@ -4,6 +4,8 @@
# Parse a rivet file and execute it.
+if {![info exists argv]} { return }
+
set auto_path "[file dirname [info script]] $auto_path"
package require tclrivet
@@ -18,4 +20,4 @@ proc main {} {
}
}
-main
\ No newline at end of file
+main
Modified: tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl?rev=956947&r1=956946&r2=956947&view=diff
==============================================================================
--- tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl (original)
+++ tcl/rivet/trunk/rivet/packages/tclrivet/tclrivet.tcl Tue Jun 22 16:45:49 2010
@@ -18,7 +18,7 @@
package provide tclrivet 0.1
-load [file join [file dirname [info script]] .. .. .. src \
+load [file join [file dirname [info script]] .. .. \
librivetparser[info sharedlibextension]]
proc include { filename } {
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org