[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5180: Install Python libraries for hipdnsproxy/hipdnskeyparse into subdirectories.
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Tue, 23 Nov 2010 19:44:32 -0000
------------------------------------------------------------
revno: 5180
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-11-23 20:40:59 +0100
message:
Install Python libraries for hipdnsproxy/hipdnskeyparse into subdirectories.
This is cleaner as it clutters the system directories less and avoids name
clashes; some of our internal Python libs have very generic names.
renamed:
tools/hipdnskeyparse/hipdnskeyparse => tools/hipdnskeyparse/hipdnskeyparse.in
modified:
.bzrignore
Makefile.am
configure.ac
tools/hipdnsproxy/hipdnsproxy.in
tools/hipdnskeyparse/hipdnskeyparse.in
--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk
Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file '.bzrignore'
--- .bzrignore 2010-11-22 17:28:01 +0000
+++ .bzrignore 2010-11-23 19:40:59 +0000
@@ -53,7 +53,7 @@
test/fw_port_bindings_performance
test/hc_performance
tools/hipconf
-tools/hipdnskeyparse
+tools/hipdnskeyparse/hipdnskeyparse
tools/hipdnsproxy/hipdnsproxy
tools/nsupdate.pl
tools/pisacert
=== modified file 'Makefile.am'
--- Makefile.am 2010-11-22 17:28:01 +0000
+++ Makefile.am 2010-11-23 19:40:59 +0000
@@ -247,7 +247,7 @@
tools/hipdnsproxy/DNS/Type.py \
tools/hipdnsproxy/DNS/win32dns.py
-dnsdir = $(pythondir)/hipdnsproxy/DNS
+dnsdir = $(pythondir)/DNS
tools_hipdnskeyparse_PYTHON = tools/hipdnskeyparse/myasn.py
@@ -255,8 +255,8 @@
tools/hipdnsproxy/pyip6.py \
tools/hipdnsproxy/util.py
-tools_hipdnskeyparsedir = $(pythondir)
-tools_hipdnsproxydir = $(pythondir)
+tools_hipdnskeyparsedir = $(pythondir)/hipdnskeyparse
+tools_hipdnsproxydir = $(pythondir)/hipdnsproxy
### misc stuff ###
=== modified file 'configure.ac'
--- configure.ac 2010-11-19 22:13:31 +0000
+++ configure.ac 2010-11-23 19:40:59 +0000
@@ -102,6 +102,10 @@
AC_DEFINE_UNQUOTED(HIPL_CONFIG_FILE, "$(eval echo ${sysconfdir}/hipd_config)")
AH_TEMPLATE(HIPL_CONFIG_FILE, [default config file location])
+# Make sure that pythondir does not contain ${prefix} or similar so that it
+# can be substituted into our Python scripts.
+AC_SUBST(pythondir, $(eval echo $pythondir))
+
# Set default AM_CFLAGS for the complete project.
@@ -249,6 +253,7 @@
AC_CONFIG_FILES([ Makefile
doc/Doxyfile
doc/HOWTO.xml
+ tools/hipdnskeyparse/hipdnskeyparse
tools/hipdnsproxy/hipdnsproxy
tools/nsupdate.pl ])
=== renamed file 'tools/hipdnskeyparse/hipdnskeyparse' =>
'tools/hipdnskeyparse/hipdnskeyparse.in'
--- tools/hipdnskeyparse/hipdnskeyparse 2010-04-28 17:09:59 +0000
+++ tools/hipdnskeyparse/hipdnskeyparse.in 2010-11-23 19:40:59 +0000
@@ -3,12 +3,14 @@
import sys
import getopt
import os
-import myasn
import binascii
import re
import sha
import struct
+sys.path.append('@pythondir@/hipdnskeyparse')
+import myasn
+
def usage(utyp, *msg):
sys.stderr.write('Usage: %s\n' % os.path.split(sys.argv[0])[1])
if msg:
=== modified file 'tools/hipdnsproxy/hipdnsproxy.in'
--- tools/hipdnsproxy/hipdnsproxy.in 2010-10-29 12:51:08 +0000
+++ tools/hipdnsproxy/hipdnsproxy.in 2010-11-23 19:40:59 +0000
@@ -57,6 +57,7 @@
import errno
#local imports
+sys.path.append('@pythondir@/hipdnsproxy')
import hosts
import util
import DNS
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5180: Install Python libraries for hipdnsproxy/hipdnskeyparse into subdirectories. - noreply
