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:36 UTC

[tcl-rivet] branch winbuild updated (617e24b -> 803b468)

This is an automated email from the ASF dual-hosted git repository.

mxmanghi pushed a change to branch winbuild
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git.


    from 617e24b  commit pkgIndex.tcl update
     new 75277da  merging from master
     new bc7a993  merging master commits
     add 28633d9  Appveyor: enabled all branches
     add 679ce1f  Appveyor: enabled all branches
     add 3b7f6a3  Readme.md: winbuild branch
     add bf21d0d  Readme.md: winbuild branch
     add 6a3c713  Readme.md: winbuild branch
     add fd26cfe  CMake, regenerate pkgIndex.tcl
     new 8855bcc  merging from master
     add c496f8e  CMake: generate pkg_Index.tcl
     new 803b468  more merges from master concerning CMakeList.txt

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .appveyor.yml        |  2 +-
 ChangeLog            | 10 +++++++++-
 README.md            | 10 +++++-----
 cmake/CMakeLists.txt | 32 +++++++++++++++++++++++---------
 4 files changed, 38 insertions(+), 16 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org


[tcl-rivet] 01/04: merging from master

Posted by mx...@apache.org.
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


[tcl-rivet] 03/04: merging from master

Posted by mx...@apache.org.
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 8855bccc01aa086fe3bf23a502188763e343f58a
Merge: bc7a993 fd26cfe
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Wed Dec 19 16:40:06 2018 +0100

    merging from master

 .appveyor.yml |  2 +-
 README.md     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org


[tcl-rivet] 02/04: merging master commits

Posted by mx...@apache.org.
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 bc7a99335e654e2e0fba0af2310eb61bf0584db8
Author: petasis <pe...@yahoo.gr>
AuthorDate: Wed Dec 19 11:03:42 2018 +0200

    merging master commits
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 20414d7..b09b20f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-	2018-12-19 Georgios Petasis <pe...@apache.org>
+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".


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org


[tcl-rivet] 04/04: more merges from master concerning CMakeList.txt

Posted by mx...@apache.org.
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 803b46860bcb0081e063102b5911fae3042fc002
Merge: 8855bcc c496f8e
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Wed Dec 19 16:46:29 2018 +0100

    more merges from master concerning CMakeList.txt

 cmake/CMakeLists.txt | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org