[svn] commit: r3243 - in /branches/vorner-sockcreator: ./ src/bin/bind10/ src/bin/bind10/tests/

[BIND 10 source code commits]

Author: vorner
Date: Sun Oct 17 18:12:28 2010
New Revision: 3243

Log:
Interface of the sockcreator.Parser class

Added:
    branches/vorner-sockcreator/src/bin/bind10/__init__.py
    branches/vorner-sockcreator/src/bin/bind10/bind10_src.py.in
      - copied, changed from r3241, branches/vorner-sockcreator/src/bin/bind10/bind10.py.in
    branches/vorner-sockcreator/src/bin/bind10/sockcreator.py
Removed:
    branches/vorner-sockcreator/src/bin/bind10/bind10.py.in
Modified:
    branches/vorner-sockcreator/configure.ac
    branches/vorner-sockcreator/src/bin/bind10/Makefile.am
    branches/vorner-sockcreator/src/bin/bind10/tests/Makefile.am
    branches/vorner-sockcreator/src/bin/bind10/tests/bind10_test.py

Modified: branches/vorner-sockcreator/configure.ac
==============================================================================
--- branches/vorner-sockcreator/configure.ac (original)
+++ branches/vorner-sockcreator/configure.ac Sun Oct 17 18:12:28 2010
@@ -544,7 +544,7 @@
            src/bin/stats/run_b10-stats.sh
            src/bin/stats/run_b10-stats_stub.sh
            src/bin/stats/tests/stats_test
-           src/bin/bind10/bind10.py
+           src/bin/bind10/bind10_src.py
            src/bin/bind10/tests/bind10_test
            src/bin/bind10/run_bind10.sh
            src/bin/bindctl/run_bindctl.sh

Modified: branches/vorner-sockcreator/src/bin/bind10/Makefile.am
==============================================================================
--- branches/vorner-sockcreator/src/bin/bind10/Makefile.am (original)
+++ branches/vorner-sockcreator/src/bin/bind10/Makefile.am Sun Oct 17 18:12:28 2010
@@ -1,7 +1,7 @@
 SUBDIRS = . tests
 
 sbin_SCRIPTS = bind10
-CLEANFILES = bind10 bind10.pyc
+CLEANFILES = bind10 bind10_src.pyc
 
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
@@ -12,6 +12,9 @@
 man_MANS = bind10.8
 EXTRA_DIST += $(man_MANS) bind10.xml
 
+python_PYTHON = __init__.py sockcreator.py
+pythondir = $(pyexecdir)/bind10
+
 if ENABLE_MAN
 
 bind10.8: bind10.xml
@@ -21,10 +24,10 @@
 
 # TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
-bind10: bind10.py
+bind10: bind10_src.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
-	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bind10.py >$@
-	chmod a+x $@
+	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" "$<" >"$@"
+	chmod a+x "$@"
 
 pytest:
 	$(SHELL) tests/bind10_test

Modified: branches/vorner-sockcreator/src/bin/bind10/tests/Makefile.am
==============================================================================
--- branches/vorner-sockcreator/src/bin/bind10/tests/Makefile.am (original)
+++ branches/vorner-sockcreator/src/bin/bind10/tests/Makefile.am Sun Oct 17 18:12:28 2010
@@ -7,6 +7,6 @@
 check-local:
 	for pytest in $(PYTESTS) ; do \
 	echo Running test: $$pytest ; \
-	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
+	env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_srcdir)/src/bin:$(abs_top_builddir)/src/bin/bind10 \
 	$(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
 	done

Modified: branches/vorner-sockcreator/src/bin/bind10/tests/bind10_test.py
==============================================================================
--- branches/vorner-sockcreator/src/bin/bind10/tests/bind10_test.py (original)
+++ branches/vorner-sockcreator/src/bin/bind10/tests/bind10_test.py Sun Oct 17 18:12:28 2010
@@ -1,4 +1,4 @@
-from bind10 import ProcessInfo, BoB
+from bind10_src import ProcessInfo, BoB
 
 # XXX: environment tests are currently disabled, due to the preprocessor
 #      setup that we have now complicating the environment