2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 13:07:50 +00:00

[1901] Rename 'bind10' script files

- renamed 'bind10' to 'b10-init'
- renamed related files as well
- left alone the 'run' script, as well as the directory name
- added new 'bind10' script that execs b10-init

note this commit only handles file names, and internal references have not been updated yet
This commit is contained in:
Jelte Jansen 2013-01-31 15:47:39 +01:00
parent 937c982cf3
commit cfa26ab8df
7 changed files with 18 additions and 18 deletions

View File

@ -1310,7 +1310,7 @@ AC_OUTPUT([doc/version.ent
src/bin/sysinfo/run_sysinfo.sh src/bin/sysinfo/run_sysinfo.sh
src/bin/stats/stats.py src/bin/stats/stats.py
src/bin/stats/stats_httpd.py src/bin/stats/stats_httpd.py
src/bin/bind10/bind10_src.py src/bin/bind10/b10-init.py
src/bin/bind10/run_bind10.sh src/bin/bind10/run_bind10.sh
src/bin/bind10/tests/bind10_test.py src/bin/bind10/tests/bind10_test.py
src/bin/bindctl/run_bindctl.sh src/bin/bindctl/run_bindctl.sh

View File

@ -1,4 +1,3 @@
/bind10 /b10-init.py
/bind10_src.py
/run_bind10.sh /run_bind10.sh
/bind10.8 /bind10.8

View File

@ -1,29 +1,30 @@
SUBDIRS = . tests SUBDIRS = . tests
sbin_SCRIPTS = bind10 sbin_SCRIPTS = b10-init bind10
CLEANFILES = bind10 bind10_src.pyc pkglibexec_SCRIPTS = b10-init
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.py CLEANFILES = b10-init b10-init.pyc
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.pyc CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/init_messages.py
CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/init_messages.pyc
pkglibexecdir = $(libexecdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@
nodist_pylogmessage_PYTHON = $(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.py nodist_pylogmessage_PYTHON = $(PYTHON_LOGMSGPKG_DIR)/work/init_messages.py
pylogmessagedir = $(pyexecdir)/isc/log_messages/ pylogmessagedir = $(pyexecdir)/isc/log_messages/
noinst_SCRIPTS = run_bind10.sh noinst_SCRIPTS = run_bind10.sh
bind10dir = $(pkgdatadir) bind10dir = $(pkgdatadir)
bind10_DATA = bob.spec bind10_DATA = init.spec
EXTRA_DIST = bob.spec EXTRA_DIST = init.spec
man_MANS = bind10.8 man_MANS = b10-init.8
DISTCLEANFILES = $(man_MANS) DISTCLEANFILES = $(man_MANS)
EXTRA_DIST += $(man_MANS) bind10.xml bind10_messages.mes EXTRA_DIST += $(man_MANS) b10-init.xml init_messages.mes
if GENERATE_DOCS if GENERATE_DOCS
bind10.8: bind10.xml b10-init.8: b10-init.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bind10.xml @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/b10-init.xml
#dist-local-check-mans-enabled: #dist-local-check-mans-enabled:
# @if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi # @if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
@ -40,15 +41,15 @@ $(man_MANS):
endif endif
$(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.py : bind10_messages.mes $(PYTHON_LOGMSGPKG_DIR)/work/init_messages.py : init_messages.mes
$(top_builddir)/src/lib/log/compiler/message \ $(top_builddir)/src/lib/log/compiler/message \
-d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/bind10_messages.mes -d $(PYTHON_LOGMSGPKG_DIR)/work -p $(srcdir)/init_messages.mes
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
bind10: bind10_src.py $(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.py b10-init: b10-init.py $(PYTHON_LOGMSGPKG_DIR)/work/init_messages.py
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \ $(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
-e "s|@@LIBDIR@@|$(libdir)|" \ -e "s|@@LIBDIR@@|$(libdir)|" \
-e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bind10_src.py >$@ -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" b10-init.py >$@
chmod a+x $@ chmod a+x $@
pytest: pytest: