diff --git a/get_version.sh b/get_version.sh index 15c1d2af..febb770e 100755 --- a/get_version.sh +++ b/get_version.sh @@ -3,7 +3,7 @@ GIT_VER=$(git log|grep ^commit|wc -l|sed -e "s/^ *//") MD5=$(git log|head -1|awk '{printf $2}') TMP_FILE=/tmp/version -echo "#define VERSION \"0.9.16.$GIT_VER\"" > ${TMP_FILE} +echo "#define VERSION \"0.9.17.$GIT_VER\"" > ${TMP_FILE} echo "#define VERSION_MD5 \"$MD5\"" >> ${TMP_FILE} if [ ! -f $1 ];then mv -f ${TMP_FILE} $1 diff --git a/orm_lib/src/mysql_impl/test/CMakeLists.txt b/orm_lib/src/mysql_impl/test/CMakeLists.txt index 39778ce4..226edc40 100644 --- a/orm_lib/src/mysql_impl/test/CMakeLists.txt +++ b/orm_lib/src/mysql_impl/test/CMakeLists.txt @@ -1,4 +1,4 @@ link_libraries(drogon trantor pthread dl) -add_executable(mytest1 test1.cc) +add_executable(mysql_test1 test1.cc) #add_executable(test2 test2.cc) \ No newline at end of file diff --git a/orm_lib/src/postgresql_impl/test/CMakeLists.txt b/orm_lib/src/postgresql_impl/test/CMakeLists.txt index 6c1d7242..aaabda73 100644 --- a/orm_lib/src/postgresql_impl/test/CMakeLists.txt +++ b/orm_lib/src/postgresql_impl/test/CMakeLists.txt @@ -1,4 +1,4 @@ link_libraries(drogon trantor pthread dl) -add_executable(test1 test1.cc) -add_executable(test2 test2.cc) \ No newline at end of file +add_executable(pg_test1 test1.cc) +add_executable(pg_test2 test2.cc) \ No newline at end of file diff --git a/trantor b/trantor index f18818de..4ba9e71d 160000 --- a/trantor +++ b/trantor @@ -1 +1 @@ -Subproject commit f18818dea97d2ee8e7f60a10d2f289b9cecbd6e6 +Subproject commit 4ba9e71d070b6c6498b4f0c9fd8e66bdde97ed97