build: renamed libkresolve => libkres, kresolved => kresd

also some cleanup and version bump to Q2

diff --git a/.gitignore b/.gitignore
index 4d2c98a6be4ad7b910ff983f4396e6c2b14bf740..86c79a0c55f792be7cd87ec7aaa532175c9604d2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,7 @@ tmp*
 /ylwrap
 /doc/doxyxml
 /doc/html
-/daemon/kresolved
+/daemon/kresd
 /tests/test_array
 /tests/test_map
 /tests/test_module

diff --git a/README.md b/README.md
index fd82cb065cc5e2072e24c53864c495aac4af5819..bd55f9d2087539d8828e5829e43b68a4830be58c 100644 (file)
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ See the [Building project][depends] documentation page for more information.
 The project builds a resolver library in the `lib` directory, and a daemon in the `daemon` directory.
 
 ```
-$ ./daemon/kresolved -h
-$ ./daemon/kresolved [working_directory]
+$ ./daemon/kresd -h
+$ ./daemon/kresd [working_directory]
 ```
 
 See the documentation at [knot-resolver.readthedocs.org][doc].

diff --git a/config.mk b/config.mk
index 763ce785e2eae260d3c10e4ec42238cc790d37c2..0a843b5ae1b473763d92b0043894c12a08f4ebde 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -1,6 +1,6 @@
 # Project
 MAJOR := 15
-MINOR := 04
+MINOR := 07
 PATCH := 0
 
 # Paths

diff --git a/daemon/README.rst b/daemon/README.rst
index dea7758854ffd7d5fb3a38878f3aa88516373458..2dc6f1f632303f5136bf74cc2d3bce2f36d13d87 100644 (file)
--- a/daemon/README.rst
+++ b/daemon/README.rst
@@ -16,7 +16,7 @@ the `daemon` directory.
 
 .. code-block:: bash
 
-       $ ./daemon/kresolved -h
+       $ ./daemon/kresd -h
 
 Interacting with the daemon
 ---------------------------
@@ -26,7 +26,7 @@ You can load modules this way and use their properties to get information about
 
 .. code-block:: bash
 
-       $ kresolved /var/run/knot-resolver
+       $ kresd /var/run/knot-resolver
        [system] started in interactive mode, type 'help()'
        > cache.count()
        53
@@ -47,7 +47,7 @@ comfortable in the current working directory.
 
 .. code-block:: sh
 
-       $ kresolved /var/run/kresolved
+       $ kresd /var/run/kresd
 
 And you're good to go for most use cases! If you want to use modules or configure daemon behavior, read on.
 

diff --git a/daemon/daemon.mk b/daemon/daemon.mk
index 5850de51b922016bf28295d5a27167a06273b057..829fa69bef31e6efeabc80c47502291dd95c9480 100644 (file)
--- a/daemon/daemon.mk
+++ b/daemon/daemon.mk
@@ -1,7 +1,7 @@
-kresolved_EMBED := \
+kresd_EMBED := \
        contrib/ccan/json/json.c
-kresolved_SOURCES := \
-       $(kresolved_EMBED)   \
+kresd_SOURCES := \
+       $(kresd_EMBED)   \
        daemon/io.c          \
        daemon/network.c     \
        daemon/engine.c      \
@@ -16,18 +16,18 @@ daemon/engine.o: daemon/lua/sandbox.inc daemon/lua/config.inc
        @$(call quiet,XXD,$<) $< > $@
 
 # Dependencies
-kresolved_DEPEND := $(libkresolve)
-kresolved_LIBS := $(libkresolve_TARGET) $(libknot_LIBS) $(libuv_LIBS) $(lua_LIBS)
+kresd_DEPEND := $(libkres)
+kresd_LIBS := $(libkres_TARGET) $(libknot_LIBS) $(libuv_LIBS) $(lua_LIBS)
 
 # Make binary
 ifeq ($(HAS_lua)|$(HAS_libuv), yes|yes)
-$(eval $(call make_bin,kresolved,daemon))
+$(eval $(call make_bin,kresd,daemon))
 endif
 
 # Targets
