Parcourir la source

[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
Jelte Jansen il y a 12 ans
Parent
commit
cfa26ab8df

+ 1 - 1
configure.ac

@@ -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

+ 1 - 2
src/bin/bind10/.gitignore

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

+ 16 - 15
src/bin/bind10/Makefile.am

@@ -1,29 +1,30 @@
 SUBDIRS = . tests
 SUBDIRS = . tests
 
 
-sbin_SCRIPTS = bind10
-CLEANFILES = bind10 bind10_src.pyc
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.py
-CLEANFILES += $(PYTHON_LOGMSGPKG_DIR)/work/bind10_messages.pyc
+sbin_SCRIPTS = b10-init bind10
+pkglibexec_SCRIPTS = b10-init
+CLEANFILES = b10-init b10-init.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
-EXTRA_DIST = bob.spec
+bind10_DATA = init.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
-	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bind10.xml 
+b10-init.8: b10-init.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:

src/bin/bind10/bind10_src.py.in → src/bin/bind10/b10-init.py.in


src/bin/bind10/bind10.xml → src/bin/bind10/b10-init.xml


src/bin/bind10/bob.spec → src/bin/bind10/init.spec


src/bin/bind10/bind10_messages.mes → src/bin/bind10/init_messages.mes