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/17 09:51:46 UTC
[tcl-rivet] branch 3.1 updated: bumping version number to 3.1.1.
integrating appveyor.com build,
removing wrong call to macro AP_USE_MODULE in mod_rivet.h
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
The following commit(s) were added to refs/heads/3.1 by this push:
new 43601f4 bumping version number to 3.1.1. integrating appveyor.com build, removing wrong call to macro AP_USE_MODULE in mod_rivet.h
43601f4 is described below
commit 43601f4e2a47884808f1e4d7a226686b760a3d18
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Mon Dec 17 10:51:25 2018 +0100
bumping version number to 3.1.1. integrating appveyor.com build, removing wrong call to macro AP_USE_MODULE in mod_rivet.h
---
.appveyor.yml | 45 ++++++++++++++++++++++++++++++++++++++++++++
ChangeLog | 11 +++++++++++
VERSION | 2 +-
cmake/CMakeLists.txt | 16 +++++++++++++---
cmake/README.cmake | 6 +++---
doc/rivet.xml | 2 +-
src/mod_rivet_ng/mod_rivet.h | 7 ++++++-
7 files changed, 80 insertions(+), 9 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 0000000..2bd4ff0
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,45 @@
+branches:
+ only:
+ - /.*/
+
+image:
+ - Visual Studio 2017
+
+platform:
+ - x64
+
+configuration:
+ - Release
+
+matrix:
+ fast_finish: true
+ allow_failures:
+ - platform: x86
+ configuration: Release
+
+install:
+ # Install Tcl/Tk
+ - cmd: if %platform%==x86 set DOWNLOAD_PLATFORM=win32
+ - cmd: if %platform%==x64 set DOWNLOAD_PLATFORM=amd64
+ - cmd: if %platform%==x86 set APACHE_DOWNLOAD_PLATFORM=win32
+ - cmd: if %platform%==x64 set APACHE_DOWNLOAD_PLATFORM=win64
+ - cmd: if %platform%==x86 set CMAKE_GENERATOR="Visual Studio 15"
+ - cmd: if %platform%==x64 set CMAKE_GENERATOR="Visual Studio 15 Win64"
+ - cmd: set IRONTCL_VERSION="8.6.7"
+ - cmd: appveyor DownloadFile https://www.irontcl.com/downloads/irontcl-%DOWNLOAD_PLATFORM%-%IRONTCL_VERSION%.zip
+ - cmd: cmake -E tar xf irontcl-%DOWNLOAD_PLATFORM%-%IRONTCL_VERSION%.zip
+ - cmd: set TCL_ROOT=%cd%\IronTcl
+ - cmd: set PATH=%TCL_ROOT%\bin;%PATH%
+ # Install Apache
+ - cmd: set APACHE_VERSION="2.4.37"
+ - cmd: set APACHE_COMPILER="VC15"
+ - cmd: appveyor DownloadFile https://home.apache.org/~steffenal/%APACHE_COMPILER%/binaries/httpd-%APACHE_VERSION%-%APACHE_DOWNLOAD_PLATFORM%-%APACHE_COMPILER%.zip
+ - cmd: cmake -E tar xf httpd-%APACHE_VERSION%-%APACHE_DOWNLOAD_PLATFORM%-%APACHE_COMPILER%.zip
+ - cmd: set APACHE_ROOT=%cd%\Apache24
+ # Generate solution...
+ - cmd: cd cmake
+ - cmd: cmake -E make_directory "build"
+ - cmd: cmake -E chdir build cmake -DAPACHE_ROOT=%APACHE_ROOT% -DTCL_ROOT=%TCL_ROOT% -G %CMAKE_GENERATOR% ..
+
+build:
+ project: C:\projects\tcl-rivet\cmake\build\Rivet.sln # path to Visual Studio solution or project
diff --git a/ChangeLog b/ChangeLog
index fb0a568..328112e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2018-12-17 Massimo Manghi <mx...@apache.org>
+ * VERSION: moving version number to 3.1.1
+ * mod_rivet.h: AP_USE_MODULE replicates what AP_DECLARE_DATA does
+ in mod_rivet.c but it isn't meant to stay in mod_rivet.h in the first
+ place
+ * cmake/CMakeLists.txt: update to let it rely entirely on CMake to
+ determine the version from VERSION (check out from master)
+ * cmake/README.cmake: mergin updates done by Georgios Petasis in the
+ master branch
+ * .appveryor.yml: using Appveyor to check the window build
+
2018-12-04 Massimo Manghi <mx...@apache.org>
* configure.ac: now inferring version number from VERSION
diff --git a/VERSION b/VERSION
index fd2a018..94ff29c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.1.0
+3.1.1
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 1c8cb93..054a4d6 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -3,11 +3,21 @@
# 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:
-set(RIVET_MAJOR_VERSION 3)
-set(RIVET_MINOR_VERSION 1)
-set(RIVET_PATCH_VERSION 0)
+# In order to avoid chasing around multiple definition of the module version we infer
+# this information from the file VERSION, which must stay in the project root directory
+# and assuming we are working from a direct child directory
+SET ( RIVET_TOP_DIR "${CMAKE_CURRENT_SOURCE_DIR}/.." )
+# Read the file named VERSION from the top Rivet directory...
+FILE ( READ "${RIVET_TOP_DIR}/VERSION" RIVET_VERSION_FROM_FILE )
+STRING ( REGEX MATCH "([0-9]+)\.([0-9]+)\.([0-9]+)" _ ${RIVET_VERSION_FROM_FILE} )
+SET ( RIVET_MAJOR_VERSION ${CMAKE_MATCH_1} )
+SET ( RIVET_MINOR_VERSION ${CMAKE_MATCH_2} )
+SET ( RIVET_PATCH_VERSION ${CMAKE_MATCH_3} )
+MESSAGE ( STATUS "Rivet version: ${RIVET_MAJOR_VERSION}.${RIVET_MINOR_VERSION}.${RIVET_PATCH_VERSION}" )
+
set(RIVET_VERSION
${RIVET_MAJOR_VERSION}.${RIVET_MINOR_VERSION}.${RIVET_PATCH_VERSION})
set(INIT_VERSION ${RIVET_MAJOR_VERSION}.${RIVET_MINOR_VERSION})
diff --git a/cmake/README.cmake b/cmake/README.cmake
index 087537e..bd1e3d3 100644
--- a/cmake/README.cmake
+++ b/cmake/README.cmake
@@ -28,13 +28,13 @@ Compiling Rivet with cmake:
in a known location (i.e. under Windows), you can speficy APACHE_ROOT:
cmake -E make_directory build
- cmake -E chdir build cmake -DAPACHE_ROOT=G:/Apache24 ..
+ cmake -E chdir build cmake -DAPACHE_ROOT=F:/Apache24 ..
cmake --build build --config Release --target install
5) Compile for 64 bits under Windows (for Visual Studio 2017):
cmake -E make_directory build_64
- cmake -E chdir build_64 cmake -DAPACHE_ROOT=G:/Apache24 -G "Visual Studio 15 2017 Win64" ..
+ cmake -E chdir build_64 cmake -DAPACHE_ROOT=F:/Apache24_64 -G "Visual Studio 15 2017 Win64" ..
cmake --build build_64 --config Release --target install
-G "..." can be set to any of the available 64-bit generators available under
@@ -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=G:/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/doc/rivet.xml b/doc/rivet.xml
index 7324d0a..e216aa4 100644
--- a/doc/rivet.xml
+++ b/doc/rivet.xml
@@ -36,7 +36,7 @@
<!ENTITY lazybridge.xml SYSTEM "xml/lazybridge.xml" >
<!ENTITY formbroker.xml SYSTEM "xml/formbroker.xml" >
<!ENTITY version "3.1" >
- <!ENTITY fullversion "3.1.0" >
+ <!ENTITY fullversion "3.1.1" >
<!ENTITY version2-series "2.0,2.1,2.2,2.3" >
<!ENTITY version2-generic "2.x" >
<!ENTITY version30 "3.0" >
diff --git a/src/mod_rivet_ng/mod_rivet.h b/src/mod_rivet_ng/mod_rivet.h
index 65225a0..8a46cf8 100644
--- a/src/mod_rivet_ng/mod_rivet.h
+++ b/src/mod_rivet_ng/mod_rivet.h
@@ -37,7 +37,12 @@
#include <rivet_config.h>
#endif
-APLOG_USE_MODULE(rivet);
+/*
+ * this macro replicates what AP_DECLARE_DATA does in mod_rivet.c but
+ * it isn't meant to stay in mod_rivet.h in the first place
+ *
+ * APLOG_USE_MODULE(rivet);
+ */
/* 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