1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Commit Graph

27 Commits

Author SHA1 Message Date
Brenden Matthews
bc60fb2c2f
More build fixes. 2018-12-22 18:34:29 -05:00
Brenden Matthews
4b36d526a3
Get build working with -Wall.
Enable `MAINTAINER_MODE` on travis builds.
2018-12-20 20:48:13 -05:00
Brenden Matthews
bb8723dd36
Add toluapp subtree (#712)
* First commit!

* Import to git

* Droping down CMake requirement

* Corrected installation of libraries

* Adding travis build

* Updated cmake macros

* Fixed find package

* Updated travis hook

* Updated travis hook

* Patch to support Lua 5.3.

* Fix Lua header include directives in tolua++.h

Use angle bracket rather than double quotes when including Lua headers in the tolua++ header. This fixes a problem on systems that default to a Lua version newer than 5.1 and install the tolua++ header to the same directory as newer Lua headers.

As there are (usually) no Lua headers in the same directory when building tolua++ itself, the preprocessor will look to the include directories passed to the compiler, one of which would be the Lua 5.1 include directory, and tolua++ will build with those (correct) headers. Then the tolua++ header is usually installed in the default include directory, alongside the newer Lua headers, which you wouldn't expect to cause any trouble.

But it does cause trouble when trying to build other programs that include the tolua++ header, because now the preprocessor does find Lua headers in the same directory as the tolua++ header, which are the newer (incorrect) headers. Now the program will either fail to compile, because it doesn't support the newer headers, or fail to link with the tolua++ shared object because they were compiled against different Lua headers.

Using angle brackets instead of double quotes in the include directives will fix the problem, because then the preprocessor will look to the include directories passed to the compiler first.

See http://www.cegui.org.uk/forum/viewtopic.php?f=10&t=7195

* Remove email notifications.

* Update travis build.

* Build shared and static libs.

* Patch toluapp to support Lua 5.3.

With this change, support for Lua 5.1 is dropped.

This resolve #116.

* Add some comments to clarify the toluapp handling.

* Add minor sonar fix.
2018-12-20 15:18:51 -05:00
Brenden Matthews
fef29a5f8e
Fix yaml syntax. 2018-12-19 13:31:22 -05:00
Brenden Matthews
2c816b1392
Build fix for older GCC versions. (#710)
Add some older OS versions to the build matrix to make sure we don't
inadvertantly break the build.

This resolves issue #708.
2018-12-19 11:11:24 -05:00
Brenden Matthews
37c3c9f1e9
Enable ccache for travis builds. (#711) 2018-12-19 10:40:26 -05:00
Brenden Matthews
3d9c022245
Update Travis OS images. (#694) 2018-12-08 16:50:00 -05:00
npyl
79321355f5 travisCI for macOS (#524)
* add TravisCI for macOS

* Delete these spaces

* Attempt to fix trailing spaces
2018-06-19 08:07:44 -04:00
Brenden Matthews
a9196e3a0e
Skip sonar on external PRs. (#508) 2018-05-19 10:35:23 -04:00
Brenden Matthews
b9121daa89
Build improvements (external libs, enable more options). (#498)
- Enable build options by default if they don't require external libraries.
 - Add as many external libraries to Docker and Travis builds as possible.
2018-05-13 13:33:18 -04:00
Brenden Matthews
81fd3e2a67
Re-enable sonar cache. (#496) 2018-05-13 10:58:09 -04:00
Brenden Matthews
e2ff09993b
Travis sonar fix. (#495) 2018-05-13 10:36:20 -04:00
Brenden Matthews
5ac0cfd1f8
Sonar build fixes. (#494) 2018-05-13 10:20:27 -04:00
Brenden Matthews
e91b91d85a
Apply a bunch of code fixes from sonarcloud. (#492) 2018-05-13 09:58:03 -04:00
Brenden Matthews
95237ae4e0
Only run tidy on modified code, relocate scripts. (#490) 2018-05-12 22:46:47 -04:00
Brenden Matthews
4b92556fca
Build improvements: clang-tidy, sonar, Dockerfile. (#488) 2018-05-12 19:26:31 -04:00
Brenden Matthews
eebc8c653b
Add formatting/static analysis (#486)
* Reform source with clang-format.

Rules applied with:
    $ find . -iname *.h -o -iname *.cc | xargs clang-format \
        -style=file -i -fallback-style=google

* Add clang-format and analyze to build.

Based on the excellent work at: https://github.com/ttroy50/cmake-examples

* Clean up CMake stuff on macOS.

* Remove vim/emacs modelines.

* Update copyright dates.

* Build fixes.

* Build fixes.

* Build fixes.

* Build fixes.

* Build fixes.

* Build fixes.
2018-05-12 12:03:00 -04:00
Brenden Matthews
29f1c05fbe
Update .travis.yml 2018-01-23 12:41:03 -05:00
Erinor2
a34663f844 Transparency: Double-buffer not taken into consideration when selecting X11 when using ccmake (#383)
* Solved an issue when having own_visual_argb_visual combined with double_buffer
which break with an error. And when disabling this combination Conky is not
anymore transparent.

* Added imlib2 for travis

* Added libimlib2-dev for travis
2018-01-19 09:08:14 -05:00
Brenden Matthews
262a2925bc
Add missing build dep. 2017-12-07 15:03:00 -05:00
Vincent Cheng
6c4c28672f update travis config to run additional build without X11 (#321) 2016-09-12 09:43:39 -07:00
Brenden Matthews
b82eaa2333 Disable sudo on Travis builds. 2015-11-30 13:24:59 -08:00
Brenden Matthews
e001eb6244 Fix whitespace. 2013-09-15 09:45:56 -07:00
Brenden Matthews
a43822fde7 Update travis build file. 2012-12-26 12:45:43 -08:00
Brenden Matthews
080190eae3 Update travis build file. 2012-12-26 12:42:22 -08:00
Brenden Matthews
3f9036021d Update travis build file. 2012-12-26 12:39:28 -08:00
Georgi Valkov
24948ee17e add readme.md and travis.yml 2012-12-26 16:55:26 +02:00