Fix schema generation.

svn path=/branches/tk685/; revision=5760

11 files changed, 33 insertions, 44 deletions

diff --git a/Makefile.in b/Makefile.in
index 1394a6cb..71dab019 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,8 +42,9 @@ export:
 	tar czf subvert-rpki.hactrn.net-$$(date +%Y.%m.%d).tar.gz subvert-rpki.hactrn.net
 	rm -rf subvert-rpki.hactrn.net
 
-distclean clean::
-	rm -rf build autom4te.cache
+clean distclean::
+	rm -rf build autom4te.cache rpki/autoconf.py setup_autoconf.py setup_autoconf.pyc ${POW_SO} build dist
+	find . -type f -name '*.py[co]' -delete
 
 distclean::
 	rm -rf Makefile config.log config.status
@@ -73,9 +74,6 @@ rpki/autoconf.py: Makefile
 	 echo 'WSGI_PYTHON_EGG_CACHE_USER   = "${WSGI_PYTHON_EGG_CACHE_USER}"';	\
 	) > $@
 
-clean::
-	rm -f rpki/autoconf.py
-
 setup_autoconf.py: rpki/autoconf.py
 	@echo 'Generating $@';					\
 	(cat rpki/autoconf.py;					\
@@ -85,9 +83,6 @@ setup_autoconf.py: rpki/autoconf.py
 	 echo 'LIBS           = """${LIBS}"""';                 \
 	) > $@
 
-clean::
-	rm -f setup_autoconf.py setup_autoconf.pyc
-
 SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'`
 
 POW_SO	= rpki/POW/_POW.so
@@ -102,9 +97,3 @@ ${POW_SO}: .FORCE setup_autoconf.py
 build/stamp: .FORCE setup_autoconf.py
 	${PYTHON} setup.py build
 	touch $@
-
-clean::
-	rm -rf ${POW_SO} build dist
-
-clean::
-	find . -type f -name '*.py[co]' -delete
diff --git a/configure b/configure
index 711ec03d..921affbf 100755
--- a/configure
+++ b/configure
@@ -4990,7 +4990,7 @@ fi
 
 # Figure out which parts of this package we have to build.
 
-			      TOP_LEVEL_SUBDIRS="h"
+			      TOP_LEVEL_SUBDIRS="h schemas"
 test $build_openssl  = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl"
 test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rp"
 test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS ca"
diff --git a/configure.ac b/configure.ac
index 65368e06..ff25b982 100644
--- a/configure.ac
+++ b/configure.ac
@@ -752,7 +752,7 @@ fi
 
 # Figure out which parts of this package we have to build.
 
-			      TOP_LEVEL_SUBDIRS="h"
+			      TOP_LEVEL_SUBDIRS="h schemas"
 test $build_openssl  = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS openssl"
 test $build_rp_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS rp"
 test $build_ca_tools = yes && TOP_LEVEL_SUBDIRS="$TOP_LEVEL_SUBDIRS ca"
diff --git a/rpki/relaxng.py b/rpki/relaxng.py
index 0d8c0d64..917ed6ed 100644
--- a/rpki/relaxng.py
+++ b/rpki/relaxng.py
@@ -2,11 +2,11 @@
 
 import lxml.etree
 
-## @var left_right
-## Parsed RelaxNG left_right schema
-left_right = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/left_right
+## Parsed RelaxNG relaxng/left_right schema
+relaxng/left_right = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: left-right-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: left-right-schema.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for RPKI left-right protocol.
   
@@ -1095,11 +1095,11 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" en
 -->
 '''))
 
-## @var up_down
-## Parsed RelaxNG up_down schema
-up_down = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/up_down
+## Parsed RelaxNG relaxng/up_down schema
+relaxng/up_down = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: up-down-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: up-down-schema.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for the up-down protocol, extracted from RFC 6492.
   
@@ -1376,11 +1376,11 @@ up_down = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encod
 -->
 '''))
 
-## @var publication
-## Parsed RelaxNG publication schema
-publication = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/publication
+## Parsed RelaxNG relaxng/publication schema
+relaxng/publication = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: publication-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: publication-schema.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for RPKI publication protocol.
   
@@ -1954,11 +1954,11 @@ publication = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" e
 -->
 '''))
 
-## @var myrpki
-## Parsed RelaxNG myrpki schema
-myrpki = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/myrpki
+## Parsed RelaxNG relaxng/myrpki schema
+relaxng/myrpki = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: myrpki.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: myrpki.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for MyRPKI XML messages.
   
@@ -2337,11 +2337,11 @@ myrpki = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encodi
 -->
 '''))
 
