You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by pe...@apache.org on 2018/12/16 10:45:22 UTC
[tcl-rivet] branch master updated: Removed statement
"APLOG_USE_MODULE(rivet); " from mod_rivet.h
This is an automated email from the ASF dual-hosted git repository.
petasis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
The following commit(s) were added to refs/heads/master by this push:
new 4820b07 Removed statement "APLOG_USE_MODULE(rivet);" from mod_rivet.h
4820b07 is described below
commit 4820b07bfcd61b3b9c66dac685a6ad52bcc57b79
Author: petasis <pe...@yahoo.gr>
AuthorDate: Sun Dec 16 12:45:06 2018 +0200
Removed statement "APLOG_USE_MODULE(rivet);" from mod_rivet.h
---
ChangeLog | 19 ++++++++++++++-----
cmake/CMakeLists.txt | 1 +
cmake/README.cmake | 2 +-
src/mod_rivet_ng/mod_rivet.h | 10 +++++++++-
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 24d74d2..2429f82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-12-16 Georgios Petasis <pe...@apache.org>
+ * cmake/CMakeLists.txt: Set policy CMP0074 to new behaviour. Rivet version
+ is read from file VERSION.
+
+ * cmake/README.cmake: Some changes in directories used.
+
+ * src/mod_rivet_ng/mod_rivet.h: Removed statement "APLOG_USE_MODULE(rivet);"
+ from the module header file.
+
2018-12-07 Massimo Manghi <mx...@apache.org>
* rivet/pkgIndex.tcl: completed with actual list of packages
@@ -6,11 +15,11 @@
* doc/rivet.xml,doc/xml/examples.xml: modified example "color table"
2018-12-03 Massimo Manghi <mx...@apache.org>
- * cmake/CMakeList.c: we infer the version number from the file
- VERSION assumed to reside in the project root directory
- * src/parser/rivetParser.c:
- * src/mod_rivet_ng/mod_rivet_common.c: type cast of pointer
- arithmetics into int
+ * cmake/CMakeList.c: we infer the version number from the file
+ VERSION assumed to reside in the project root directory
+ * src/parser/rivetParser.c:
+ * src/mod_rivet_ng/mod_rivet_common.c: type cast of pointer
+ arithmetics into int
2018-11-23 Massimo Manghi <mx...@apache.org>
* VERSION,configure,ac: version number bumped to 3.2.0 as we created
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index fc60204..054a4d6 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -3,6 +3,7 @@
# The minimum version of cmake required. This may work also in 2.8,
# but I have not tested. My cmake is version 3.9.0.
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
+cmake_policy(SET CMP0074 NEW)
# Rivet version:
# In order to avoid chasing around multiple definition of the module version we infer
diff --git a/cmake/README.cmake b/cmake/README.cmake
index 9d283f1..bd1e3d3 100644
--- a/cmake/README.cmake
+++ b/cmake/README.cmake
@@ -43,7 +43,7 @@ Compiling Rivet with cmake:
6) Specify Tcl at a non standard location:
cmake -E make_directory build_64
- cmake -E chdir build_64 cmake -DAPACHE_ROOT=F:/Apache24 -G "Visual Studio 15 2017 Win64" -Dwith-tcl=C:/TclApps/Tcl64/lib ..
+ cmake -E chdir build_64 cmake -DAPACHE_ROOT=F:/Apache24_64 -G "Visual Studio 15 2017 Win64" -Dwith-tcl=C:/TclApps/Tcl64/lib ..
cmake --build build_64 --config Release --target install
Instead of -Dwith-tcl=, -DTCL_ROOT=, -DTclStub_ROOT, and -DTCL_TCLSH= can be
diff --git a/src/mod_rivet_ng/mod_rivet.h b/src/mod_rivet_ng/mod_rivet.h
index 2767663..a3633a5 100644
--- a/src/mod_rivet_ng/mod_rivet.h
+++ b/src/mod_rivet_ng/mod_rivet.h
@@ -37,7 +37,15 @@
#include <rivet_config.h>
#endif
-APLOG_USE_MODULE(rivet);
+/*
+ * Petasis 16 Dec 2018: This causes the symbol to be exported also from MPMs...
+
+ APLOG_USE_MODULE(rivet);
+
+ PLEASE: do not use any of APLOG_USE_MODULE, AP_DECLARE_MODULE,
+ AP_MODULE_DECLARE_DATA in this header file!
+
+*/
/* init.tcl file relative to the server root directory */
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org