Consolidate list of scripts for setup.py to install into setup.py, get

rid of a lot of Makefile.in code that no longer serves any useful
purpose.

svn path=/trunk/; revision=5285

18 files changed, 32 insertions, 117 deletions

diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 5c697f91..17635389 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -30,53 +30,14 @@ srcdir          = @srcdir@
 
 SETUP_PY_INSTALL_LAYOUT = @SETUP_PY_INSTALL_LAYOUT@
 
-# PID files seem to go into /var/run/ on every platform we support.
-# We could make this an autoconf substitution if anything ever cares,
-# but let's keep it simple for now.
-
-PID_DIR		= ${DESTDIR}/var/run/rpkid
-
-SETUP_PY = \
-	AC_CFLAGS='${CFLAGS}' \
-	AC_LDFLAGS='${LDFLAGS}' \
-	AC_LIBS='${LIBS}' \
-	AC_SBINDIR='${sbindir}' \
-	AC_SCRIPTS='${SCRIPTS}' \
-	AC_DATA_FILES='${DATA_FILES}' \
-	AC_CONF_FILES='${CONF_FILES}' \
-	AC_ABS_BUILDDIR='${abs_builddir}' \
-	AC_LIBEXECDIR='${libexecdir}' \
-	AC_DATAROOTDIR='${datarootdir}/rpki' \
-	AC_SYSCONFDIR='${sysconfdir}/rpki' \
-	${PYTHON} setup.py
-
 SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'`
 
-POW_SO	= rpki/POW/_POW.so
-
-SCRIPTS = \
-	rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \
-	pubd rootd rpkic rpkid rpki-confgen \
-	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/autoconf.py
+POW_SO = rpki/POW/_POW.so
 
-# these files get put in ${datarootdir}/rpki
-DATA_FILES = portal-gui/routeviews.sh
-
-# these files get put in ${sysconfdir}/rpki
-CONF_FILES = portal-gui/apache.conf rpki-confgen.xml
-
-all:: ${POW_SO} rpki/relaxng.py myrpki.rng rpki/sql_schemas.py ${SCRIPTS} ${BUILD_SCRIPTS}
+all:: rpki/autoconf.py ${POW_SO} rpki/relaxng.py myrpki.rng rpki/sql_schemas.py
 
 ${POW_SO}: ext/POW.c setup.py setup_autoconf.py
-	${SETUP_PY} build_ext --inplace
+	${PYTHON} setup.py build_ext --inplace
 
 clean::
 	rm -rf ${POW_SO} build dist
@@ -106,19 +67,12 @@ 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} ${SETTINGS} ${BUILD_SCRIPTS}
 
 install:: all
-	${SETUP_PY} install ${SETUP_PY_ROOT} ${SETUP_PY_INSTALL_LAYOUT} --record installed
+	${PYTHON} setup.py install ${SETUP_PY_ROOT} ${SETUP_PY_INSTALL_LAYOUT} --record installed
 	@echo
 	@echo "== Default configuration file location is ${sysconfdir}/rpki.conf =="
 	@echo
-#
-# We used to do this, but Debian/Ubuntu lintian complained that
-# /var/run may be a temporary filesystem, thus directories like this
-# should be created at boot.  Fair point.
-#
-#	if test -d ${PID_DIR}; then :; else ${INSTALL} -d ${PID_DIR}; fi
 
 uninstall deinstall::
 	xargs rm -fv <installed
@@ -203,8 +157,8 @@ all:: examples/rpki.conf
 
 GENERATE_DJANGO_SECRET_KEY = ${PYTHON} -c 'import random, string; print "".join(random.choice(string.uppercase + string.lowercase + string.digits) for _ in xrange(50))'
 
-examples/rpki.conf: rpki/autoconf.py rpki-confgen.py rpki-confgen.xml
-	${PYTHON} rpki-confgen.py \
+examples/rpki.conf: rpki/autoconf.py rpki-confgen rpki-confgen.xml
+	${PYTHON} rpki-confgen \
 		--read-xml rpki-confgen.xml \
 		--autoconf \
 		--set myrpki::handle=`hostname -f | sed 's/[.]/_/g'` \
@@ -220,62 +174,6 @@ install::
 clean::
 	rm -f examples/rpki.conf
 
