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 50de18adaa857000fb3739208bbdf63e6babb1e5
Merge: b969bd8 a037de8
Author: Massimo Manghi <mxman...@apache.org>
AuthorDate: Sun Dec 16 18:10:38 2018 +0100
more conflict fixing
.appveyor.yml | 45 ++++++++++++++++++++++++++++++++++++++++++++
ChangeLog | 27 ++++++++++++++++++++------
README.md | 29 ++++++++++++++++++++++++++++
cmake/CMakeLists.txt | 21 ++++++++++-----------
cmake/README.cmake | 6 +++---
src/mod_rivet_ng/mod_rivet.h | 10 +++++++++-
6 files changed, 117 insertions(+), 21 deletions(-)
diff --cc ChangeLog
index 8d2ae46,8324639..5c05583
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,18 +1,23 @@@
+ 2018-12-16 Georgios Petasis <petas...@apache.org>
+ * Readme.md: Added a Markdown README file, which shows the build status
+ from Appveyor, for Windows.
+
+ * .appveyor.yml: Started a build configuration for Appveyor:
+ https://ci.appveyor.com/project/petasis/tcl-rivet
+
+ * 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-08 Massimo Manghi <mxman...@apache.org>
+ * cmake/CMakeList.c: changed suffix of librivetparser.so and librivet.so
+ * src/mod_rivet_ng: various changes to have a compilable module
+ on Windows. Still the module not working tough
-
++
2018-12-07 Massimo Manghi <mxman...@apache.org>
* rivet/pkgIndex.tcl: completed with actual list of packages
diff --cc src/mod_rivet_ng/mod_rivet.h
index 0e9ee93,a3633a5..98e4d60
--- a/src/mod_rivet_ng/mod_rivet.h
+++ b/src/mod_rivet_ng/mod_rivet.h
@@@ -37,10 -37,16 +37,18 @@@
#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 */
#define RIVET_DIR RIVET_RIVETLIB_DESTDIR
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@tcl.apache.org
For additional commands, e-mail: commits-h...@tcl.apache.org
