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/03 17:08:10 UTC
[tcl-rivet] branch master updated (fadf3fd -> aa1fec6)
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git.
from fadf3fd giving the bridge structure variables meaningful names in the context of bridge development
new 0978894 Now we infer the version number from VERSION
new aa1fec6 typecasts of pointer arithmetics into int as suggested by VS C compiler
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:
ChangeLog | 7 +++++++
cmake/CMakeLists.txt | 17 ++++++++++++++---
src/mod_rivet_ng/mod_rivet_common.c | 2 +-
src/parser/rivetParser.c | 8 ++++----
4 files changed, 26 insertions(+), 8 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org
[tcl-rivet] 01/02: Now we infer the version number from VERSION
Posted by mx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit 0978894b5804fbe16d6de2a26d51656e908013d2
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Mon Dec 3 15:49:12 2018 +0100
Now we infer the version number from VERSION
---
cmake/CMakeLists.txt | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 275ca94..101d367 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -5,9 +5,20 @@
cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
# Rivet version:
-set(RIVET_MAJOR_VERSION 3)
-set(RIVET_MINOR_VERSION 0)
-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
+
+execute_process(COMMAND pwd)
+execute_process(COMMAND cut -s --fields=1 --delimiter='.' '../../VERSION' OUTPUT_VARIABLE RIVET_MAJOR_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND cut -s --fields=2 --delimiter='.' '../../VERSION' OUTPUT_VARIABLE RIVET_MINOR_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND cut -s --fields=3 --delimiter='.' '../../VERSION' OUTPUT_VARIABLE RIVET_PATCH_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+#set(RIVET_MAJOR_VERSION 3)
+#set(RIVET_MINOR_VERSION 2)
+#set(RIVET_PATCH_VERSION 0)
+
set(RIVET_VERSION
${RIVET_MAJOR_VERSION}.${RIVET_MINOR_VERSION}.${RIVET_PATCH_VERSION})
set(INIT_VERSION ${RIVET_MAJOR_VERSION}.${RIVET_MINOR_VERSION})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org
[tcl-rivet] 02/02: typecasts of pointer arithmetics into int as
suggested by VS C compiler
Posted by mx...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
commit aa1fec6f32081e43331e4b807eada39d11a114df
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Mon Dec 3 18:08:02 2018 +0100
typecasts of pointer arithmetics into int as suggested by VS C compiler
---
ChangeLog | 7 +++++++
src/mod_rivet_ng/mod_rivet_common.c | 2 +-
src/parser/rivetParser.c | 8 ++++----
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a94ebdf..b6f026a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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
+
2018-11-23 Massimo Manghi <mx...@apache.org>
* VERSION,configure,ac: version number bumped to 3.2.0 as we created
3.1 out of branch 3.0 in order to highlight possible regressions that
diff --git a/src/mod_rivet_ng/mod_rivet_common.c b/src/mod_rivet_ng/mod_rivet_common.c
index d40864d..7c3b8a8 100644
--- a/src/mod_rivet_ng/mod_rivet_common.c
+++ b/src/mod_rivet_ng/mod_rivet_common.c
@@ -98,7 +98,7 @@ Rivet_ReadFile (apr_pool_t* pool,char* filename,
apr_file_close(apr_fp);
- *nbytes = buffer_size;
+ *nbytes = (int)buffer_size;
return 0;
}
diff --git a/src/parser/rivetParser.c b/src/parser/rivetParser.c
index b946008..fe978a3 100644
--- a/src/parser/rivetParser.c
+++ b/src/parser/rivetParser.c
@@ -239,8 +239,8 @@ Rivet_Parser(Tcl_Obj *outbuf, Tcl_Obj *inbuf)
const char *strstart = START_TAG;
const char *strend = END_TAG;
- int endseqlen = strlen(END_TAG);
- int startseqlen = strlen(START_TAG);
+ int endseqlen = (int) strlen(END_TAG);
+ int startseqlen = (int) strlen(START_TAG);
int inside = 0, p = 0, check_echo = 0;
int inLen = 0;
@@ -297,7 +297,7 @@ Rivet_Parser(Tcl_Obj *outbuf, Tcl_Obj *inbuf)
Tcl_AppendToObj(outbuf, "\\\\", 2);
break;
default:
- Tcl_AppendToObj(outbuf, cur, next - cur);
+ Tcl_AppendToObj(outbuf, cur, (int)(next - cur));
break;
}
continue;
@@ -328,7 +328,7 @@ Rivet_Parser(Tcl_Obj *outbuf, Tcl_Obj *inbuf)
Tcl_AppendToObj(outbuf, (char *)strend, p);
p = 0;
}
- Tcl_AppendToObj(outbuf, cur, next - cur);
+ Tcl_AppendToObj(outbuf, cur, (int)(next - cur));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org