-## @var router_certificate
-## Parsed RelaxNG router_certificate schema
-router_certificate = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
+## @var relaxng/router_certificate
+## Parsed RelaxNG relaxng/router_certificate schema
+relaxng/router_certificate = lxml.etree.RelaxNG(lxml.etree.fromstring(r'''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: router-certificate-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: router-certificate-schema.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for BGPSEC router certificate interchange format.
   
diff --git a/rpki/sql_schemas.py b/rpki/sql_schemas.py
index e57c7a7f..0ac6016e 100644
--- a/rpki/sql_schemas.py
+++ b/rpki/sql_schemas.py
@@ -2,7 +2,7 @@
 
 ## @var rpkid
 ## SQL schema rpkid
-rpkid = '''-- $Id: rpkid.sql 5753 2014-04-05 19:24:26Z sra $
+rpkid = '''-- $Id: rpkid.sql 5757 2014-04-05 22:42:12Z sra $
 
 -- Copyright (C) 2009--2011  Internet Systems Consortium ("ISC")
 --
@@ -256,7 +256,7 @@ CREATE TABLE ee_cert (
 
 ## @var pubd
 ## SQL schema pubd
-pubd = '''-- $Id: pubd.sql 3465 2010-10-07 00:59:39Z sra $
+pubd = '''-- $Id: pubd.sql 5757 2014-04-05 22:42:12Z sra $
 
 -- Copyright (C) 2009--2010  Internet Systems Consortium ("ISC")
 --
diff --git a/schemas/Makefile.in b/schemas/Makefile.in
index b7dae635..6d2a34b0 100644
--- a/schemas/Makefile.in
+++ b/schemas/Makefile.in
@@ -47,7 +47,7 @@ ${abs_top_srcdir}/rpki/relaxng.py: ${abs_top_srcdir}/buildtools/make-relaxng.py
 	mv $@.tmp $@
 
 ${abs_top_srcdir}/rpki/sql_schemas.py: ${abs_top_srcdir}/buildtools/make-sql-schemas.py ${SQLS}
-	${PYTHON} ${abs_top_srcdir}/buildtools/make-sql-schemas.py >$@.tmp
+	cd sql; ${PYTHON} ${abs_top_srcdir}/buildtools/make-sql-schemas.py >$@.tmp
 	mv $@.tmp $@
 
 relaxng/left-right-schema.rng: relaxng/left-right-schema.rnc
diff --git a/schemas/relaxng/left-right-schema.rng b/schemas/relaxng/left-right-schema.rng
index 6c3d2f1a..f153f0b6 100644
--- a/schemas/relaxng/left-right-schema.rng
+++ b/schemas/relaxng/left-right-schema.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: left-right-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: left-right-schema.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for RPKI left-right protocol.
   
diff --git a/schemas/relaxng/myrpki.rng b/schemas/relaxng/myrpki.rng
index 07b8beb3..8c7473eb 100644
--- a/schemas/relaxng/myrpki.rng
+++ b/schemas/relaxng/myrpki.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: myrpki.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: myrpki.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for MyRPKI XML messages.
   
diff --git a/schemas/relaxng/publication-schema.rng b/schemas/relaxng/publication-schema.rng
index 63fb6ea5..7c74698f 100644
--- a/schemas/relaxng/publication-schema.rng
+++ b/schemas/relaxng/publication-schema.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: publication-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: publication-schema.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for RPKI publication protocol.
   
diff --git a/schemas/relaxng/router-certificate-schema.rng b/schemas/relaxng/router-certificate-schema.rng
index d8be9eda..90b50107 100644
--- a/schemas/relaxng/router-certificate-schema.rng
+++ b/schemas/relaxng/router-certificate-schema.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: router-certificate-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: router-certificate-schema.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for BGPSEC router certificate interchange format.
   
diff --git a/schemas/relaxng/up-down-schema.rng b/schemas/relaxng/up-down-schema.rng
index 5368fa65..89235b7e 100644
--- a/schemas/relaxng/up-down-schema.rng
+++ b/schemas/relaxng/up-down-schema.rng
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: up-down-schema.rnc 5753 2014-04-05 19:24:26Z sra $
+  $Id: up-down-schema.rnc 5757 2014-04-05 22:42:12Z sra $
   
   RelaxNG schema for the up-down protocol, extracted from RFC 6492.