Move all Python script installation to setup.py, so that it gets the

name of the Python executable right (FreeBSD $PATH under cron problem,
again, yet another variant).  See #686.

svn path=/trunk/; revision=5792

8 files changed, 36 insertions, 64 deletions

diff --git a/rp/rcynic/Makefile.in b/rp/rcynic/Makefile.in
index d0edfca3..a2d844bd 100644
--- a/rp/rcynic/Makefile.in
+++ b/rp/rcynic/Makefile.in
@@ -63,8 +63,6 @@ RPKIRTR_GROUP		= rpkirtr
 RPKIRTR_MODE		= 775
 RPKIRTR_USER		= rpkirtr
 
-SCRIPTS = rcynic-text rcynic-html rcynic-svn validation_status rcynic-cron
-
 all: ${BIN} ${RCYNIC_STATIC_RSYNC}
 
 clean:
@@ -110,7 +108,7 @@ static-rsync/rsync:
 install: all ${RCYNIC_INSTALL_TARGETS}
 
 install-always: \
-	install-directories install-scripts install-rcynic install-rcynic-conf
+	install-directories install-rcynic install-rcynic-conf
 
 install-postconf: \
 	install-user-and-group install-directory-ownership install-crontab
@@ -163,29 +161,6 @@ install-static-rsync: ${RCYNIC_DIR}/bin/rsync
 ${RCYNIC_DIR}/bin/rsync: static-rsync/rsync
 	${INSTALL} -p -m 555 static-rsync/rsync $@
 
-install-scripts: \
-	${DESTDIR}${bindir} \
-	${DESTDIR}${bindir}/rcynic-text \
-	${DESTDIR}${bindir}/rcynic-html \
-	${DESTDIR}${bindir}/rcynic-svn \
-	${DESTDIR}${bindir}/rcynic-cron \
-	${DESTDIR}${bindir}/validation_status
-
-${DESTDIR}${bindir}/rcynic-text: rcynic-text
-	${INSTALL} -p -m 555 rcynic-text $@
-
-${DESTDIR}${bindir}/rcynic-html: rcynic-html
-	${INSTALL} -p -m 555 rcynic-html $@
-
-${DESTDIR}${bindir}/rcynic-svn: rcynic-svn
-	${INSTALL} -p -m 555 rcynic-svn $@
-
-${DESTDIR}${bindir}/rcynic-cron: rcynic-cron
-	${INSTALL} -p -m 555 rcynic-cron $@
-
-${DESTDIR}${bindir}/validation_status: validation_status
-	${INSTALL} -p -m 555 validation_status $@
-
 .FORCE:
 
 install-crontab: .FORCE
diff --git a/rp/rpki-rtr/Makefile.in b/rp/rpki-rtr/Makefile.in
index e587305b..11b493f0 100644
--- a/rp/rpki-rtr/Makefile.in
+++ b/rp/rpki-rtr/Makefile.in
@@ -25,21 +25,11 @@ RTR_ORIGIN_INSTALL_TARGETS = @RCYNIC_INSTALL_TARGETS@
 
 RPKI_RTR_PORT	= 43779
 
-SCAN_ROAS	= ${bindir}/scan_roas
-
-
-all clean test::
+all clean test deinstall uninstall::
 	@true
 
 install: all ${RTR_ORIGIN_INSTALL_TARGETS}
 
-install-binary:
-	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -m 555 -d ${DESTDIR}${bindir}; fi
-	${INSTALL} -m 555 ${BIN} ${DESTDIR}${bindir}/${BIN}
-
-deinstall uninstall:
-	rm -f ${DESTDIR}${bindir}/${BIN}
-
 distclean: clean
 	rm -rf current sockets *.ax *.ix.*
 	rm -f Makefile
diff --git a/rp/rpki-rtr/rules.darwin.mk b/rp/rpki-rtr/rules.darwin.mk
index 1230db92..06762bcd 100644
--- a/rp/rpki-rtr/rules.darwin.mk
+++ b/rp/rpki-rtr/rules.darwin.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-install-always: install-binary
+install-always:
 
 install-postconf: install-listener
 
diff --git a/rp/rpki-rtr/rules.freebsd.mk b/rp/rpki-rtr/rules.freebsd.mk
index df99da47..c58e6332 100644
--- a/rp/rpki-rtr/rules.freebsd.mk
+++ b/rp/rpki-rtr/rules.freebsd.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-install-always: install-binary
+install-always:
 
 install-postconf: install-listener
 
diff --git a/rp/rpki-rtr/rules.linux.mk b/rp/rpki-rtr/rules.linux.mk
index 23f90f69..51c27b6b 100644
--- a/rp/rpki-rtr/rules.linux.mk
+++ b/rp/rpki-rtr/rules.linux.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-install-always: install-binary install-listener
+install-always: install-listener
 
 install-postconf:
 	@true
diff --git a/rp/rpki-rtr/rules.unknown.mk b/rp/rpki-rtr/rules.unknown.mk
index fb16e93a..a91b7f8d 100644
--- a/rp/rpki-rtr/rules.unknown.mk
+++ b/rp/rpki-rtr/rules.unknown.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-install-always: install-binary
+install-always:
 
 install-postconf: install-listener
 
