summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author郑超 <[email protected]>2018-11-15 20:10:06 +0800
committer郑超 <[email protected]>2018-11-15 20:10:06 +0800
commit52ddd60f70a2f529d9767edd1dad99ef9370d657 (patch)
tree592f7d79681f9470d507d7e6f161aa8ed52c8a81
parentacdbc1c7c511e94815b4f4d8d9b944dbc3cd8cc4 (diff)
parente47783b497cc437cf0c13faab84aaafb5fd30855 (diff)
Merge branch 'feature-rule-extra-data-index' into 'master'v2.4
Feature rule extra data index See merge request MESA_framework/maat!12
-rw-r--r--readme.md4
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/entry/Maat_rule.cpp2
3 files changed, 7 insertions, 3 deletions
diff --git a/readme.md b/readme.md
index 47bb41f..0394427 100644
--- a/readme.md
+++ b/readme.md
@@ -16,6 +16,10 @@ Maat_command.h中描述了配置写入的API。
`Make debug`
+安装
+
+`Make install`
+
生成动态链接库 `./build/src/libmaatframe.so`
生成静态链接库 `./build/src/libmaatframe.a` \ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 373448c..0da4186 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.5)
project(maatframe)
set(MAAT_FRAME_MAJOR_VERSION 2)
-set(MAAT_FRAME_MINOR_VERSION 3)
-set(MAAT_FRAME_PATCH_VERSION 20181026)
+set(MAAT_FRAME_MINOR_VERSION 4)
+set(MAAT_FRAME_PATCH_VERSION 20181115)
set(MAAT_FRAME_VERSION ${MAAT_FRAME_MAJOR_VERSION}.${MAAT_FRAME_MINOR_VERSION}.${MAAT_FRAME_PATCH_VERSION})
message(STATUS "Maat Frame, Version: ${MAAT_FRAME_VERSION}")
diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp
index 9c575ac..e847a8a 100644
--- a/src/entry/Maat_rule.cpp
+++ b/src/entry/Maat_rule.cpp
@@ -32,7 +32,7 @@
#include "stream_fuzzy_hash.h"
#include "gram_index_engine.h"
-int MAAT_FRAME_VERSION_2_2_20181026=1;
+int MAAT_FRAME_VERSION_2_4_20181115=1;
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
"unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};