Skip to content

Commit cb6439a

Browse files
authored
[skip ci] Update CI builds, and dependencies
Pandoc is required to build documentation. Qt 5.7 or later is required because of qAsConst and other new features.
1 parent 3fec5d6 commit cb6439a

File tree

1 file changed

+21
-14
lines changed

1 file changed

+21
-14
lines changed

README.md

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[![Build Status](https://travis-ci.org/variar/klogg.svg?branch=master)](https://travis-ci.org/variar/klogg)
22
[![Win32 Build Status](https://ci.appveyor.com/api/projects/status/github/variar/klogg?svg=true)](https://ci.appveyor.com/project/variar/klogg)
33

4-
CI builds 17.12.0.235 (x64):
5-
[windows portable](https://ci.appveyor.com/api/buildjobs/n9gh5neqy64sbg86/artifacts/klogg-17.12.0.235-portable.zip) |
6-
[windows installer](https://ci.appveyor.com/api/buildjobs/n9gh5neqy64sbg86/artifacts/klogg-17.12.0.235-setup.exe) |
7-
[deb](https://s3.amazonaws.com/klogg.travis.build/variar/klogg/235/235.1/build/packages/klogg-17.12.0-r235-Linux.deb) |
8-
[rpm](https://s3.amazonaws.com/klogg.travis.build/variar/klogg/235/235.1/build/packages/klogg-17.12.0-r235-Linux.rpm) |
9-
[appimage](https://s3.amazonaws.com/klogg.travis.build/variar/klogg/235/235.1/build/packages/klogg-17.12.0.235-x86_64.AppImage) |
10-
[dmg](https://s3.amazonaws.com/klogg.travis.build/variar/klogg/235/235.2/build/packages/klogg-17.12.0-r235-OSX.dmg)
4+
CI builds 17.12.0.245 (x64):
5+
[windows portable](https://ci.appveyor.com/api/buildjobs/2lfgxips0pa8dgfq/artifacts/klogg-17.12.0.245-portable.zip) |
6+
[windows installer](https://ci.appveyor.com/api/buildjobs/2lfgxips0pa8dgfq/artifacts/klogg-17.12.0.245-setup.exe) |
7+
[deb](https://s3.amazonaws.com/klogg.travis.build/variar/klogg/245/245.1/build/packages/klogg-17.12.0-r245-Linux.deb) |
8+
[rpm](https://s3.amazonaws.com/klogg.travis.build/variar/klogg/245/245.1/build/packages/klogg-17.12.0-r245-Linux.rpm) |
9+
[appimage](https://s3.amazonaws.com/klogg.travis.build/variar/klogg/245/245.1/build/packages/klogg-17.12.0.245-x86_64.AppImage) |
10+
[dmg](https://s3.amazonaws.com/klogg.travis.build/variar/klogg/245/245.2/build/packages/klogg-17.12.0-r245-OSX.dmg)
1111

1212
klogg is the fork of [glogg](https://github.com/nickbnf/glogg) - the fast, smart log explorer.
1313

@@ -49,9 +49,10 @@ Unlike upstream klogg is using cmake to generate build files.
4949

5050
* cmake 3.2 or later
5151
* C++ compiler with C++14 support (gcc 5, clang 3.4, msvc 2015)
52-
* Qt libraries (version 5.6.0 or later). QtCore, QtGui, QtWidgets and QtConcurrent are required on all platforms. QtNetwork is required on Windows and Mac OS. On Linux either QtNetwork or QtDBus can be used (selected during build configuration). QtTest is needed to build and run tests.
52+
* Qt libraries (version 5.7 or later). QtCore, QtGui, QtWidgets and QtConcurrent are required on all platforms. QtNetwork is required on Windows and Mac OS. On Linux either QtNetwork or QtDBus can be used (selected during build configuration). QtTest is needed to build and run tests.
53+
* pandoc to build documentation
5354

54-
cli11, Entropia File System Watcher, uchardet, Google Test and Google Mock sources are provided in 3rdparty directory.
55+
All other build dependencies are provided in 3rdparty directory.
5556

5657
### Building on Linux and Mac
5758
```
@@ -73,6 +74,8 @@ cpack -G RPM
7374

7475
Packages will be placed into `build/packages`.
7576

77+
See `.travis.yml` for more information on build process.
78+
7679
### Building on Windows
7780
Assuming `QT5` environment variable contains full path to Qt installation root folder and
7881
Visual Studio 2017 Community Edition is used for C++ compiler (vsdevcmd batch file location depends on Visual Studio version):
@@ -88,31 +91,35 @@ cmake --build . --config Release
8891

8992
Change cmake generator to "Visual Studio 14 2015" (or "Visual Studio 15 2017" with recent cmake) to get solution files and build from IDE.
9093

91-
Installer can be built with NSIS.
94+
Installer can be built with NSIS (requires documentation to be built).
9295
```
9396
cd <path_to_project_root>
9497
md release
95-
xcopy build\output\klogg.exe release
98+
xcopy build\output\klogg.exe release\ /y
99+
xcopy build\output\readme.html release\ /y
96100
xcopy %QT5%\bin\Qt5Core.dll release\ /y
97101
xcopy %QT5%\bin\Qt5Gui.dll release\ /y
98102
xcopy %QT5%\bin\Qt5Network.dll release\ /y
99103
xcopy %QT5%\bin\Qt5Widgets.dll release\ /y
100104
xcopy %QT5%\bin\Qt5Concurrent.dll release\ /y
101105
md release\platforms
102106
xcopy %QT5%\plugins\platforms\qwindows.dll release\platforms\ /y
103-
xcopy "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\msvcp140.dll" %APPVEYOR_BUILD_FOLDER%\release\ /y
104-
xcopy "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\vcruntime140.dll" %APPVEYOR_BUILD_FOLDER%\release\ /y
107+
xcopy "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\msvcp140.dll" release\ /y
108+
xcopy "%VCToolsRedistDir%x64\Microsoft.VC141.CRT\vcruntime140.dll" release\ /y
105109
106110
makensis -DVERSION=X.X.X klogg.nsi
107111
```
108112

113+
See `appveyor.yml` for more information on build process.
114+
109115
### Tests
110116
Test are built by default. To turn them off pass `-DBUILD_TESTS:BOOL=OFF` to cmake.
111117
Tests use google test and google mock (they are bundled with the project source) and require Qt5Test module.
112118

113119

114120
## Contact
121+
You can reach out to me on github.
115122

116123
Please visit glogg's website: http://glogg.bonnefon.org/
117124

118-
The development mailing list is hosted at http://groups.google.co.uk/group/glogg-devel
125+
The glogg development mailing list is hosted at http://groups.google.co.uk/group/glogg-devel

0 commit comments

Comments
 (0)