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 ka...@apache.org on 2004/09/18 00:58:33 UTC
cvs commit: tcl-rivet/src make.tcl
karl 2004/09/17 15:58:33
Modified: . ChangeLog
src make.tcl
Removed: rivet pkgIndex.tcl
rivet/packages/rivet pkgIndex.tcl
Log:
Generate the target rivet/pkgIndex.tcl and rivet/packages/rivet/pkgIndex.tcl
on-the-fly at install time, instead of using prebuilt versions that have
hard-coded shared library names and may not be complete.
Revision Changes Path
1.193 +14 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- ChangeLog 16 Sep 2004 01:42:54 -0000 1.192
+++ ChangeLog 17 Sep 2004 22:58:33 -0000 1.193
@@ -1,3 +1,17 @@
+2004-09-17 Karl Lehenbauer <ka...@sc.com>
+ * rivet/packages/rivet/pkgIndex.tcl: Removed. It had a hard-coded
+ assumption about the shared library extensions (.so). This file is
+ now generated in the target directory by the install node of make.tcl.
+
+ * rivet/pkgIndex.tcl: Removed. It is generated by the make.tcl
+ install process, as above.
+
+ * src/make.tcl: The above changes, specifically the install node
+ now generates the target rivet/pkgIndex.tcl and
+ rivet/packages/rivet/pkgIndex.tcl file using pkg_mkIndex,
+ causing all Tcl-defined and shared-library-defined packages to be
+ discovered and generated into the pkgIndex.tcl.
+
2004-09-16 Karl Lehenbauer <ka...@sc.com>
* src/parserPkgInit.c: Added a Rivetparser_SafeInit so the
C-based standalone Rivet parser library can be loaded
1.61 +21 -1 tcl-rivet/src/make.tcl
Index: make.tcl
===================================================================
RCS file: /home/cvs/tcl-rivet/src/make.tcl,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- make.tcl 18 May 2004 20:23:02 -0000 1.60
+++ make.tcl 17 Sep 2004 22:58:33 -0000 1.61
@@ -187,6 +187,9 @@
# FIXME - we need to do this at install time, because the file join
# here makes the package index use "/".
+# 9/2004 KL - I think this is fixed by the install process now generating
+# it in the install directory, but it doesn't really support making a
+# distribution exactly, so I haven't removed this.
AddNode $PKGINDEX {
tcl {
set curdir [pwd]
@@ -214,6 +217,23 @@
tcl file mkdir [file join $PREFIX rivet packages rivet]
tcl fileutil::install -m o+r $RIVETLIB_SHLIB [file join $PREFIX rivet packages rivet]
tcl fileutil::install -m o+r $PARSER_SHLIB [file join $PREFIX rivet packages rivet]
+ tcl pkg_mkIndex [file join $PREFIX rivet packages rivet] *
+
+ # generate the overarching pkgIndex.tcl, including any shared libs we
+ # find, finding whatever shared library extensions we were told to
+ # expect (like *.so, typically, but also *.dylib on mac os x)
+ tcl {
+ set curdir [pwd]
+ cd [file join $PREFIX rivet]
+ eval pkg_mkIndex -verbose [pwd] init.tcl [glob [file join packages * *.tcl] [file join packages * *[info sharedlibextension]]]
+ cd $curdir
+ puts ""
+ puts "don't worry about any ``can't read \$dir'' errors, they're no problem"
+ puts ""
+ puts "*** Rivet installation complete ***"
+ puts ""
+ }
+
}
#foreach doc $HTML_DOCS {
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org