[svn] commit: r698 - in /branches/parkinglot/src: bin/bind10/ bin/cfgmgr/ lib/config/python/isc/config/ lib/dns/cpp/

[BIND 10 source code commits]

Author: jelte
Date: Mon Feb  1 16:09:21 2010
New Revision: 698

Log:
more build/install fixes;
output generated header files for lib/dns into source tree, not build tree
moved cfgmgr.py to lib/config/python/isc/config
run_bind10.sh now takes python path from build dir, not src

Added:
    branches/parkinglot/src/lib/config/python/isc/config/cfgmgr.py
      - copied unchanged from r697, branches/parkinglot/src/bin/cfgmgr/cfgmgr.py
Removed:
    branches/parkinglot/src/bin/cfgmgr/cfgmgr.py
Modified:
    branches/parkinglot/src/bin/bind10/run_bind10.sh.in
    branches/parkinglot/src/bin/cfgmgr/Makefile.am
    branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.py.in
    branches/parkinglot/src/lib/config/python/isc/config/Makefile.am
    branches/parkinglot/src/lib/dns/cpp/gen-rdatacode.py.in

Modified: branches/parkinglot/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- branches/parkinglot/src/bin/bind10/run_bind10.sh.in (original)
+++ branches/parkinglot/src/bin/bind10/run_bind10.sh.in Mon Feb  1 16:09:21 2010
@@ -8,7 +8,7 @@
 PATH=@abs_top_builddir@/src/bin/msgq:@abs_top_builddir@/src/bin/auth:@abs_top_builddir@/src/bin/cfgmgr:@abs_top_builddir@/src/bin/cmdctl:$PATH
 export PATH
 
-PYTHONPATH=@abs_top_srcdir@/pyshared/
+PYTHONPATH=@abs_top_builddir@/pyshared/
 export PYTHONPATH
 
 B10_FROM_SOURCE=@abs_top_srcdir@

Modified: branches/parkinglot/src/bin/cfgmgr/Makefile.am
==============================================================================
--- branches/parkinglot/src/bin/cfgmgr/Makefile.am (original)
+++ branches/parkinglot/src/bin/cfgmgr/Makefile.am Mon Feb  1 16:09:21 2010
@@ -1,6 +1,6 @@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 
-pkglibexec_SCRIPTS = b10-cfgmgr cfgmgr.py
+pkglibexec_SCRIPTS = b10-cfgmgr
 
 CLEANFILES = b10-cfgmgr.py
 

Modified: branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.py.in
==============================================================================
--- branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.py.in (original)
+++ branches/parkinglot/src/bin/cfgmgr/b10-cfgmgr.py.in Mon Feb  1 16:09:21 2010
@@ -2,7 +2,7 @@
 
 import sys; sys.path.append ('@@PYTHONPATH@@')
 
-from cfgmgr import ConfigManager
+from isc.config.cfgmgr import ConfigManager
 import signal
 import os
 

Modified: branches/parkinglot/src/lib/config/python/isc/config/Makefile.am
==============================================================================
--- branches/parkinglot/src/lib/config/python/isc/config/Makefile.am (original)
+++ branches/parkinglot/src/lib/config/python/isc/config/Makefile.am Mon Feb  1 16:09:21 2010
@@ -1,4 +1,4 @@
-PY_MODULES=	__init__.py ccsession.py datadefinition.py
+PY_MODULES=	__init__.py ccsession.py datadefinition.py cfgmgr.py
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pyexecdir)/isc/config

Modified: branches/parkinglot/src/lib/dns/cpp/gen-rdatacode.py.in
==============================================================================
--- branches/parkinglot/src/lib/dns/cpp/gen-rdatacode.py.in (original)
+++ branches/parkinglot/src/lib/dns/cpp/gen-rdatacode.py.in Mon Feb  1 16:09:21 2010
@@ -163,7 +163,7 @@
                         if class_txt == 'generic':
                             typeandclass.append((type_txt, int(type_code),
                                                  (class_txt, 'in'), 1))
-    rdata_deffile = open('rdataclass.cc', 'w')
+    rdata_deffile = open('@srcdir@/rdataclass.cc', 'w')
     rdata_deffile.write(copyright_txt)
     rdata_deffile.write(class_definitions)
     rdata_deffile.close()
@@ -173,7 +173,7 @@
 // mode: c++
 // End:
 '''
-    rdata_header = open('rdataclass.h', 'w')
+    rdata_header = open('@srcdir@/rdataclass.h', 'w')
     rdata_header.write(copyright_txt)
     rdata_header.write(class_declarations)
     rdata_header.close()
@@ -192,7 +192,7 @@
 }\n
 '''
     rrtype_header_temp = open('@srcdir@/rrtype-placeholder.h', 'r')
-    rrtype_header_out = open('rrtype.h', 'w')
+    rrtype_header_out = open('@srcdir@/rrtype.h', 'w')
     rrtype_header_out.write(copyright_txt)
     for line in rrtype_header_temp.readlines():
         rrtype_header_out.write(line)
@@ -218,7 +218,7 @@
 '''
 
     rrclass_header_temp = open('@srcdir@/rrclass-placeholder.h', 'r')
-    rrclass_header_out = open('rrclass.h', 'w')
+    rrclass_header_out = open('@srcdir@/rrclass.h', 'w')
     rrclass_header_out.write(copyright_txt)
     for line in rrclass_header_temp.readlines():
         rrclass_header_out.write(line)
@@ -253,7 +253,7 @@
             typeandclassparams += class_txt + '::' + type_utxt + '>()));\n'
 
     rrparam_temp = open('@srcdir@/rrparamregistry-placeholder.cc', 'r')
-    rrparam_out = open('rrparamregistry.cc', 'w')
+    rrparam_out = open('@srcdir@/rrparamregistry.cc', 'w')
     rrparam_out.write(copyright_txt)
     for line in rrparam_temp.readlines():
         rrparam_out.write(line)