1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-26 12:27:52 +00:00
Go to file
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
3rdparty/toluapp Add toluapp subtree (#712) 2018-12-20 15:18:51 -05:00
bin Only run tidy on modified code, relocate scripts. (#490) 2018-05-12 22:46:47 -04:00
cmake Add toluapp subtree (#712) 2018-12-20 15:18:51 -05:00
data Update default config. 2018-12-09 17:35:45 -05:00
doc Add config option to disable blending (#682) 2018-12-02 11:29:33 -05:00
extras Add draw_blended to convert.lua script so that it is converted to boolean properly from old configuration formats. (#689) 2018-12-03 15:00:46 -05:00
logo Bump up png logo resolutions. (#634) 2018-08-20 07:51:40 -04:00
lua Add toluapp subtree (#712) 2018-12-20 15:18:51 -05:00
src Add toluapp subtree (#712) 2018-12-20 15:18:51 -05:00
.clang-format Apply a bunch of code fixes from sonarcloud. (#492) 2018-05-13 09:58:03 -04:00
.dockerignore Build improvements: clang-tidy, sonar, Dockerfile. (#488) 2018-05-12 19:26:31 -04:00
.editorconfig Apply a bunch of code fixes from sonarcloud. (#492) 2018-05-13 09:58:03 -04:00
.gitignore Fix for #691, nullptr deref & race condition. (#692) 2018-12-08 17:45:17 -05:00
.travis.yml Add toluapp subtree (#712) 2018-12-20 15:18:51 -05:00
AUTHORS Basic macOS support (#480) 2018-05-07 07:27:32 -04:00
CMakeLists.txt Add toluapp subtree (#712) 2018-12-20 15:18:51 -05:00
COPYING Update COPYING 2018-01-25 09:28:24 -05:00
Dockerfile Add toluapp subtree (#712) 2018-12-20 15:18:51 -05:00
LICENSE GPLv3 is the default license. 2018-01-25 09:26:33 -05:00
LICENSE.BSD Add formatting/static analysis (#486) 2018-05-12 12:03:00 -04:00
README.cmake Deprecate autotools, update docs to reflect cmake build system. 2010-01-01 14:08:57 -08:00
README.docker Using X11 conky in a container 2018-02-18 18:17:22 +01:00
README.md logo upload & readme update (#630) 2018-08-20 07:40:21 -04:00
sonar-project.properties Add toluapp subtree (#712) 2018-12-20 15:18:51 -05:00

Build Status Quality Gate

Conky is a free, light-weight system monitor for X, that displays any kind of information on your desktop.

Grab the latest release from GitHub.

Features

Conky can display more than 300 built-in objects, including support for:

  • A plethora of OS stats (uname, uptime, CPU usage, mem usage, disk usage, "top" like process stats, and network monitoring, just to name a few).
  • Built-in IMAP and POP3 support.
  • Built-in support for many popular music players (MPD, XMMS2, BMPx, Audacious).
  • Can be extended using built-in Lua support, or any of your own scripts and programs (more).
  • Built-in Imlib2 and Cairo bindings for arbitrary drawing with Lua (more).
  • Runs on Linux, FreeBSD, OpenBSD, DragonFlyBSD, NetBSD, Solaris, Haiku OS, and macOS!

... and much much more.

Conky can display information either as text, or using simple progress bars and graph widgets, with different fonts and colours.

Screenshots

screenshot screenshot screenshot

See the User Configs below for more screenshots and associated config files.

Documentation

The GitHub Wiki serves as a central hub for all of Conky's documentation.

License

Conky is licensed under the terms of the GPLv3 and BSD licenses.

Contributing

To report bugs or issues, open new issues. To submit code changes, open new pull requests.

Patches submitted in issues, email, or elsewhere will likely be ignored. When submitting PRs, please:

  • Describe the changes, why they were necessary, etc
  • Describe how the changes affect existing behaviour
  • Describe how you tested and validated your changes
  • Include any relevant screenshots/evidence demonstrating that the changes work and have been tested
  • Any new source files should include a GPLv3 license header
  • Any contributed code must be GPLv3 licensed