diff options
| -rw-r--r-- | buildtools/make-python-executable.py | 24 | ||||
| -rw-r--r-- | rpkid/Makefile.in | 49 | ||||
| -rw-r--r-- | rpkid/rpki/config.py | 6 | ||||
| -rw-r--r-- | rpkid/rpki/gui/script_util.py | 3 |
4 files changed, 34 insertions, 48 deletions
diff --git a/buildtools/make-python-executable.py b/buildtools/make-python-executable.py index eeb31e39..5dc848f4 100644 --- a/buildtools/make-python-executable.py +++ b/buildtools/make-python-executable.py @@ -1,11 +1,11 @@ """ -Convert a Python script into an executable Python script. Mostly this -means constructing a header based on a few parameters supplied by -autoconf. +Convert a Python script into an executable Python script. This used +to do something more complicated, at this point it just adds the +shebang line. $Id$ -Copyright (C) 2011 Internet Systems Consortium ("ISC") +Copyright (C) 2011-2013 Internet Systems Consortium ("ISC") Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -20,19 +20,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. """ -import os, sys - -sys.stdout.write('''\ -#!%(AC_PYTHON_INTERPRETER)s -# Automatically constructed script header - -# Set location of global rpki.conf file -if __name__ == "__main__": - import rpki.config - rpki.config.default_dirname = "%(AC_RPKI_CONFIG_DIR)s" - -# Original script starts here - -''' % os.environ) +import sys +sys.stdout.write("#!%s\n" % sys.executable) sys.stdout.write(sys.stdin.read()) diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 83d669d5..e8591314 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -50,7 +50,6 @@ SETUP_PY = \ AC_CONF_FILES='${CONF_FILES}' \ AC_ABS_BUILDDIR='${abs_builddir}' \ AC_LIBEXECDIR='${libexecdir}' \ - AC_AUX_SCRIPTS='${AUX_SCRIPTS}' \ AC_DATAROOTDIR='${datarootdir}/rpki' \ AC_SYSCONFDIR='${sysconfdir}/rpki' \ ${PYTHON} setup.py @@ -59,16 +58,18 @@ SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys. POW_SO = rpki/POW/_POW.so -SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \ - pubd rootd rpkic rpkid \ - portal-gui/scripts/rpkigui-import-routes \ - portal-gui/scripts/rpkigui-check-expired \ - portal-gui/scripts/rpkigui-rcynic \ - portal-gui/scripts/rpki-manage +SCRIPTS = \ + rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \ + pubd rootd rpkic rpkid \ + portal-gui/scripts/rpkigui-import-routes \ + portal-gui/scripts/rpkigui-check-expired \ + portal-gui/scripts/rpkigui-rcynic \ + portal-gui/scripts/rpki-manage # scripts we build, but don't install -BUILD_SCRIPTS = portal-gui/rpki.wsgi \ - rpki/gui/autoconf.py +BUILD_SCRIPTS = \ + portal-gui/rpki.wsgi \ + rpki/autoconf.py # these files get put in ${datarootdir}/rpki DATA_FILES = portal-gui/routeviews.sh @@ -79,7 +80,7 @@ CONF_FILES = portal-gui/apache.conf portal-gui/default_settings.py ${SETTINGS} # automatically generated config files SETTINGS=portal-gui/settings.py -all:: ${POW_SO} rpki/relaxng.py myrpki.rng rpki/sql_schemas.py ${SCRIPTS} ${AUX_SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} +all:: ${POW_SO} rpki/relaxng.py myrpki.rng rpki/sql_schemas.py ${SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} ${POW_SO}: ext/POW.c setup.py ${SETUP_PY} build_ext --inplace @@ -87,12 +88,6 @@ ${POW_SO}: ext/POW.c setup.py clean:: rm -rf ${POW_SO} build dist -rpm deb:: all - ${SETUP_PY} bdist_rpm - -deb:: - cd dist; for i in *.rpm; do case $$i in *.src.rpm) :;; *) (set -x; fakeroot alien -v $$i);; esac; done - RNGS = left-right-schema.rng up-down-schema.rng publication-schema.rng myrpki.rng rpki/relaxng.py: ${abs_top_srcdir}/buildtools/make-relaxng.py ${RNGS} @@ -118,7 +113,7 @@ rpki/sql_schemas.py: ${abs_top_srcdir}/buildtools/make-sql-schemas.py rpkid.sql clean:: find . -type f -name '*.py[co]' -delete cd tests; $(MAKE) $@ - rm -f ${SCRIPTS} ${AUX_SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} + rm -f ${SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} install:: all ${SETUP_PY} install ${SETUP_PY_ROOT} ${SETUP_PY_INSTALL_LAYOUT} --record installed @@ -227,8 +222,6 @@ clean:: COMPILE_PYTHON = \ rm -f $@; \ - AC_PYTHON_INTERPRETER='${PYTHON}' \ - AC_RPKI_CONFIG_DIR='${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-python-executable.py <$? >$@; \ chmod 555 $@ @@ -293,11 +286,13 @@ portal-gui/scripts/rpki-manage: ${srcdir}/portal-gui/scripts/rpki-manage.in ${srcdir}/portal-gui/scripts/rpki-manage.in > portal-gui/scripts/rpki-manage chmod 755 $@ -rpki/gui/autoconf.py: Makefile - (echo '# automatically generated. DO NOT EDIT.'; \ - echo 'bindir="${bindir}"'; \ - echo 'datarootdir="${datarootdir}"'; \ - echo 'localstatedir="${localstatedir}"'; \ - echo 'sbindir="${sbindir}"'; \ - echo 'sharedstatedir="${sharedstatedir}"'; \ - echo 'sysconfdir="${sysconfdir}"') > $@ +rpki/autoconf.py: Makefile + @echo 'Generating $@'; \ + (echo '# Automatically generated. DO NOT EDIT.'; \ + echo 'bindir = "${bindir}"'; \ + echo 'datarootdir = "${datarootdir}"'; \ + echo 'localstatedir = "${localstatedir}"'; \ + echo 'sbindir = "${sbindir}"'; \ + echo 'sharedstatedir = "${sharedstatedir}"'; \ + echo 'sysconfdir = "${sysconfdir}"' \ + ) > $@ diff --git a/rpkid/rpki/config.py b/rpkid/rpki/config.py index cc5b6580..99e6ef3b 100644 --- a/rpkid/rpki/config.py +++ b/rpkid/rpki/config.py @@ -47,7 +47,11 @@ default_filename = "rpki.conf" # if no global config file. Autoconf-generated code may set this to a # non-None value during script startup. -default_dirname = None +try: + import rpki.autoconf + default_dirname = rpki.autoconf.sysconfdir +except ImportError: + default_dirname = None ## @var default_envname # Name of environment variable containing config file name. diff --git a/rpkid/rpki/gui/script_util.py b/rpkid/rpki/gui/script_util.py index bb0fb427..c3a864fd 100644 --- a/rpkid/rpki/gui/script_util.py +++ b/rpkid/rpki/gui/script_util.py @@ -19,7 +19,7 @@ This module contains utility functions for use in standalone scripts. from django.conf import settings from rpki import config -from rpki.gui import autoconf +from rpki import autoconf __version__ = '$Id$' @@ -28,7 +28,6 @@ def setup(): """ Configure Django enough to use the ORM. """ - config.default_dirname = autoconf.sysconfdir cfg = config.parser(section='web_portal') # INSTALLED_APPS doesn't seem necessary so long as you are only accessing # existing tables. |