-# Scripts.  This whole business of copying scripts is a holdover from
-# a more complex build process which we haven't quite finished
-# cleaning up yet.  In theory, eventually this will all be handled by
-# setup.py without any need for copying anything here.
-
-COPY_SCRIPT = cp -pf $? $@; chmod 555 $@
-
-rpki-sql-backup: rpki-sql-backup.py
-	${COPY_SCRIPT}
-
-rpki-sql-setup: rpki-sql-setup.py
-	${COPY_SCRIPT}
-
-rpki-start-servers: rpki-start-servers.py
-	${COPY_SCRIPT}
-
-irbe_cli: irbe_cli.py
-	${COPY_SCRIPT}
-
-irdbd: irdbd.py
-	${COPY_SCRIPT}
-
-pubd: pubd.py
-	${COPY_SCRIPT}
-
-rootd: rootd.py
-	${COPY_SCRIPT}
-
-rpkic: rpkic.py
-	${COPY_SCRIPT}
-
-rpkid: rpkid.py
-	${COPY_SCRIPT}
-
-rpki-confgen: rpki-confgen.py
-	${COPY_SCRIPT}
-
-# These are here for legacy reasons, but no longer required.  The problem is
-# that anyone with an existing copy of the repository will already have
-# previously built files by these names, so I can't rename them in the
-# repository, or svn will abort when the user tries to update.
-portal-gui/scripts/rpkigui-rcynic: portal-gui/scripts/rpkigui-rcynic.py
-	${COPY_SCRIPT}
-
-portal-gui/scripts/rpkigui-import-routes: portal-gui/scripts/rpkigui-import-routes.py
-	${COPY_SCRIPT}
-
-portal-gui/scripts/rpkigui-check-expired: portal-gui/scripts/rpkigui-check-expired.py
-	${COPY_SCRIPT}
-
-portal-gui/rpki.wsgi: ${srcdir}/portal-gui/rpki.wsgi.in
-	${COPY_SCRIPT}
-
-portal-gui/scripts/rpki-manage: ${srcdir}/portal-gui/scripts/rpki-manage.py
-	${COPY_SCRIPT}
-
 rpki/autoconf.py: Makefile
 	@echo 'Generating $@';					\
 	(echo '# Automatically generated.  DO NOT EDIT.';	\
@@ -288,6 +186,9 @@ rpki/autoconf.py: Makefile
 	 echo 'libexecdir     = "${libexecdir}"';		\
 	) > $@
 
