From 8270de20f38869dc9c0dec082f7bc59b30f2db97 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 16 Mar 2014 17:51:29 +0000 Subject: Pull from trunk. svn path=/branches/tk671/; revision=5705 --- rpkid/setup.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'rpkid/setup.py') diff --git a/rpkid/setup.py b/rpkid/setup.py index 7850d6d4..39aad552 100644 --- a/rpkid/setup.py +++ b/rpkid/setup.py @@ -26,10 +26,16 @@ except ImportError: "Fake autoconf object to let --help work without autoconf." sbindir = libexecdir = datarootdir = sysconfdir = CFLAGS = LDFLAGS = LIBS = "" +try: + from rpki.version import VERSION + +except ImportError: + VERSION = "0.0" + # pylint: disable=W0622 setup(name = "rpkitoolkit", - version = "1.0", + version = VERSION, description = "RPKI Toolkit", license = "BSD", url = "http://rpki.net/", -- cgit v1.2.3 From 5f4b6c749249d44c6d8ba569e3606767936eb67f Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sat, 29 Mar 2014 03:33:10 +0000 Subject: Debug rpki-sql-upgrade. svn path=/branches/tk671/; revision=5712 --- rpkid/setup.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'rpkid/setup.py') diff --git a/rpkid/setup.py b/rpkid/setup.py index 39aad552..956babe5 100644 --- a/rpkid/setup.py +++ b/rpkid/setup.py @@ -67,6 +67,7 @@ setup(name = "rpkitoolkit", "rpki-start-servers", "rpki-sql-backup", "rpki-sql-setup", + "rpki-sql-upgrade", "portal-gui/scripts/rpki-manage", "portal-gui/scripts/rpkigui-query-routes", "irbe_cli"]), @@ -88,4 +89,6 @@ setup(name = "rpkitoolkit", (autoconf.datarootdir + "/rpki/media/js", glob("rpki/gui/app/static/js/*")), (autoconf.datarootdir + "/rpki/media/img", - glob("rpki/gui/app/static/img/*"))]) + glob("rpki/gui/app/static/img/*")), + (autoconf.datarootdir + "/rpki/upgrade-scripts", + glob("upgrade-scripts/*"))]) -- cgit v1.2.3 From 0270668a09525e072ade32b508fbc36407a34fea Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 30 Mar 2014 05:31:18 +0000 Subject: Debug merge of rpki-sql-update into rpki-sql-setup. svn path=/branches/tk671/; revision=5717 --- rpkid/setup.py | 1 - 1 file changed, 1 deletion(-) (limited to 'rpkid/setup.py') diff --git a/rpkid/setup.py b/rpkid/setup.py index 956babe5..653d2d31 100644 --- a/rpkid/setup.py +++ b/rpkid/setup.py @@ -67,7 +67,6 @@ setup(name = "rpkitoolkit", "rpki-start-servers", "rpki-sql-backup", "rpki-sql-setup", - "rpki-sql-upgrade", "portal-gui/scripts/rpki-manage", "portal-gui/scripts/rpkigui-query-routes", "irbe_cli"]), -- cgit v1.2.3