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/16 17:15:19 UTC
[tcl-rivet] branch winbuild updated (dc40bcd -> 50de18a)
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 dc40bcd now building on Windows, but getting garbled data in the conf record
add fd24aff regenerating packages index
new b969bd8 fix merge conflict
add a72ee4f Infer Rivet version from file VERSION
add 4820b07 Removed statement "APLOG_USE_MODULE(rivet);" from mod_rivet.h
add 63a0b37 Appveyor build project: .appveyor.yml
add f22e262 Appveyor build project: .appveyor.yml
add 38b9b22 Appveyor build project: .appveyor.yml
add 7fe1784 Appveyor build project: .appveyor.yml
add acd0c70 Readme.md in markdown
add a037de8 Appveyor build project: .appveyor.yml
new 50de18a more conflict fixing
The 2 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 | 45 ++++++++++++++++++++++++++++++++++++++++++++
ChangeLog | 30 +++++++++++++++++++++++------
README.md | 29 ++++++++++++++++++++++++++++
cmake/CMakeLists.txt | 21 ++++++++++-----------
cmake/README.cmake | 6 +++---
src/mod_rivet_ng/mod_rivet.h | 10 +++++++++-
6 files changed, 120 insertions(+), 21 deletions(-)
create mode 100644 .appveyor.yml
create mode 100644 README.md
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org
[tcl-rivet] 02/02: more conflict fixing
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 50de18adaa857000fb3739208bbdf63e6babb1e5
Merge: b969bd8 a037de8
Author: Massimo Manghi <mx...@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 <pe...@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 <mx...@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 <mx...@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-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org
[tcl-rivet] 01/02: fix merge conflict
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 b969bd8e3a7712fd0b29146d275a1dbab55cf082
Merge: dc40bcd fd24aff
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Sun Dec 16 18:05:25 2018 +0100
fix merge conflict
ChangeLog | 3 +++
1 file changed, 3 insertions(+)
diff --cc ChangeLog
index 38e2c4f,24d74d2..8d2ae46
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,11 @@@
+2018-12-08 Massimo Manghi <mx...@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 <mx...@apache.org>
+ * rivet/pkgIndex.tcl: completed with actual list of packages
+
2018-12-04 Massimo Manghi <mx...@apache.org>
* configure.ac: now infer the version number from VERSION.
* doc/rivet.xml,doc/xml/examples.xml: modified example "color table"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org