From 73da47480493d626fd66ee457ed5958043ddc17b Mon Sep 17 00:00:00 2001 From: KangLin Date: Sun, 28 Mar 2021 20:19:15 -0700 Subject: [PATCH 01/11] CMake: add runtime install --- CMakeLists.txt | 13 +++++++++++++ src/apps/common/CMakeLists.txt | 2 ++ src/apps/natdiscovery/CMakeLists.txt | 1 + src/apps/oauth/CMakeLists.txt | 1 + src/apps/peer/CMakeLists.txt | 1 + src/apps/relay/CMakeLists.txt | 1 + src/apps/rfc5769/CMakeLists.txt | 1 + src/apps/stunclient/CMakeLists.txt | 1 + src/apps/uclient/CMakeLists.txt | 1 + src/client/CMakeLists.txt | 2 ++ src/server/CMakeLists.txt | 2 ++ 11 files changed, 26 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b32b69f..a5810d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.5) project(coturn) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) +# TODO: Modify this when the version is released SET(BUILD_VERSION "4.5.2") # Find Git Version Patch @@ -60,6 +61,18 @@ include(CheckIncludeFile) include(CheckIncludeFileCXX) include(CheckFunctionExists) +# Create install runtime target +add_custom_target(install-runtime + COMMAND + "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=Runtime + -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake" +) +# Create uninstall runtime target +add_custom_target(uninstall-runtime + COMMAND + "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=Runtime + -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" +) # Create will be delete files CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" diff --git a/src/apps/common/CMakeLists.txt b/src/apps/common/CMakeLists.txt index d66953c..520d09d 100644 --- a/src/apps/common/CMakeLists.txt +++ b/src/apps/common/CMakeLists.txt @@ -62,7 +62,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + COMPONENT Runtime ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} diff --git a/src/apps/natdiscovery/CMakeLists.txt b/src/apps/natdiscovery/CMakeLists.txt index 0935b63..c7df4d1 100644 --- a/src/apps/natdiscovery/CMakeLists.txt +++ b/src/apps/natdiscovery/CMakeLists.txt @@ -10,4 +10,5 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES}) target_link_libraries(${PROJECT_NAME} PRIVATE turnclient) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime ) diff --git a/src/apps/oauth/CMakeLists.txt b/src/apps/oauth/CMakeLists.txt index 3f14067..18ce938 100644 --- a/src/apps/oauth/CMakeLists.txt +++ b/src/apps/oauth/CMakeLists.txt @@ -10,4 +10,5 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES}) target_link_libraries(${PROJECT_NAME} PRIVATE turnclient) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime ) diff --git a/src/apps/peer/CMakeLists.txt b/src/apps/peer/CMakeLists.txt index f920e7b..3ff8057 100644 --- a/src/apps/peer/CMakeLists.txt +++ b/src/apps/peer/CMakeLists.txt @@ -10,4 +10,5 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES}) target_link_libraries(${PROJECT_NAME} PRIVATE turnclient) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime ) diff --git a/src/apps/relay/CMakeLists.txt b/src/apps/relay/CMakeLists.txt index 2f1a57d..6b801e7 100644 --- a/src/apps/relay/CMakeLists.txt +++ b/src/apps/relay/CMakeLists.txt @@ -96,4 +96,5 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ${turnserver_DEFINED}) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime ) diff --git a/src/apps/rfc5769/CMakeLists.txt b/src/apps/rfc5769/CMakeLists.txt index 9c42828..492e194 100644 --- a/src/apps/rfc5769/CMakeLists.txt +++ b/src/apps/rfc5769/CMakeLists.txt @@ -10,4 +10,5 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES}) target_link_libraries(${PROJECT_NAME} PRIVATE turnclient) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime ) diff --git a/src/apps/stunclient/CMakeLists.txt b/src/apps/stunclient/CMakeLists.txt index ddb41e6..3e64b3b 100644 --- a/src/apps/stunclient/CMakeLists.txt +++ b/src/apps/stunclient/CMakeLists.txt @@ -10,4 +10,5 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES}) target_link_libraries(${PROJECT_NAME} PRIVATE turnclient) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime ) diff --git a/src/apps/uclient/CMakeLists.txt b/src/apps/uclient/CMakeLists.txt index 47422c0..86e6eef 100644 --- a/src/apps/uclient/CMakeLists.txt +++ b/src/apps/uclient/CMakeLists.txt @@ -12,4 +12,5 @@ add_executable(${PROJECT_NAME} ${SOURCE_FILES}) target_link_libraries(${PROJECT_NAME} PRIVATE turnclient) INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime ) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 818f8db..3bcc644 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -33,7 +33,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + COMPONENT Runtime ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/turn/client INCLUDES DESTINATION diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt index fcc21ee..8c2261f 100644 --- a/src/server/CMakeLists.txt +++ b/src/server/CMakeLists.txt @@ -36,7 +36,9 @@ set_target_properties(${PROJECT_NAME} PROPERTIES INSTALL(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" + COMPONENT Runtime ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} From 2110991cd6edc6616a5bc681ba728767af292f06 Mon Sep 17 00:00:00 2001 From: KangLin Date: Sun, 28 Mar 2021 21:32:47 -0700 Subject: [PATCH 02/11] CMake: add turnadmin --- src/apps/relay/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/apps/relay/CMakeLists.txt b/src/apps/relay/CMakeLists.txt index 6b801e7..73fbe9b 100644 --- a/src/apps/relay/CMakeLists.txt +++ b/src/apps/relay/CMakeLists.txt @@ -94,7 +94,16 @@ target_link_libraries(${PROJECT_NAME} PRIVATE turn_server ${turnserver_LIBS}) target_include_directories(${PROJECT_NAME} PRIVATE ${turnserver_include_dirs}) target_compile_definitions(${PROJECT_NAME} PRIVATE ${turnserver_DEFINED}) +add_custom_target(turnadmin ALL + COMMAND + ${CMAKE_COMMAND} -E create_symlink $ turnadmin + DEPENDS ${PROJECT_NAME}) + INSTALL(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT Runtime ) + +INSTALL(FILES $/turnadmin + DESTINATION "${CMAKE_INSTALL_BINDIR}" + COMPONENT Runtime) From 86f1da7baba383d838d77e731d34cd25afcaf0ef Mon Sep 17 00:00:00 2001 From: KangLin Date: Mon, 29 Mar 2021 01:30:28 -0700 Subject: [PATCH 03/11] CMake: install documents, configure, script files --- CMakeLists.txt | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5810d4..11d40c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,3 +85,31 @@ ADD_CUSTOM_TARGET(uninstall add_subdirectory(src) +install(DIRECTORY man DESTINATION . + COMPONENT Runtime) +install(DIRECTORY turndb/ + DESTINATION share/turnserver + COMPONENT Runtime) +install(DIRECTORY turndb/ + DESTINATION doc/turnserver + COMPONENT Runtime) +install(FILES + LICENSE + README.turnserver + README.turnadmin + README.turnutils + INSTALL + postinstall.txt + DESTINATION doc/turnserver + COMPONENT Runtime) +install(FILES examples/etc/turnserver.conf + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} + COMPONENT Runtime + RENAME turnserver.conf.default + ) +install(DIRECTORY + examples/etc + examples/scripts + DESTINATION share/examples/turnserver + PATTERN "rfc5769.sh" EXCLUDE + ) From 33dd25e36c2c483eb1c5670a55bc659bbfeade51 Mon Sep 17 00:00:00 2001 From: KangLin Date: Mon, 29 Mar 2021 06:05:56 -0700 Subject: [PATCH 04/11] CMake: add cmake to ci --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 33f0cda..bb44e3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,15 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink protobuf; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mysql sqlite hiredis; fi +script: + - mkdir build + - cd build + - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/install -DCMAKE_VERBOSE_MAKEFILE=TURE + - cmake --build . + - cmake --build . --target install + - cd .. + - ./configure && make && make test + jobs: include: - name: ubuntu focal AMD64 C @@ -147,6 +156,7 @@ jobs: - libmysqlclient-dev - libhiredis-dev + notifications: slack: secure: N12+BCGiTDzfKkYnjF+666ZhREuBncfPpWge9AdG6DwusyGza+hNrjfRRHjF8WfGQj+X8ogFoF1lVFDC27lwH1ElOv4GJHShnGbtsWv10Va1GdDafDeC5JorUNWHlsDHC1AZkNUj9n2KAZTSbN076gUaNhwsXob/B1MEnNKXibitDdyE2FC6wCRu6ckXM4UiEXoG/a7lHS4m9dKt2xDUNK8vwhtRdCkip9YW8rUFdiwqMScdr9OdF8YWiKJIUYV7LC7eXF0YqslWTJkeIMEEnvotLs4JNytFz1wNPzTiY8hM4nPM0YwC1oPhFWlBodQ1x+dBX3vxitnque0gVhj/p6Eij0amM3tirgONw/r2V9JToE6vfh6ERAWIVzI/+tmqcEbZZvwcgafZphlT9W/8Gzy/av/zTpdfaTUEYnsuQRCA87FPIFAAVjzSmT3llY6WQXFB+UU0T0ZE42PkPqhR3zpjqt7nDXf2g1ZY5ZRkWRvznyqBdrVx0Ld8AKnv/Ynk/KqiJqV94DUMhGzAadqbYrDL/87eiDtW4lBpCl7cQnfEI7besdduNzWlgmJ93CU1kyruK37/w+D1jyBnc1ppQTj1+B2GanB0weY7ViNqyQmN+tam7EmM+9R8VKMi8EO0xlvb1YFL18NtrCMMMEsZRHj823g68lFntUWs5oGsFMI= From 9f6defdac472a6e9a0307a991f4f1c6d5ad08ab2 Mon Sep 17 00:00:00 2001 From: KangLin Date: Mon, 29 Mar 2021 06:31:50 -0700 Subject: [PATCH 05/11] CMake: add -Wno-deprecated-declarations --- .travis.yml | 2 +- src/apps/common/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bb44e3f..ab22cfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ before_install: script: - mkdir build - cd build - - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/install -DCMAKE_VERBOSE_MAKEFILE=TURE + - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/install - cmake --build . - cmake --build . --target install - cd .. diff --git a/src/apps/common/CMakeLists.txt b/src/apps/common/CMakeLists.txt index 520d09d..359dfd7 100644 --- a/src/apps/common/CMakeLists.txt +++ b/src/apps/common/CMakeLists.txt @@ -43,6 +43,7 @@ add_library(${PROJECT_NAME} ${SOURCE_FILES} ${HEADER_FILES}) target_link_libraries(${PROJECT_NAME} PUBLIC ${COMMON_LIBS}) target_compile_definitions(${PROJECT_NAME} PUBLIC ${COMMON_DEFINED}) +target_compile_options(${PROJECT_NAME} PUBLIC -Wno-deprecated-declarations) # See: http://www.it1352.com/478094.html target_include_directories(${PROJECT_NAME} PUBLIC From bd46483efa5cd1d6ba1c1b5bfdf622350f4ec217 Mon Sep 17 00:00:00 2001 From: KangLin Date: Mon, 5 Apr 2021 11:23:21 +0800 Subject: [PATCH 06/11] Modify INSTALL --- INSTALL | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/INSTALL b/INSTALL index 40ce960..2245e27 100644 --- a/INSTALL +++ b/INSTALL @@ -55,6 +55,8 @@ examples and documentation. III. BUILD +1) Use autoconfigure build + If you are sure that you system is ready for the build (see the section "Extra libraries and Utilities" below) then you can build the system. First, you have to run the configure script: @@ -152,6 +154,60 @@ NOTE: On most modern systems, the build will produce dynamically linked executables. If you want statically linked executables, you have to modify, accordingly, the Makefile.in template file. +2) Use cmake build + +If you are sure that you system is ready for the build (see the section +"Extra libraries and Utilities" below) and cmake tools then you can build +the system. +First, create build directory. you have to run the follow script: + + $ cd coturn + $ mkdir build + +Then you have to run the configure script: + + $ cmake .. + +It will create a Makefile customized for your system. + +By default, the generated Makefile will install everything to: + + - /usr on Solaris. + - /usr/pkg on NetBSD. + - /usr/local everywhere else. + +The binaries will be copied to the bin subdirectory of the installation +destination, config files copied to etc subdirectory. The default SQLite database +will be created in var/db/turndb. There will be +also documents, examples and some other files, in separate directories. + +You can change the root configured destination directory by +setting CMAKE_INSTALL_PREFIX variable in the +configure command line. For example: + + $ cmake .. -DCMAKE_INSTALL_PREFIX=/opt + +Build the project: + + $ cmake --build . + +Install all files(runtime programmes and develop library): + + $ cmake --build . --target install + +Remove all installed: + + $ cmake --build . --target uninstall + +If you want to only install runtime programmes(programmes, configure files, +script files and database): + + $ cmake --build . --target install-runtime + +Remove all installed: + + $ cmake --build . --target uninstall-runtime + IV. OPENSSL If you are using the OpenSSL that is coming with your system, and you are From da60faca1d97a887f23288aee08888059c6741f3 Mon Sep 17 00:00:00 2001 From: KangLin Date: Tue, 6 Apr 2021 14:27:01 +0800 Subject: [PATCH 07/11] Modify debug flag --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 11d40c5..76ff6eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,9 +36,10 @@ message("BUILD_VERSION:${BUILD_VERSION}") set(VERSION ${BUILD_VERSION}) if(NOT DEFINED CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release") + set(CMAKE_BUILD_TYPE "Release") endif(NOT DEFINED CMAKE_BUILD_TYPE) -if("Debug" STREQUAL CMAKE_BUILD_TYPE) +string(TOLOWER "${CMAKE_BUILD_TYPE}" build_type) +if("debug" STREQUAL build_type) add_definitions(-D_DEBUG) endif() From e1bb2e32f6e9dd3229538afa0ff15d4016c4b283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= Date: Wed, 7 Apr 2021 23:28:53 +0200 Subject: [PATCH 08/11] Remove g++ and add env OPENSSL_ROOT_DIR --- .travis.yml | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab22cfa..382eeaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ language: cpp before_install: - export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include" - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" + - export OPENSSL_ROOT_DIR="/usr/local/opt/openssl" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated openssl || brew upgrade openssl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink protobuf; fi @@ -39,27 +40,27 @@ jobs: - libpq-dev - libmysqlclient-dev - libhiredis-dev - - name: ubuntu Focal AMD64 C++ - os: linux - arch: amd64 - dist: focal - sudo: required - env: - - CC=g++ - addons: - apt: - packages: - - mysql-client - - debhelper - - dpkg-dev - - libssl-dev - - libevent-dev - - sqlite3 - - libsqlite3-dev - - postgresql-client - - libpq-dev - - libmysqlclient-dev - - libhiredis-dev + #- name: ubuntu Focal AMD64 C++ + # os: linux + # arch: amd64 + # dist: focal + # sudo: required + # env: + # - CC=g++ + # addons: + # apt: + # packages: + # - mysql-client + # - debhelper + # - dpkg-dev + # - libssl-dev + # - libevent-dev + # - sqlite3 + # - libsqlite3-dev + # - postgresql-client + # - libpq-dev + # - libmysqlclient-dev + # - libhiredis-dev - os: linux arch: amd64 dist: bionic From bc246843b38136d3f1c41431ec5903074670cb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= Date: Wed, 7 Apr 2021 23:52:02 +0200 Subject: [PATCH 09/11] Change OPENSSL_ROOT_DIR --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 382eeaa..5ce555b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: cpp before_install: - export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include" - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" - - export OPENSSL_ROOT_DIR="/usr/local/opt/openssl" + - export OPENSSL_ROOT_DIR="/usr/local/opt" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated openssl || brew upgrade openssl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink protobuf; fi From 54d8012f796b6711cea3e752359ec87c960fbe2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= Date: Thu, 8 Apr 2021 00:23:56 +0200 Subject: [PATCH 10/11] Add OPENSSL_INCLUDE_DIR env --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5ce555b..42bee11 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ before_install: - export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include" - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" - export OPENSSL_ROOT_DIR="/usr/local/opt" + - export OPENSSL_INCLUDE_DIR="/usr/local/opt/openssl/include" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated openssl || brew upgrade openssl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink protobuf; fi From 7756c5da8e0f858e66f836e589e18db9e26d9bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Mih=C3=A1ly?= Date: Thu, 8 Apr 2021 01:08:30 +0200 Subject: [PATCH 11/11] Revert cmake changes until we don't fix them --- .travis.yml | 62 ++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42bee11..9f7e1d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,21 +4,21 @@ language: cpp before_install: - export CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include" - export LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib" - - export OPENSSL_ROOT_DIR="/usr/local/opt" - - export OPENSSL_INCLUDE_DIR="/usr/local/opt/openssl/include" + # - export OPENSSL_ROOT_DIR="/usr/local/opt" + # - export OPENSSL_INCLUDE_DIR="/usr/local/opt/openssl/include" - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated openssl || brew upgrade openssl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink protobuf; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mysql sqlite hiredis; fi -script: - - mkdir build - - cd build - - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/install - - cmake --build . - - cmake --build . --target install - - cd .. - - ./configure && make && make test +#script: +# - mkdir build +# - cd build +# - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/install +# - cmake --build . +# - cmake --build . --target install +# - cd .. +# - ./configure && make && make test jobs: include: @@ -41,27 +41,27 @@ jobs: - libpq-dev - libmysqlclient-dev - libhiredis-dev - #- name: ubuntu Focal AMD64 C++ - # os: linux - # arch: amd64 - # dist: focal - # sudo: required - # env: - # - CC=g++ - # addons: - # apt: - # packages: - # - mysql-client - # - debhelper - # - dpkg-dev - # - libssl-dev - # - libevent-dev - # - sqlite3 - # - libsqlite3-dev - # - postgresql-client - # - libpq-dev - # - libmysqlclient-dev - # - libhiredis-dev + - name: ubuntu Focal AMD64 C++ + os: linux + arch: amd64 + dist: focal + sudo: required + env: + - CC=g++ + addons: + apt: + packages: + - mysql-client + - debhelper + - dpkg-dev + - libssl-dev + - libevent-dev + - sqlite3 + - libsqlite3-dev + - postgresql-client + - libpq-dev + - libmysqlclient-dev + - libhiredis-dev - os: linux arch: amd64 dist: bionic