diff options
| author | Rob Austein <sra@hactrn.net> | 2015-10-19 03:36:42 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-10-19 03:36:42 +0000 |
| commit | 7f5e75188ad4527e3c3425a155dfed0847a389dd (patch) | |
| tree | 400301cae01f51141e380664cf0b382b8204a00d /Makefile.in | |
| parent | 7ab6040f7eb05a7ac4424e0294d228256e9a64dd (diff) | |
Amputate old SQL code out of rpkid with a fire axe, replacing it with
Django ORM. Duct tape and bailing wire everywhere, much clean-up left
to do, but basic "make yamltest" suite runs. Much of the clean-up
isn't worth doing until after revamping the I/O system, as it'll all
change again at that point anyway.
svn path=/branches/tk705/; revision=6127
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index faba9054..9d53cf7a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,9 +54,6 @@ RNGS = schemas/relaxng/left-right.rng \ schemas/relaxng/rrdp.rng \ schemas/relaxng/oob-setup.rng -SQLS = schemas/sql/rpkid.sql \ - schemas/sql/pubd.sql - default: all all: VERSION rpki/autoconf.py setup_autoconf.py @@ -106,7 +103,6 @@ rpki-all: \ ${abs_top_srcdir}/h/rpki/sk_manifest.h \ ${abs_top_srcdir}/h/rpki/sk_roa.h \ ${abs_top_srcdir}/rpki/relaxng.py \ - ${abs_top_srcdir}/rpki/sql_schemas.py \ ${POW_SO} \ build/stamp @@ -186,10 +182,6 @@ ${abs_top_srcdir}/rpki/relaxng.py: buildtools/make-relaxng.py ${RNGS} cd schemas/relaxng; ${PYTHON} ${abs_top_srcdir}/buildtools/make-relaxng.py *.rng >$@.tmp mv $@.tmp $@ -${abs_top_srcdir}/rpki/sql_schemas.py: buildtools/make-sql-schemas.py ${SQLS} - cd schemas/sql; ${PYTHON} ${abs_top_srcdir}/buildtools/make-sql-schemas.py >$@.tmp - mv $@.tmp $@ - schemas/relaxng/left-right.rng: schemas/relaxng/left-right.rnc ${TRANG} schemas/relaxng/left-right.rnc schemas/relaxng/left-right.rng @@ -217,14 +209,10 @@ schemas/relaxng/oob-setup.rng: schemas/relaxng/oob-setup.rnc # Eg: PYLINT_FLAGS='--disable=W0311' lint: .FORCE - pylint --rcfile ${abs_top_srcdir}/buildtools/pylint.rc ${PYLINT_FLAGS} \ - rpki `find rp ca -type f -perm -1 -print | xargs grep -El '^#!.+python'` + pylint --rcfile ${abs_top_srcdir}/buildtools/pylint.rc ${PYLINT_FLAGS} rpki `find rp ca -type f -perm -1 ! -name '*~' -print | xargs grep -El '^#!.+python'` tags: Makefile .FORCE - find rpki rp ca schemas -type f \ - \( -name '*.[ch]' -o -name '*.py' -o -name '*.sql' -o -name '*.rnc' \) \ - ! -name relaxng.py ! -name sql_schemas.py -print | \ - etags - + { find rpki rp ca schemas -type f \( -name '*.[ch]' -o -name '*.py' -o -name '*.sql' -o -name '*.rnc' \) ! -name relaxng.py -print; find rp ca -type f -perm -1 ! -name '*~' -print | xargs grep -El '^#!.+python'; } | etags - # This isn't all that useful until SQL has been set up. Might want to # hack up something using ca/rpki-confgen and ca/rpki-sql-setup. |