diff --git a/rp/utils/Makefile.in b/rp/utils/Makefile.in
index b4a178ff..1ff248e8 100644
--- a/rp/utils/Makefile.in
+++ b/rp/utils/Makefile.in
@@ -23,8 +23,6 @@ abs_top_builddir = @abs_top_builddir@
 
 BINS		= find_roa hashdir print_rpki_manifest print_roa scan_roas uri
 
-SCRIPTS		= scan_routercerts find-roa-expiration
-
 all:: ${BINS}
 
 clean::
@@ -32,10 +30,10 @@ clean::
 
 install:: all
 	if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -d ${DESTDIR}${bindir}; fi
-	${INSTALL} ${BINS} ${SCRIPTS} ${DESTDIR}${bindir}
+	${INSTALL} ${BINS} ${DESTDIR}${bindir}
 
 deinstall uninstall::
-	for i in ${BINS} ${SCRIPTS}; do rm -f ${DESTDIR}${bindir}/$$i; done
+	for i in ${BINS}; do rm -f ${DESTDIR}${bindir}/$$i; done
 
 distclean:: clean
 	rm -f Makefile
@@ -64,7 +62,7 @@ RSYNC_AUTH_DIR	= ${abs_top_builddir}/rp/rcynic/rcynic-data/authenticated
 HASHDIR_OUTPUT	= hashed-pem-dir
 TARGET_PREFIXES	= 10.3.0.44 10.2.0.6 10.0.0.0/24
 
-test:: ${BINS} ${SCRIPTS}
+test:: ${BINS}
 	if test -d ${RSYNC_AUTH_DIR}; \
 	then \
 	    rm -rf ${HASHDIR_OUTPUT} ; \
diff --git a/setup.py b/setup.py
index 86f40983..605e3ff5 100644
--- a/setup.py
+++ b/setup.py
@@ -46,10 +46,7 @@ setup_args = dict(
   cmdclass      = {"build_scripts"   : setup_extensions.build_scripts,
                    "install_scripts" : setup_extensions.install_scripts})
 
-# If and when we start using setup.py to install RP scripts or start
-# trying to separate RP and CA modules in the rpki package tree, we'll
-# need to do something about sharing "packages", "scripts", etc.
-# Write that code when we need it.
+scripts         = []
 
 if autoconf.RP_TARGET == "rp":
   setup_args.update(
@@ -74,9 +71,32 @@ if autoconf.RP_TARGET == "rp":
                     "rpki.gui.cacheview" :
                     ["templates/*/*.html"]})
 
+  scripts      += [(autoconf.bindir,
+                    ["rp/rcynic/rcynic-text",
+                     "rp/rcynic/rcynic-html",
+                     "rp/rcynic/rcynic-svn",
+                     "rp/rcynic/validation_status",
+                     "rp/rcynic/rcynic-cron",
+                     "rp/rpki-rtr/rtr-origin",
+                     "rp/utils/scan_routercerts",
+                     "rp/utils/find-roa-expiration"])]
+
 if autoconf.CA_TARGET == "ca":
   setup_args.update(
-    scripts     = [(autoconf.sbindir,
+    data_files  = [(autoconf.sysconfdir  + "/rpki",
+                    ["ca/rpki-confgen.xml"]),
+                   (autoconf.datarootdir + "/rpki/wsgi",
+                    ["ca/rpki.wsgi"]),
+                   (autoconf.datarootdir + "/rpki/media/css",
+                    glob("rpki/gui/app/static/css/*")),
+                   (autoconf.datarootdir + "/rpki/media/js",
+                    glob("rpki/gui/app/static/js/*")),
+                   (autoconf.datarootdir + "/rpki/media/img",
+                    glob("rpki/gui/app/static/img/*")),
+                   (autoconf.datarootdir + "/rpki/upgrade-scripts",
+                    glob("ca/upgrade-scripts/*"))])
+
+  scripts      += [(autoconf.sbindir,
                     ["ca/rpkic",
                      "ca/rpki-confgen",
                      "ca/rpki-start-servers",
@@ -93,18 +113,7 @@ if autoconf.CA_TARGET == "ca":
                      "ca/rpkigui-import-routes",
                      "ca/rpkigui-check-expired",
                      "ca/rpkigui-rcynic",
-                     "ca/rpkigui-apache-conf-gen"])],
-    data_files  = [(autoconf.sysconfdir  + "/rpki",
-                    ["ca/rpki-confgen.xml"]),
-                   (autoconf.datarootdir + "/rpki/wsgi",
-                    ["ca/rpki.wsgi"]),
-                   (autoconf.datarootdir + "/rpki/media/css",
-                    glob("rpki/gui/app/static/css/*")),
-                   (autoconf.datarootdir + "/rpki/media/js",
-                    glob("rpki/gui/app/static/js/*")),
-                   (autoconf.datarootdir + "/rpki/media/img",
-                    glob("rpki/gui/app/static/img/*")),
-                   (autoconf.datarootdir + "/rpki/upgrade-scripts",
-                    glob("ca/upgrade-scripts/*"))])
+                     "ca/rpkigui-apache-conf-gen"])]
 
+setup_args.update(scripts = scripts)
 setup(**setup_args)