From b8b8f8c6c35f6806f3dd735bc0c21be392ed9274 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 10 10月 2020 22:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/feature/vs2019_github_actions' into develop
---
scripts/windows_download_boost.bat | 2
.github/FUNDING.YML | 1
.travis.yml | 2
doc/development/Build-the-library-windows.rst | 38 ++++++++++++++++++-
.github/workflows/cpp.yml | 18 +++++++++
README.md | 8 ++--
6 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/.github/FUNDING.YML b/.github/FUNDING.YML
new file mode 100644
index 0000000..c498801
--- /dev/null
+++ b/.github/FUNDING.YML
@@ -0,0 +1 @@
+custom: ['https://www.paypal.me/1gabr1']
\ No newline at end of file
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
new file mode 100644
index 0000000..cf8dba2
--- /dev/null
+++ b/.github/workflows/cpp.yml
@@ -0,0 +1,18 @@
+name: CI
+
+on:
+ push:
+
+jobs:
+ build-windows:
+ runs-on: windows-2019
+
+ steps:
+ - uses: actions/checkout@v1
+ - name: Compile & Test
+ run: |
+ mkdir -p build
+ cd build
+ cmake -G "Visual Studio 16 2019" -DBUILD_TESTING:BOOL=OFF -DLCC_PROJECT_NAME:STRING=geode ..
+ cmake --build . --config Debug
+ shell: bash
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 8cb17ec..4353005 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -209,7 +209,7 @@
echo "Boost already installed"
else
echo "Boost not cached, compiling it"
- wget -q https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.7z
+ wget -q https://versaweb.dl.sourceforge.net/project/boost/boost/1.68.0/boost_1_68_0.7z
echo "Boost downloaded"
travis_wait 20 7z x boost_1_68_0.7z -oC:/local
cd "C:/local/boost_1_68_0"
diff --git a/README.md b/README.md
index c69e94f..416faff 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,9 @@
A comprehensive [list of features](http://open-license-manager.github.io/open-license-manager/analysis/features.html), and their status is available in the project site.
-If you plan to use this library or part of it remember to show us your appreciation giving it a
-<a class="github-button" href="https://github.com/open-license-manager/open-license-manager" data-icon="octicon-star" aria-label="Star open-license-manager/open-license-manager on GitHub">star</a> here on GitHub.
+If you're experiencing problems, or you just need informations you can't find in the [documentation](http://open-license-manager.github.io/open-license-manager) please contact us on the [user forum](https://groups.google.com/forum/#!forum/licensecc) (hosted on Google), we'll be happy to help.
+
+Remember to show your appreciation giving us a <a class="github-button" href="https://github.com/open-license-manager/open-license-manager" data-icon="octicon-star" aria-label="Star open-license-manager/open-license-manager on GitHub">star</a> here on GitHub.
## License
The project is donated to the community. It comes with a very large freedom of use for everyone, and it will always be.
@@ -92,8 +93,7 @@
## How to contribute
-The easiest way you can solve your problems or ask help is through the [forum](https://groups.google.com/forum/#!forum/licensecc) (hosted on Google),
-otherwise if you think there is a problem you can open an issue in the [issue system](https://github.com/open-license-manager/open-license-manager/issues).
+The easiest way you can solve your problems or ask help is through the [forum](https://groups.google.com/forum/#!forum/licensecc) (hosted on Google), otherwise if you think there is a problem you can open an issue in the [issue system](https://github.com/open-license-manager/open-license-manager/issues).
Have a look to the [contribution guidelines](CONTRIBUTING.md) before reporting.
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/doc/development/Build-the-library-windows.rst b/doc/development/Build-the-library-windows.rst
index 845c2f9..c689b09 100644
--- a/doc/development/Build-the-library-windows.rst
+++ b/doc/development/Build-the-library-windows.rst
@@ -100,8 +100,42 @@
MINGW
*****************
-
.. TODO::
- MINGW documentation need to be done. Refer to file .travis.yml to see a list of commands for windows-mingw
+ Describe how to install and configure mingw
+
+Prerequistites:
+
+* Powershell
+* 7zip
+* git
+* cmake
+
+Install and compile boost:
+
+.. code-block:: console
+
+ wget https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.7z
+ 7z x boost_1_68_0.7z -oC:/local
+ cd "C:\local\boost_1_68_0"
+ bootstrap.bat gcc
+ b2.exe -d0 --with-date_time --with-test --with-filesystem --with-program_options --with-regex --with-serialization --with-system runtime-link=static toolset=gcc --prefix=C:\local\boost_1_68_0\boost-mingw install
+ cd C:/local/boost_1_68_0/boost-mingw/lib
+ dir
+
+Verify boost is really compiled. Go to the folder where you want to download `licensecc`
+
+.. code-block:: console
+
+ git clone --recursive https://github.com/open-license-manager/open-license-manager.git
+ cd build && cmake -G "MinGW Makefiles" -DBOOST_ROOT="C:/local/boost_1_68_0/boost-mingw" -DBoost_ARCHITECTURE="-x64" -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID="x64" -DCMAKE_SH="CMAKE_SH-NOTFOUND" ..
+ cmake --build . --target install --config Release
+
+And then you can test it:
+
+.. code-block:: console
+
+ ctest -C Release
+
+
diff --git a/scripts/windows_download_boost.bat b/scripts/windows_download_boost.bat
index 0ce2b16..dd16be2 100644
--- a/scripts/windows_download_boost.bat
+++ b/scripts/windows_download_boost.bat
@@ -2,7 +2,7 @@
REM build and cache boost on Windows N.B. if no output for 10 minutes it's killed by travis.
if not exist "C:/local/boost/libs" (
echo "Boost not cached, compiling it"
- wget -q -O boost.exe https://dl.bintray.com/boostorg/release/1.71.0/binaries/boost_1_71_0-msvc-14.1-64.exe
+ wget -q -O boost.exe https://versaweb.dl.sourceforge.net/project/boost/boost-binaries/1.71.0/boost_1_71_0-msvc-14.1-64.exe
echo "Boost downloaded"
boost.exe /SILENT /DIR=C:\local\boost
echo "Boost installed"
--
Gitblit v1.9.1