Skip to content
Permalink
Browse files

Merge from origin master to forked master

  • Loading branch information...
alexsaber committed Jun 10, 2019
2 parents 1e9a797 + 3624c12 commit d24334213b077edd8c13e28b183ada2244f5ee4e
Showing with 7,023 additions and 4,017 deletions.
  1. +12 −8 .github/PULL_REQUEST_TEMPLATE.md
  2. +0 −13 .travis.yml
  3. +1 −1 CMakeLists.txt
  4. +1 −1 README.md
  5. +8 −0 doc/AUTHORS.md
  6. +277 −9 doc/CODING.md
  7. +2 −2 doc/DESIGN.md
  8. +188 −32 doc/METADATA.ini
  9. +3 −2 doc/SECURITY.md
  10. +9 −7 doc/decisions/error_codes.md
  11. +4 −4 doc/decisions/error_message_format.md
  12. +1 −0 doc/dev/README.md
  13. +164 −0 doc/dev/error-categorization.md
  14. +3 −1 doc/help/kdb.md
  15. +645 −0 doc/images/flamegraph.svg
  16. +6 −2 doc/man/man1/kdb.1
  17. +4 −1 doc/man/man7/elektra-plugins.7
  18. +2 −0 doc/markdownlinkconverter/elektraSpecialCharacters.sty
  19. +1 −1 doc/news/2015-11-19_0.8.14.md
  20. +70 −10 doc/news/_preparation_next_release.md
  21. +2 −2 doc/tutorials/benchmarking.md
  22. +11 −1 doc/tutorials/plugins.md
  23. +135 −7 doc/tutorials/profiling.md
  24. +2 −2 doc/tutorials/validation.md
  25. +1 −1 examples/codegen/econf/src/application.c
  26. +5 −2 examples/codegen/tree/spec.ini
  27. +2 −5 examples/spec/spec.ini
  28. +75 −42 scripts/benchmark-yaml.in
  29. +1 −1 scripts/docker/README.md
  30. +1 −0 scripts/docker/debian/sid/Dockerfile
  31. +86 −0 scripts/docker/ubuntu/disco/Dockerfile
  32. +23 −2 scripts/generate-yaml
  33. +58 −30 scripts/jenkins/Jenkinsfile
  34. +0 −2 scripts/link-checker
  35. +5 −1 scripts/reformat-all
  36. +1 −1 scripts/sed
  37. +1 −1 src/bindings/cpp/README.md
  38. +1 −1 src/bindings/cpp/examples/cpp_example_io.cpp
  39. +30 −18 src/bindings/cpp/examples/cpp_example_userio.cpp
  40. +7 −2 src/bindings/cpp/include/kdbexcept.hpp
  41. +29 −17 src/bindings/cpp/include/kdbio.hpp
  42. +0 −1 src/include/elektra.h
  43. +2 −0 src/include/kdbnotification.h
  44. +1 −1 src/include/kdbprivate.h
  45. +2 −0 src/include/kdbtypes.h
  46. +15 −0 src/libs/elektra/internal.c
  47. +10 −12 src/libs/elektra/key.c
  48. +1 −1 src/libs/elektra/keymeta.c
  49. +94 −47 src/libs/elektra/keyset.c
  50. +75 −112 src/libs/elektra/keytest.c
  51. +5 −5 src/libs/elektra/mount.c
  52. +46 −30 src/libs/highlevel/elektra.c
  53. +1 −1 src/libs/opts/opts.c
  54. +4 −4 src/libs/tools/include/toolexcept.hpp
  55. +1 −1 src/libs/tools/src/specreader.cpp
  56. +1 −0 src/plugins/README.md
  57. +5 −10 src/plugins/augeas/README.md
  58. +2 −7 src/plugins/conditionals/README.md
  59. +1 −1 src/plugins/cpptype/README.md
  60. +2 −7 src/plugins/crypto/README.md
  61. +8 −2 src/plugins/crypto/openssl_operations.c
  62. +13 −2 src/plugins/gopts/CMakeLists.txt
  63. +1 −1 src/plugins/gopts/README.md
  64. +1 −3 src/plugins/gopts/gopts_osx.h
  65. +5 −3 src/plugins/gopts/gopts_sysctl.h
  66. +10 −20 src/plugins/gopts/sysctl_test.c
  67. +6 −2 src/plugins/gopts/testapp.c
  68. +5 −0 src/plugins/ini/ini.c
  69. +7 −0 src/plugins/macaddr/CMakeLists.txt
  70. +91 −0 src/plugins/macaddr/README.md
  71. +211 −0 src/plugins/macaddr/macaddr.c
  72. +20 −0 src/plugins/macaddr/macaddr.h
  73. +175 −0 src/plugins/macaddr/testmod_macaddr.c
  74. +2 −8 src/plugins/mathcheck/README.md
  75. +3 −3 src/plugins/mini/README.md
  76. +9 −3 src/plugins/multifile/multifile.c
  77. +1 −1 src/plugins/network/README.md
  78. +1 −1 src/plugins/reference/README.md
  79. +3 −1 src/plugins/spec/CMakeLists.txt
  80. +104 −38 src/plugins/spec/README.md
  81. +719 −730 src/plugins/spec/spec.c
  82. +0 −1 src/plugins/spec/spec.h
  83. +482 −0 src/plugins/spec/testmod_spec.c
  84. +1 −1 src/plugins/yambi/README.md
  85. +9 −0 src/plugins/yambi/driver.cpp
  86. +5 −0 src/plugins/yambi/driver.hpp
  87. +9 −5 src/plugins/yambi/parser.ypp
  88. +4 −4 src/plugins/yambi/testmod_yambi.cpp
  89. +3 −1 src/plugins/yambi/yambi/null.hpp
  90. +1 −1 src/plugins/yanlr/README.md
  91. +2 −1 src/plugins/yanlr/YAML.g4
  92. +3 −1 src/plugins/yanlr/error_listener.cpp
  93. +19 −5 src/plugins/yanlr/listener.cpp
  94. +7 −0 src/plugins/yanlr/listener.hpp
  95. +4 −4 src/plugins/yanlr/testmod_yanlr.cpp
  96. +2 −1 src/plugins/yanlr/yanlr/null.hpp
  97. +3 −4 src/plugins/yawn/CMakeLists.txt
  98. +1 −1 src/plugins/yawn/README.md
  99. +9 −0 src/plugins/yawn/listener.cpp
  100. +6 −0 src/plugins/yawn/listener.hpp
  101. +4 −4 src/plugins/yawn/testmod_yawn.cpp
  102. +4 −0 src/plugins/yawn/walk.cpp
  103. +7 −1 src/plugins/yawn/yaml.bnf
  104. +2 −1 src/plugins/yawn/yawn/null.hpp
  105. +1 −1 src/plugins/yaypeg/README.md
  106. +9 −0 src/plugins/yaypeg/listener.cpp
  107. +5 −0 src/plugins/yaypeg/listener.hpp
  108. +4 −4 src/plugins/yaypeg/testmod_yaypeg.cpp
  109. +8 −1 src/plugins/yaypeg/walk.cpp
  110. +3 −1 src/plugins/yaypeg/yaypeg/null.hpp
  111. +8 −0 src/tools/README.md
  112. +4 −2 src/tools/kdb/CMakeLists.txt
  113. +2 −2 src/tools/kdb/check.cpp
  114. +38 −31 src/tools/kdb/coloredkdbio.hpp
  115. +2 −2 src/tools/kdb/complete.cpp
  116. +2 −2 src/tools/kdb/convert.cpp
  117. +7 −7 src/tools/kdb/editor.cpp
  118. +3 −3 src/tools/kdb/export.cpp
  119. +2 −2 src/tools/kdb/find.cpp
  120. +2 −2 src/tools/kdb/fstab.cpp
  121. +4 −4 src/tools/kdb/gen.cpp
  122. +112 −0 src/tools/kdb/gen/elektra/common.cpp
  123. +37 −0 src/tools/kdb/gen/elektra/common.hpp
  124. +439 −0 src/tools/kdb/gen/elektra/elektragen.cpp
  125. +3 −3 src/tools/kdb/gen/{ → elektra}/elektragen.hpp
  126. +243 −0 src/tools/kdb/gen/elektra/enums.cpp
  127. +67 −0 src/tools/kdb/gen/elektra/enums.hpp
  128. +591 −0 src/tools/kdb/gen/elektra/structs.cpp
  129. +128 −0 src/tools/kdb/gen/elektra/structs.hpp
  130. +0 −1,140 src/tools/kdb/gen/elektragen.cpp
  131. +1 −1 src/tools/kdb/gen/template.cpp
  132. +26 −11 src/tools/kdb/gen/templates/elektra.c.mustache
  133. +27 −30 src/tools/kdb/gen/templates/elektra.h.mustache
  134. +12 −0 src/tools/kdb/gen/templates/elektra/LICENSE.txt
  135. +0 −10 src/tools/kdb/gen/templates/elektra/context.fun.h.mustache
  136. +0 −13 src/tools/kdb/gen/templates/elektra/context.tags.h.mustache
  137. +14 −0 src/tools/kdb/gen/templates/elektra/enum.c.mustache
  138. +4 −2 src/tools/kdb/gen/templates/elektra/enum.decl.h.mustache
  139. +22 −34 src/tools/kdb/gen/templates/elektra/keys.fun.h.mustache
  140. +18 −30 src/tools/kdb/gen/templates/elektra/keys.fun.struct.h.mustache
  141. +18 −30 src/tools/kdb/gen/templates/elektra/keys.fun.structref.h.mustache
  142. +46 −1 src/tools/kdb/gen/templates/elektra/struct.alloc.fields.c.mustache
  143. +53 −5 src/tools/kdb/gen/templates/elektra/struct.c.mustache
  144. +9 −2 src/tools/kdb/gen/templates/elektra/struct.decl.h.mustache
  145. +88 −0 src/tools/kdb/gen/templates/elektra/union.c.mustache
  146. +36 −0 src/tools/kdb/gen/templates/elektra/union.decl.h.mustache
  147. +2 −2 src/tools/kdb/get.cpp
  148. +1 −1 src/tools/kdb/globalumount.cpp
  149. +8 −8 src/tools/kdb/import.cpp
  150. +2 −2 src/tools/kdb/ls.cpp
  151. +3 −6 src/tools/kdb/main.cpp
  152. +1 −1 src/tools/kdb/metaget.cpp
  153. +1 −1 src/tools/kdb/metals.cpp
  154. +1 −1 src/tools/kdb/metaremove.cpp
  155. +2 −2 src/tools/kdb/metaset.cpp
  156. +2 −2 src/tools/kdb/mountbase.cpp
  157. +1 −1 src/tools/kdb/mv.cpp
  158. +2 −2 src/tools/kdb/set.cpp
  159. +1 −1 src/tools/kdb/set.hpp
  160. +2 −2 src/tools/kdb/test.cpp
  161. +1 −1 src/tools/kdb/umount.cpp
  162. +39 −6 src/tools/qt-gui/src/treeviewmodel.cpp
  163. +7 −0 src/tools/qt-gui/src/treeviewmodel.hpp
  164. +3 −0 src/tools/rest-backend/README.md
  165. +15 −45 src/tools/web/kdb.js
  166. +24 −0 tests/abi/testabi_key.c
  167. +32 −0 tests/abi/testabi_ks.c
  168. +6 −6 tests/kdb/testkdb_conflict.cpp
  169. +1 −0 tests/kdb/testkdb_ensure.cpp
  170. +8 −8 tests/kdb/testkdb_simple.cpp
  171. +4 −4 tests/shell/check_error.sh
  172. +3 −3 tests/shell/check_gen.sh
  173. +0 −118 tests/shell/gen/elektra/context.check.sh
  174. +0 −16 tests/shell/gen/elektra/context.data.ini.disabled
  175. +0 −205 tests/shell/gen/elektra/context.expected.c
  176. +0 −432 tests/shell/gen/elektra/context.expected.h
  177. 0 tests/shell/gen/elektra/context.params
  178. +10 −4 tests/shell/gen/elektra/empty.check.sh
  179. +1 −1 tests/shell/gen/elektra/empty.data.ini
  180. +34 −15 tests/shell/gen/elektra/empty.expected.c
  181. +40 −35 tests/shell/gen/elektra/empty.expected.h
  182. +10 −4 tests/shell/gen/elektra/enum.check.sh
  183. +1 −1 tests/shell/gen/elektra/enum.data.ini
  184. +114 −53 tests/shell/gen/elektra/enum.expected.c
  185. +56 −46 tests/shell/gen/elektra/enum.expected.h
  186. +1 −1 tests/shell/gen/elektra/nodefault.data.ini
  187. +1 −1 tests/shell/gen/elektra/notype.data.ini
  188. +36 −16 tests/shell/gen/elektra/notype.expected.c
  189. +40 −35 tests/shell/gen/elektra/notype.expected.h
  190. +13 −5 tests/shell/gen/elektra/simple.check.sh
  191. +2 −2 tests/shell/gen/elektra/simple.data.ini
  192. +40 −21 tests/shell/gen/elektra/simple.expected.c
  193. +46 −45 tests/shell/gen/elektra/simple.expected.h
  194. +11 −5 tests/shell/gen/elektra/struct.check.sh
  195. +9 −3 tests/shell/gen/elektra/struct.data.ini
  196. +105 −69 tests/shell/gen/elektra/struct.expected.c
  197. +55 −76 tests/shell/gen/elektra/struct.expected.h
  198. +1 −1 tests/shell/shell_recorder/shell_recorder.sh
