[hipl-commit] [trunk] Rev 4431: Move dnsproxy code to a subdirectory.

From: Diego Biurrun <diego@xxxxxxxxxx>
To: hipl-commit@xxxxxxxxxxxxx
Date: Wed, 28 Apr 2010 18:48:04 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 28/04/2010 at 18:48:04
Revision: 4431
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Move dnsproxy code to a subdirectory.

Modified:
  A  tools/dnsproxy/
  R  tools/DNS/ => tools/dnsproxy/DNS/
  R  tools/dnsproxy.py => tools/dnsproxy/dnsproxy.py
  R  tools/hosts.py => tools/dnsproxy/hosts.py
  R  tools/pyip6.py => tools/dnsproxy/pyip6.py
  R  tools/util.py => tools/dnsproxy/util.py
  M  Makefile.am
  M  tools/hipdnsproxy.in

=== modified file 'Makefile.am'
--- Makefile.am 2010-04-28 15:42:01 +0000
+++ Makefile.am 2010-04-28 15:47:49 +0000
@@ -410,29 +410,29 @@
                     tools/hipdnsproxy    \
                     tools/nsupdate.pl
 
-dns_PYTHON = tools/DNS/__init__.py      \
-             tools/DNS/Base.py          \
-             tools/DNS/Class.py         \
-             tools/DNS/lazy.py          \
-             tools/DNS/Lib.py           \
-             tools/DNS/Opcode.py        \
-             tools/DNS/Serialization.py \
-             tools/DNS/Status.py        \
-             tools/DNS/Type.py          \
-             tools/DNS/win32dns.py
+dns_PYTHON = tools/dnsproxy/DNS/__init__.py      \
+             tools/dnsproxy/DNS/Base.py          \
+             tools/dnsproxy/DNS/Class.py         \
+             tools/dnsproxy/DNS/lazy.py          \
+             tools/dnsproxy/DNS/Lib.py           \
+             tools/dnsproxy/DNS/Opcode.py        \
+             tools/dnsproxy/DNS/Serialization.py \
+             tools/dnsproxy/DNS/Status.py        \
+             tools/dnsproxy/DNS/Type.py          \
+             tools/dnsproxy/DNS/win32dns.py
 
-dnsdir = $(pyexecdir)/hipdnsproxy/DNS
+dnsdir = $(pyexecdir)/dnsproxy/DNS
 
 tools_hipdnskeyparse_PYTHON = tools/myasn.py       \
                               tools/parse-key-3.py
 
-tools_hipdnsproxy_PYTHON = tools/dnsproxy.py  \
-                           tools/hosts.py     \
-                           tools/pyip6.py     \
-                           tools/util.py
+tools_hipdnsproxy_PYTHON = tools/dnsproxy/dnsproxy.py          \
+                           tools/dnsproxy/hosts.py             \
+                           tools/dnsproxy/pyip6.py             \
+                           tools/dnsproxy/util.py
 
 tools_hipdnskeyparsedir = $(pyexecdir)/hipdnskeyparse
-tools_hipdnsproxydir    = $(pyexecdir)/hipdnsproxy
+tools_hipdnsproxydir    = $(pyexecdir)/dnsproxy
 endif # HAVE_PYTHON
 
 

=== added directory 'tools/dnsproxy'
=== renamed directory 'tools/DNS' => 'tools/dnsproxy/DNS'
=== modified file 'tools/hipdnsproxy.in'
--- tools/hipdnsproxy.in        2010-04-28 14:57:00 +0000
+++ tools/hipdnsproxy.in        2010-04-28 15:47:49 +0000
@@ -18,15 +18,15 @@
 #    hipdnsproxy - required for deb/rpm packaging
 
 path=$(dirname $0)
-dev_script=tools/dnsproxy.py
+dev_script=tools/dnsproxy/dnsproxy.py
 prefix=@prefix@
 
 if test ! -x $dev_script; then
-    dev_script=dnsproxy.py
+    dev_script=dnsproxy/dnsproxy.py
 fi
 
 if echo $path | grep -q /usr; then
-    python @pythondir@/hipdnsproxy/dnsproxy.py $@
+    python @pythondir@/dnsproxy/dnsproxy.py $@
 else
     python $dev_script $@
 fi
[hipl-commit] [trunk] Rev 4431: Move dnsproxy code to a subdirectory.

Other related posts:
