You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by mx...@apache.org on 2018/12/19 15:53:37 UTC
[tcl-rivet] 01/04: merging from master
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch winbuild
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit 75277daee3f881b00b9e7c798f7bb2f539178882
Author: petasis <pe...@yahoo.gr>
AuthorDate: Wed Dec 19 11:03:42 2018 +0200
merging from master
---
ChangeLog | 10 +++++++++-
cmake/CMakeLists.txt | 17 +++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 4a27f8b..20414d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+ 2018-12-19 Georgios Petasis <pe...@apache.org>
+ * cmake/CMakeLists.txt: Added support for regenerating pkgIndex.tcl in the
+ installation directory of rivetlib, after files have been installed.
+ This executes "tclsh".
+
2018-12-18 Massimo Manghi <mx...@apache.org>
* rivet/pkgIndex.tcl: update rivetlib version. The CMake build script doesn't run
pkg_mkIndex in order to update this file, so we still have to keep the package version
aligned with the those actually provided.
-
+
2018-12-17 Massimo Manghi <mx...@apache.org>
* VERSION: changing version to 3.2.1 attempting to trigger an appveyor rebuild
* src/request/apache_request.c,src/request/apache_multipart_buffer.[c|h]:
@@ -11,6 +16,9 @@
* src/mod_rivet_ng/rivet_types.h,rivetCore.c: field 'size' in structure typed as size_t
* src/mod_rivet_ng/TclWebapache.c: argument to Tcl_ReadChars explicitly cast to int
+2018-12-17 Georgios Petasis <pe...@apache.org>
+ * Readme.md: Added a separate badge for winbuild branch.
+
2018-12-16 Georgios Petasis <pe...@apache.org>
* Readme.md: Added a Markdown README file, which shows the build status
from Appveyor, for Windows.
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 8f28404..fdd82cb 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -499,3 +499,20 @@ install(DIRECTORY
${RIVET_LIB_DIR}/packages/session
${RIVET_LIB_DIR}/packages/tclrivet
DESTINATION ${RIVETLIB_DESTDIR}/packages)
+
+# Regenerate pkgIndex.tcl in all libraries...
+# ===========================================================================
+SET ( RIVET_LIBS_ARCH ${RIVETLIB_DESTDIR}/mpm )
+file(WRITE ${RIVETLIB_DESTDIR}/regenerate_pkgIndex.tcl
+"puts \"Regenerating pkgIndex.tcl in [pwd]:\"
+file delete {*}[glob [file join packages * pkgIndex.tcl]] pkgIndex.tcl
+pkg_mkIndex -verbose [pwd] init.tcl \\
+ {*}[glob [file join packages * *.tcl] \\
+ [file join ${RIVET_LIBS_ARCH} *[info sharedlibextension]]]"
+)
+install(CODE "
+ execute_process(COMMAND ${TCL_TCLSH} regenerate_pkgIndex.tcl
+ WORKING_DIRECTORY ${RIVETLIB_DESTDIR})
+ file(REMOVE ${RIVETLIB_DESTDIR}/regenerate_pkgIndex.tcl)
+ "
+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org