+clean::
+	rm -f rpki/autoconf.py
+
 setup_autoconf.py: rpki/autoconf.py
 	@echo 'Generating $@';					\
 	(cat rpki/autoconf.py;					\
diff --git a/rpkid/irbe_cli.py b/rpkid/irbe_cli
index f8f87990..f8f87990 100644..100755
--- a/rpkid/irbe_cli.py
+++ b/rpkid/irbe_cli
diff --git a/rpkid/irdbd.py b/rpkid/irdbd
index 63370ab5..63370ab5 100644..100755
--- a/rpkid/irdbd.py
+++ b/rpkid/irdbd
diff --git a/rpkid/portal-gui/rpki.wsgi.in b/rpkid/portal-gui/rpki.wsgi
index 37bed594..37bed594 100644
--- a/rpkid/portal-gui/rpki.wsgi.in
+++ b/rpkid/portal-gui/rpki.wsgi
diff --git a/rpkid/portal-gui/scripts/rpki-manage.py b/rpkid/portal-gui/scripts/rpki-manage
index 0d581ce9..0d581ce9 100644..100755
--- a/rpkid/portal-gui/scripts/rpki-manage.py
+++ b/rpkid/portal-gui/scripts/rpki-manage
diff --git a/rpkid/portal-gui/scripts/rpkigui-check-expired.py b/rpkid/portal-gui/scripts/rpkigui-check-expired
index eb0c7fbb..eb0c7fbb 100644..100755
--- a/rpkid/portal-gui/scripts/rpkigui-check-expired.py
+++ b/rpkid/portal-gui/scripts/rpkigui-check-expired
diff --git a/rpkid/portal-gui/scripts/rpkigui-import-routes.py b/rpkid/portal-gui/scripts/rpkigui-import-routes
index fa3ff3e9..fa3ff3e9 100644..100755
--- a/rpkid/portal-gui/scripts/rpkigui-import-routes.py
+++ b/rpkid/portal-gui/scripts/rpkigui-import-routes
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic
index c8f1b994..c8f1b994 100644..100755
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic
diff --git a/rpkid/pubd.py b/rpkid/pubd
index 8445b6e1..8445b6e1 100644..100755
--- a/rpkid/pubd.py
+++ b/rpkid/pubd
diff --git a/rpkid/rootd.py b/rpkid/rootd
index 8e98bd89..8e98bd89 100644..100755
--- a/rpkid/rootd.py
+++ b/rpkid/rootd
diff --git a/rpkid/rpki-confgen.py b/rpkid/rpki-confgen
index 9913a1e5..9913a1e5 100644..100755
--- a/rpkid/rpki-confgen.py
+++ b/rpkid/rpki-confgen
diff --git a/rpkid/rpki-sql-backup.py b/rpkid/rpki-sql-backup
index 561aa4e5..561aa4e5 100644..100755
--- a/rpkid/rpki-sql-backup.py
+++ b/rpkid/rpki-sql-backup
diff --git a/rpkid/rpki-sql-setup.py b/rpkid/rpki-sql-setup
index 01de0822..01de0822 100644..100755
--- a/rpkid/rpki-sql-setup.py
+++ b/rpkid/rpki-sql-setup
diff --git a/rpkid/rpki-start-servers.py b/rpkid/rpki-start-servers
index 3babfd1c..3babfd1c 100644..100755
--- a/rpkid/rpki-start-servers.py
+++ b/rpkid/rpki-start-servers
diff --git a/rpkid/rpkic.py b/rpkid/rpkic
index 0dd1c122..0dd1c122 100644..100755
--- a/rpkid/rpkic.py
+++ b/rpkid/rpkic
diff --git a/rpkid/rpkid.py b/rpkid/rpkid
index 4f52040e..4f52040e 100644..100755
--- a/rpkid/rpkid.py
+++ b/rpkid/rpkid
diff --git a/rpkid/setup.py b/rpkid/setup.py
index c4d0fb60..79847b37 100644
--- a/rpkid/setup.py
+++ b/rpkid/setup.py
@@ -1,6 +1,6 @@
 # $Id$
 #
-# Copyright (C) 2011-2012  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,11 +20,6 @@ import os
 # We can't build POW without these settings, but allow them to be null
 # so that things like "python setup.py --help" will work.
 
-ac_scripts      = os.getenv("AC_SCRIPTS",       "").split()
-ac_aux_scripts  = os.getenv("AC_AUX_SCRIPTS",   "").split()
-ac_data_files   = os.getenv("AC_DATA_FILES",    "").split()
-ac_conf_files   = os.getenv("AC_CONF_FILES",    "").split()
-
 try:
   import setup_autoconf
   ac_cflags      = setup_autoconf.CFLAGS.split()
@@ -44,6 +39,25 @@ except ImportError:
   ac_datarootdir = None
   ac_sysconfdir  = None
 
+# Scripts and data files, moved here from Makefile.in.
+
+ac_scripts = [
+  "rpki-sql-backup", "rpki-sql-setup",
+  "rpki-start-servers", "irbe_cli", "irdbd",
+  "pubd rootd rpkic rpkid rpki-confgen",
+  "portal-gui/scripts/rpkigui-import-routes",
+  "portal-gui/scripts/rpkigui-check-expired",
+  "portal-gui/scripts/rpkigui-rcynic",
+  "portal-gui/scripts/rpki-manage" ]
+
+ac_aux_scripts = []
+
+ac_data_files = []
+
+ac_conf_files = [
+  "portal-gui/apache.conf",
+  "rpki-confgen.xml" ]
+
 # Non-standard extension build specification: we need to force
 # whatever build options our top-level ./configure selected, and we
 # have to specify our libraries as extra_link_args because they may be
diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py
index b3ad008a..b7918642 100644
--- a/rpkid/tests/smoketest.py
+++ b/rpkid/tests/smoketest.py
@@ -139,11 +139,11 @@ rcynic_name    = cfg.get("rcynic_name",    "rcynic")
 pubd_name      = cfg.get("pubd_name",      "pubd")
 
 prog_python    = cfg.get("prog_python",    sys.executable)
-prog_rpkid     = cfg.get("prog_rpkid",     "../../rpkid.py")
+prog_rpkid     = cfg.get("prog_rpkid",     "../../rpkid")
 prog_irdbd     = cfg.get("prog_irdbd",     "../old_irdbd.py")
 prog_poke      = cfg.get("prog_poke",      "../testpoke.py")
-prog_rootd     = cfg.get("prog_rootd",     "../../rootd.py")
-prog_pubd      = cfg.get("prog_pubd",      "../../pubd.py")
+prog_rootd     = cfg.get("prog_rootd",     "../../rootd")
+prog_pubd      = cfg.get("prog_pubd",      "../../pubd")
 prog_rsyncd    = cfg.get("prog_rsyncd",    "rsync")
 prog_rcynic    = cfg.get("prog_rcynic",    "../../../rcynic/rcynic")
 prog_openssl   = cfg.get("prog_openssl",   "../../../openssl/openssl/apps/openssl")