From ec839e6965064291f91ab3b884dc7fa1fab7b52c Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 14 12月 2019 22:12:21 +0800
Subject: [PATCH] add centos 8
---
test/library/CMakeLists.txt | 16 ++++++--
test/functional/CMakeLists.txt | 20 +++++++--
.travis.yml | 32 ++++++++--------
README.md | 12 +++--
4 files changed, 50 insertions(+), 30 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 4cbd109..e9ca5ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -90,22 +90,22 @@
script:
- docker run --name centos7_make -v `pwd`:/root/open-license-manager centos7_configured /bin/bash -c
"cd /root/open-license-manager/build && make && make install && VIRT_ENV=CONTAINER make test"
-# - os: linux
-# dist: bionic
-# name: "CentOS-8 Docker"
-# before_script:
-# - docker run --name centos8_toconfigure -v `pwd`:/root/open-license-manager centos:centos8 /bin/bash -c \
-# "yum -y update && yum -y groupinstall 'Development Tools' &&
-# yum -y install wget cmake boost boost-devel openssl-devel zlib-devel &&
-# dnf -y --enablerepo=PowerTools install boost-static &&
-# wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz &&
-# tar xzf OpenSSL_1_1_1d.tar.gz && cd openssl-OpenSSL_1_1_1d &&
-# ./config && make -j 8 && make install &&
-# cd /root/open-license-manager/build && cmake .."
-# - docker commit centos8_toconfigure centos8_configured
-# script:
-# - docker run --name centos8_make -v `pwd`:/root/open-license-manager centos8_configured /bin/bash -c \
-# "cd /root/open-license-manager/build && make && make install && VIRT_ENV=CONTAINER make test"
+ - os: linux
+ dist: bionic
+ name: "CentOS-8 Docker"
+ before_script:
+ - docker run --name centos8_toconfigure -v `pwd`:/root/open-license-manager centos:centos8 /bin/bash -c \
+ "yum -y update && yum -y groupinstall 'Development Tools' &&
+ yum -y install wget cmake boost boost-devel openssl-devel zlib-devel &&
+ dnf -y --enablerepo=PowerTools install boost-static &&
+ wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1d.tar.gz &&
+ tar xzf OpenSSL_1_1_1d.tar.gz && cd openssl-OpenSSL_1_1_1d &&
+ ./config && make -j 8 && make install &&
+ cd /root/open-license-manager/build && cmake .."
+ - docker commit centos8_toconfigure centos8_configured
+ script:
+ - docker run --name centos8_make -v `pwd`:/root/open-license-manager centos8_configured /bin/bash -c \
+ "cd /root/open-license-manager/build && make && make install && VIRT_ENV=CONTAINER make test"
- os: linux
dist: bionic
name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
diff --git a/README.md b/README.md
index 2d6475f..e0a832d 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
[](https://opensource.org/licenses/BSD-3-Clause)
[](https://travis-ci.org/open-license-manager/open-license-manager)
[](https://www.codacy.com/manual/gcontini/open-license-manager?utm_source=github.com&utm_medium=referral&utm_content=open-license-manager/open-license-manager&utm_campaign=Badge_Grade)
+[](https://codecov.io/gh/open-license-manager/open-license-manager)
[](http://github.com/open-license-manager/open-license-manager/issues)
It allows to protect the software you develop from unauthorized copies,
@@ -28,10 +29,10 @@
- a license debugger to be sent to the final customer when there are licensing problems.
- a [log descriptor](../../issues/8) in order to decrypt logs generated by the license system.
-# How to build
+## How to build
Below an overview of the basic build procedure, you can find detailed instructions for [linux](https://github.com/open-license-manager/open-license-manager/wiki/Build-the-library) or [windows](https://github.com/open-license-manager/open-license-manager/wiki/Build-the-library-windows) in the wiki.
-## Prerequisites
+### Prerequisites
- Operating system: Linux(Ubuntu, CentOS), Windows
- compilers : GCC (Linux) MINGW (Linux cross compile for Windows), MINGW or MSVC (Windows)
- tools : cmake(>3.6), git, make/ninja(linux)
@@ -47,7 +48,7 @@
cd build
```
-## build on Linux
+### build on Linux
```console
cmake .. -DCMAKE_INSTALL_PREFIX=../install
@@ -55,14 +56,14 @@
make install
```
-## build on Windows (with MSVC 2015)
+### build on Windows (with MSVC 2015)
```console
cmake .. -G "Visual Studio 14 2015 Win64" -DBOOST_ROOT="{Folder where boost is}" -DCMAKE_INSTALL_PREFIX=../install
cmake --build . --target install --config Release
```
-## cross compile with MINGW on Linux
+### cross compile with MINGW on Linux
```console
x86_64-w64-mingw32.static-cmake .. -DCMAKE_INSTALL_PREFIX=../install
@@ -89,5 +90,6 @@
The [examples](https://github.com/open-license-manager/examples) repository that shows various ways to integrate `open-licence-manager` into your project.
## How to contribute
+
The project is not dead but we take our time to answer. The best interaction you can have with us is through the issue system. Have a look to the [contribution guidelines](CONTRIBUTING.md)
We use [GitFlow](https://datasift.github.io/gitflow/IntroducingGitFlow.html) (or at least a subset of it). Remember to install the gitflow git plugin and use `develop` as default branch for your pull requests.
diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index cdcc680..60c676e 100644
--- a/test/functional/CMakeLists.txt
+++ b/test/functional/CMakeLists.txt
@@ -4,7 +4,9 @@
target_link_libraries(
license_generator_snippet
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
add_executable(
@@ -16,7 +18,9 @@
test_standard_license
licensecc_static
license_generator_snippet
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
add_executable(
@@ -28,7 +32,9 @@
test_date
licensecc_static
license_generator_snippet
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
add_executable(
@@ -40,7 +46,9 @@
test_signature_verifier
licensecc_static
license_generator_snippet
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
@@ -53,7 +61,9 @@
test_volid
licensecc_static
license_generator_snippet
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
diff --git a/test/library/CMakeLists.txt b/test/library/CMakeLists.txt
index e849663..c04985d 100644
--- a/test/library/CMakeLists.txt
+++ b/test/library/CMakeLists.txt
@@ -6,7 +6,9 @@
target_link_libraries(
test_license_reader
licensecc_static
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
ADD_TEST(NAME test_license_reader COMMAND test_license_reader)
@@ -22,7 +24,9 @@
target_link_libraries(
test_os_linux
licensecc_static
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
ADD_TEST(NAME test_os_linux COMMAND test_os_linux)
@@ -37,7 +41,9 @@
target_link_libraries(
test_license_locator
licensecc_static
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
ADD_TEST(NAME test_license_locator COMMAND test_license_locator)
@@ -51,7 +57,9 @@
target_link_libraries(
test_event_registry
base
- ${Boost_LIBRARIES}
+ Boost::unit_test_framework
+ Boost::filesystem
+ Boost::system
)
ADD_TEST(NAME test_event_registry COMMAND test_event_registry)
--
Gitblit v1.9.1