@@ -20,17 +20,21 @@ need to be checked.
- [ ] I added unit tests
- [ ] I ran all tests locally and everything went fine
- [ ] affected documentation is fixed
- [ ] I added code comments, logging, and assertions (see doc/CODING.md)
- [ ] meta data is updated (e.g. README.md of plugins and doc/METADATA.md)
- [ ] I added code comments, logging, and assertions (see [Coding Guidelines](/doc/CODING.md))
- [ ] meta data is updated (e.g. README.md of plugins and [METADATA.ini](/doc/METADATA.md))

## Review

Remove the line below and add the "work in progress" label if you do
not want the PR to be reviewed:
Reviewers will usually check the following:

@markus2330 please review my pull request
- [ ] Code is conforming to [our Coding Guidelines](/doc/CODING.md)
- [ ] APIs are conforming to [our Design Guidelines](/doc/DESGIN.md)
- [ ] Code is consistent to [our Design Decisions](/doc/decisions)
- [ ] Documentation is concise and good to read
- [ ] Examples are well chosen and understandable

## Merging
## Labels

Please add the "ready to merge" label when the build server and you say
that everything is ready to be merged.
- Add the "work in progress" label if you do not want the PR to be reviewed yet.
- Add the "ready to merge" label **if the build server is happy** and also you
say that everything is ready to be merged.
@@ -189,19 +189,6 @@ matrix:
# Unfortunately the tests for the Xerces plugin fail: https://travis-ci.org/ElektraInitiative/libelektra/jobs/483331657#L3740
- PLUGINS='ALL;-xerces'