-daemon: $(kresolved)
-daemon-install: kresolved-install
-daemon-clean: kresolved-clean
+daemon: $(kresd)
+daemon-install: kresd-install
+daemon-clean: kresd-clean
        @$(RM) daemon/lua/*.inc
 
 .PHONY: daemon daemon-install daemon-clean

diff --git a/doc/conf.py b/doc/conf.py
index 25ca5624cbcb7480a83f15b3913e001f6bcf33c2..4aef16b5a94db17c763b494d15501ad9f829b12b 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,8 +11,8 @@ if os.environ.get('READTHEDOCS', None) == 'True':
 extensions = ['sphinx.ext.todo', 'sphinx.ext.viewcode', 'breathe']
 
 # Breathe configuration
-breathe_projects = { "libkresolve": "doxyxml" }
-breathe_default_project = "libkresolve"
+breathe_projects = { "libkres": "doxyxml" }
+breathe_default_project = "libkres"
 breathe_domain_by_extension = {"h" : "c"}
 
 # The suffix of source filenames.
@@ -66,7 +66,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'libkresolve', u'libkresolve documentation',
+    ('index', 'libkres', u'libkres documentation',
      [u'CZ.NIC Labs'], 1)
 ]
 

diff --git a/doc/lib.rst b/doc/lib.rst
index 5aec08f256609657313a6619d68e7e6fa1fe09fd..cbe7f8e1de07f1870a7058b60fd7dbad539e0760 100644 (file)
--- a/doc/lib.rst
+++ b/doc/lib.rst
@@ -15,9 +15,9 @@ Name resolution
 ---------------
 
 .. doxygenfile:: resolve.h
-   :project: libkresolve
+   :project: libkres
 .. doxygenfile:: rplan.h
-   :project: libkresolve
+   :project: libkres
 
 .. _lib_api_cache:
 
@@ -25,7 +25,7 @@ Cache
 -----
 
 .. doxygenfile:: cache.h
-   :project: libkresolve
+   :project: libkres
 
 .. _lib_api_nameservers:
 
@@ -33,9 +33,9 @@ Nameservers
 -----------
 
 .. doxygenfile:: nsrep.h
-   :project: libkresolve
+   :project: libkres
 .. doxygenfile:: zonecut.h
-   :project: libkresolve
+   :project: libkres
 
 .. _lib_api_modules:
 
@@ -43,15 +43,15 @@ Modules
 -------
 
 .. doxygenfile:: module.h
-   :project: libkresolve
+   :project: libkres
 
 Utilities
 ---------
 
 .. doxygenfile:: utils.h
-   :project: libkresolve
+   :project: libkres
 .. doxygenfile:: defines.h
-   :project: libkresolve
+   :project: libkres
 
 .. _lib_generics:
 

diff --git a/lib/generic/README.rst b/lib/generic/README.rst
index 0fb042f45bbf3c6ecb6ea731c9b17d5e908a9245..02429b2859ee48edb225eb534437f01d3ef56998 100644 (file)
--- a/lib/generic/README.rst
+++ b/lib/generic/README.rst
@@ -16,30 +16,30 @@ array
 ~~~~~
 
 .. doxygenfile:: array.h
-   :project: libkresolve
+   :project: libkres
 
 map
 ~~~
 
 .. doxygenfile:: map.h
-   :project: libkresolve
+   :project: libkres
 
 set
 ~~~
 
 .. doxygenfile:: set.h
-   :project: libkresolve
+   :project: libkres
 
 pack
 ~~~~
 
 .. doxygenfile:: pack.h
-   :project: libkresolve
+   :project: libkres
 
 lru
 ~~~
 
 .. doxygenfile:: lru.h
-   :project: libkresolve
+   :project: libkres
 
 .. _`Crit-bit tree`: http://cr.yp.to/critbit.html 

diff --git a/lib/lib.mk b/lib/lib.mk
index 52445f3ed0a27592e18c4261d81508852c492753..857d20fd851490507ae572aa9ff2ecbf649f1e39 100644 (file)
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -3,7 +3,7 @@ ccan_EMBED := \
        contrib/ccan/isaac/isaac.c \
        contrib/murmurhash3/murmurhash3.c
 
-libkresolve_SOURCES := \
+libkres_SOURCES := \
        $(ccan_EMBED)          \
        lib/generic/map.c      \
        lib/layer/iterate.c    \
@@ -17,7 +17,7 @@ libkresolve_SOURCES := \
        lib/rplan.c            \
        lib/cache.c
 
-libkresolve_HEADERS := \
+libkres_HEADERS := \
        lib/generic/array.h    \
        lib/generic/map.h      \
        lib/generic/set.h      \
@@ -31,16 +31,16 @@ libkresolve_HEADERS := \
        lib/cache.h
 
 # Dependencies
-libkresolve_DEPEND := 
-libkresolve_LIBS := $(libknot_LIBS)
-libkresolve_TARGET := -Wl,-rpath,lib -Llib -lkresolve
+libkres_DEPEND := 
+libkres_LIBS := $(libknot_LIBS)
+libkres_TARGET := -Wl,-rpath,lib -Llib -lkres
 
 # Make library
-$(eval $(call make_static,libkresolve,lib))
+$(eval $(call make_static,libkres,lib))
 
 # Targets
-lib: $(libkresolve)
-lib-install: libkresolve-install
-lib-clean: libkresolve-clean
+lib: $(libkres)
+lib-install: libkres-install
+lib-clean: libkres-clean
 
 .PHONY: lib lib-install lib-clean

diff --git a/modules/README.rst b/modules/README.rst
index 5dad0fc38c822e2904d4e5791c7169843eccbcdb..766edd64f67ae903675bb5236f9438e320cc71f3 100644 (file)
--- a/modules/README.rst
+++ b/modules/README.rst
@@ -314,7 +314,7 @@ Once you load the module, you can call the module property from the interactive
 
 .. code-block:: bash
 
-       $ kresolved
+       $ kresd
        ...
        [system] started in interactive mode, type 'help()'
        > modules.load('cached')

diff --git a/modules/cachectl/cachectl.mk b/modules/cachectl/cachectl.mk
index 4a141e2ef8f3288d3e98827c1889e0c3ca568d6d..7a67b567cd629bb520ec6581a75b68933a8c2ced 100644 (file)
--- a/modules/cachectl/cachectl.mk
+++ b/modules/cachectl/cachectl.mk
@@ -1,4 +1,4 @@
 cachectl_SOURCES := modules/cachectl/cachectl.c
-cachectl_DEPEND := $(libkresolve)
-cachectl_LIBS := $(libkresolve_TARGET) $(libkresolve_LIBS)
+cachectl_DEPEND := $(libkres)
+cachectl_LIBS := $(libkres_TARGET) $(libkres_LIBS)
 $(call make_c_module,cachectl)
\ No newline at end of file

diff --git a/modules/gostats/gostats.mk b/modules/gostats/gostats.mk
index 9a3fea61976437d383b323bd27aacca0ee9bc981..06abd6727efd88f5772a922f86b5cbe8e91deb43 100644 (file)
--- a/modules/gostats/gostats.mk
+++ b/modules/gostats/gostats.mk
@@ -1,4 +1,4 @@
 gostats_SOURCES := modules/gostats/gostats.go
-gostats_DEPEND := $(libkresolve)
-gostats_LIBS := $(libkresolve_TARGET) $(libkresolve_LIBS)
+gostats_DEPEND := $(libkres)
+gostats_LIBS := $(libkres_TARGET) $(libkres_LIBS)
 $(call make_go_module,gostats)
\ No newline at end of file

diff --git a/modules/hints/hints.mk b/modules/hints/hints.mk
index 9d1dec1e202c38f81ff430d95d67d9b55d2be08f..0d50c8ef8102871e3180dd9610f15cd9c59e6404 100644 (file)
--- a/modules/hints/hints.mk
+++ b/modules/hints/hints.mk
@@ -1,4 +1,4 @@
 hints_SOURCES := modules/hints/hints.c contrib/ccan/json/json.c
-hints_DEPEND := $(libkresolve)
-hints_LIBS := $(libkresolve_TARGET) $(libkresolve_LIBS)
+hints_DEPEND := $(libkres)
+hints_LIBS := $(libkres_TARGET) $(libkres_LIBS)
 $(call make_c_module,hints)
\ No newline at end of file

diff --git a/modules/ketcd/README.rst b/modules/ketcd/README.rst
index f8b8d6e212d350b5c9fbce261a9cb1cfa56032cc..5662223880c11e2086cdd48b477cf111a1697780 100644 (file)
--- a/modules/ketcd/README.rst
+++ b/modules/ketcd/README.rst
@@ -4,16 +4,16 @@ Etcd module
 -----------
 
 The module connects to Etcd peers and watches for configuration change.
-By default, the module looks for the subtree under ``/kresolved`` directory,
+By default, the module looks for the subtree under ``/kresd`` directory,
 but you can change this `in the configuration <https://github.com/mah0x211/lua-etcd#cli-err--etcdnew-optiontable->`_.
 
 The subtree structure corresponds to the configuration variables in the declarative style.
 
 .. code-block:: bash
 
-       $ etcdctl set /kresolved/net/127.0.0.1 53
-       $ etcdctl set /kresolved/modules/cachectl true
-       $ etcdctl set /kresolved/cache/size 10000000
+       $ etcdctl set /kresd/net/127.0.0.1 53
+       $ etcdctl set /kresd/modules/cachectl true
+       $ etcdctl set /kresd/cache/size 10000000
 
 Configures all listening nodes to following configuration:
 
@@ -30,7 +30,7 @@ Example configuration
 
        modules = {
                ketcd = {
-                       prefix = '/kresolved',
+                       prefix = '/kresd',
                        peer = 'http://127.0.0.1:7001'
                }
        }

diff --git a/modules/ketcd/ketcd.lua b/modules/ketcd/ketcd.lua
index ac10ae4766a20523fcbc2bc130fba23d0d0b7bc5..f1537dd75513cbcd2afdabeaf7ee0659fcbf4b68 100644 (file)
--- a/modules/ketcd/ketcd.lua
+++ b/modules/ketcd/ketcd.lua
@@ -28,7 +28,7 @@ end
 
 function ketcd.init(module)
        ketcd.Etcd = require('etcd.luasocket')
-       ketcd.defaults = { prefix = '/kresolved' }
+       ketcd.defaults = { prefix = '/kresd' }
 end
 
 function ketcd.deinit(module)

diff --git a/modules/kmemcached/kmemcached.mk b/modules/kmemcached/kmemcached.mk
index 58e00997cbbf9978b5b85148065906349799a34c..f5e1a96b39dfee73bcf1e789726bea603750015d 100644 (file)
--- a/modules/kmemcached/kmemcached.mk
+++ b/modules/kmemcached/kmemcached.mk
@@ -1,3 +1,3 @@
 kmemcached_SOURCES := modules/kmemcached/kmemcached.c modules/kmemcached/namedb_memcached.c
-kmemcached_LIBS := $(libkresolve_TARGET) $(libkresolve_LIBS) $(libmemcached_LIBS)
+kmemcached_LIBS := $(libkres_TARGET) $(libkres_LIBS) $(libmemcached_LIBS)
 $(call make_c_module,kmemcached)

diff --git a/modules/stats/stats.mk b/modules/stats/stats.mk
index 362c619a15f395da788cb8f6d96dc2fbe6958329..b82fd10f21dbfd417ba50afca07e2f497e73604d 100644 (file)
--- a/modules/stats/stats.mk
+++ b/modules/stats/stats.mk
@@ -1,4 +1,4 @@
 stats_SOURCES := modules/stats/stats.c contrib/ccan/json/json.c
-stats_DEPEND := $(libkresolve)
-stats_LIBS := $(libkresolve_TARGET) $(libkresolve_LIBS)
+stats_DEPEND := $(libkres)
+stats_LIBS := $(libkres_TARGET) $(libkres_LIBS)
 $(call make_c_module,stats)

diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 35cedd8170f01c37b26308f42a6d248523837db3..7e8a5f47a9fe85ca197793f927c5187ced872197 100644 (file)
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -14,7 +14,7 @@ EXPOSE 53
 
 # Select entrypoint
 WORKDIR /data
-CMD ["/usr/local/bin/kresolved"]
+CMD ["/usr/local/bin/kresd"]
 
 # Install dependencies and sources
 RUN \

diff --git a/tests/integration.mk b/tests/integration.mk
index 50bbfec48c3982434d70985fc8d3b95062e5d87e..100de5937a1429bba86230ba4b316657f6bbe9d5 100644 (file)
--- a/tests/integration.mk
+++ b/tests/integration.mk
@@ -5,7 +5,7 @@
 # Mocked calls library
 libmock_calls_SOURCES := tests/mock_calls.c
 libmock_calls_LIBS := $(tests_LIBS) $(python_LIBS)
-libmock_calls_DEPEND := $(libkresolve)
+libmock_calls_DEPEND := $(libkres)
 $(eval $(call make_lib,libmock_calls,tests))
 
 # Python module for tests

diff --git a/tests/unit.mk b/tests/unit.mk
index 24dc1d00226195c2cbcdd1b1d13c3a5930f5ce89..3b69799d66cd901e1f588a2e11acb36cd3bd46cf 100644 (file)
--- a/tests/unit.mk
+++ b/tests/unit.mk
@@ -21,8 +21,8 @@ mock_gomodule_SOURCES := tests/mock_gomodule.c
 $(eval $(call make_lib,mock_gomodule,tests))
 
 # Dependencies
-tests_DEPEND := $(libkresolve) $(mock_cmodule) $(mock_gomodule)
-tests_LIBS :=  $(libkresolve_TARGET) $(libkresolve_LIBS) $(cmocka_LIBS)
+tests_DEPEND := $(libkres) $(mock_cmodule) $(mock_gomodule)
+tests_LIBS :=  $(libkres_TARGET) $(libkres_LIBS) $(cmocka_LIBS)
 
 # Make test binaries
 define make_test