luo980/uvw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

now working with libuv v1.18.0

Browse Source
This commit is contained in:
Michele Caini 2017-12-03 15:32:27 +01:00
parent 7f9fdf7f73
commit 46d9c66db1
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -16,7 +16,7 @@ endif()
# Project configuration
#
project(uvw VERSION 1.5.0)
project(uvw VERSION 1.6.0)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
@ -118,3 +118,17 @@ set(CPACK_SOURCE_GENERATOR TGZ)
set(CPACK_PACKAGING_INSTALL_DIRECTORY "uvw-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
include(CPack)
#
# AOB
#
add_custom_target(
uvw_aob
SOURCES
appveyor.yml
AUTHORS
LICENSE
README.md
.travis.yml
)

4
cmake/in/libuv.in
View File

@ -7,7 +7,7 @@ if(WIN32)
ExternalProject_Add(
libuv
GIT_REPOSITORY https://github.com/libuv/libuv.git
GIT_TAG v1.17.0
GIT_TAG v1.18.0
DOWNLOAD_DIR ${LIBUV_DEPS_DIR}
TMP_DIR ${LIBUV_DEPS_DIR}/tmp
STAMP_DIR ${LIBUV_DEPS_DIR}/stamp
@ -22,7 +22,7 @@ else()
ExternalProject_Add(
libuv
GIT_REPOSITORY https://github.com/libuv/libuv.git
GIT_TAG v1.17.0
GIT_TAG v1.18.0
DOWNLOAD_DIR ${LIBUV_DEPS_DIR}
TMP_DIR ${LIBUV_DEPS_DIR}/tmp
STAMP_DIR ${LIBUV_DEPS_DIR}/stamp

15
src/uvw/util.hpp
View File

@ -438,6 +438,19 @@ struct Utilities {
* @brief OS dedicated utilities.
*/
struct OS {
/**
* @brief Returns the current process id.
*
* See the official
* [documentation](http://docs.libuv.org/en/v1.x/misc.html#c.uv_os_getpid)
* for further details.
*
* @return The current process id.
*/
static PidType pid() noexcept {
return uv_os_getpid();
}
/**
* @brief Returns the parent process id.
*
@ -447,7 +460,7 @@ struct Utilities {
*
* @return The parent process id.
*/
static PidType pid() noexcept {
static PidType parent() noexcept {
return uv_os_getppid();
}

1
test/uvw/util.cpp
View File

@ -76,6 +76,7 @@ TEST(Util, Utilities) {
ASSERT_EQ(uvw::PidType{}, uvw::PidType{});
ASSERT_NE(uvw::Utilities::OS::pid(), uvw::PidType{});
ASSERT_NE(uvw::Utilities::OS::parent(), uvw::PidType{});
ASSERT_FALSE(uvw::Utilities::OS::homedir().empty());
ASSERT_FALSE(uvw::Utilities::OS::tmpdir().empty());
ASSERT_NE(uvw::Utilities::OS::hostname(), "");