# HASKELL: Only build Haskell binding and plugin

- os: osx
name: 🍏 Haskell
osx_image: xcode10.1 # We use macOS 10.13 here, since the Haskell plugin does not seem to compile on macOS 10.14
compiler: clang
env:
- HASKELL=ON
# Use a minimal configuration for the haskell bindings to give it enough time to compile dependencies
- PLUGINS='resolver_fm_hpu_b;dump;dini;list;spec;haskell;typechecker;ini;sync;error;base64;regexdispatcher;ni;c'
- BINDINGS=haskell
- TOOLS=kdb

- os: linux
name: 🐧 GCC
compiler: gcc
@@ -113,9 +113,9 @@ if (BUILD_FULL OR BUILD_STATIC OR BUILD_SHARED)

add_subdirectory (src)
add_subdirectory (examples)
add_subdirectory (benchmarks)

if (BUILD_TESTING)
add_subdirectory (benchmarks)
add_subdirectory (tests)
endif (BUILD_TESTING)
endif ()
@@ -108,7 +108,7 @@ In the GitHub repository the full documentation is available, including:
You can read the documentation for the kdb tool, either

- [on the Website](https://www.libelektra.org)
- [in the API docu](https://doc.libelektra.org/api/latest/html/md_doc_help_kdb.html)
- [in the API docu](https://doc.libelektra.org/api/latest/html/doc_help_kdb_md.html)
- by using `man kdb`
- by using `kdb --help` or `kdb help <command>`
- [on GitHub](https://master.libelektra.org/doc/help/kdb.md)
@@ -195,3 +195,11 @@ development of the mmapstorage plugin
- email: mpranj@limun.org
- github user: [mpranj](https://github.com/mpranj)
- devel/test on: Fedora, Debian, macOS

## Klemens Böswirth

development of the highlevel API and code-generation; various other things

- email: k.boeswirth+git@gmail.com
- github user: [kodebach](https://github.com/kodebach)
- devel/test on: Fedora

0 comments on commit d243342

Please sign in to comment.
You can’t perform that action at this time.