[hipl-commit] [trunk] Rev 4434: Properly resolve hipdnskeyparse installation.

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

Log:
  Properly resolve hipdnskeyparse installation.
  
  Drop the wrapper that invokes the tool and just install the tool into a
  system path directly. Dependent Python modules are also installed into
  system directories, where they belong.
  
  This includes renaming the Python tool to the name of the wrapper, thus
  removing one layer of indirection.

Modified:
  D  tools/hipdnskeyparse.in
  A  tools/hipdnskeyparse/
  R  tools/myasn.py => tools/hipdnskeyparse/myasn.py
  R  tools/parse-key-3.py => tools/hipdnskeyparse/hipdnskeyparse
  M  Makefile.am
  M  configure.ac
  M  doc/HOWTO.xml
  M  test/packaging/create-deb.sh
  M  test/packaging/hipl-deb.spec
  M  test/packaging/hipl-rpm.spec

=== modified file 'Makefile.am'
--- Makefile.am 2010-04-28 16:16:26 +0000
+++ Makefile.am 2010-04-28 17:09:59 +0000
@@ -406,7 +406,7 @@
 if HAVE_PYTHON
 # These two scripts are generated in the end to get the python paths correct.
 # Currently, I don't know a better way to deal with the python code. -miika
-dist_sbin_SCRIPTS = tools/hipdnskeyparse \
+dist_sbin_SCRIPTS = tools/hipdnskeyparse/hipdnskeyparse \
                     tools/hipdnsproxy    \
                     tools/nsupdate.pl
 
@@ -423,15 +423,14 @@
 
 dnsdir = $(pyexecdir)/dnsproxy/DNS
 
-tools_hipdnskeyparse_PYTHON = tools/myasn.py       \
-                              tools/parse-key-3.py
+tools_hipdnskeyparse_PYTHON = tools/hipdnskeyparse/myasn.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_hipdnskeyparsedir = $(pyexecdir)
 tools_hipdnsproxydir    = $(pyexecdir)/dnsproxy
 endif # HAVE_PYTHON
 

=== modified file 'configure.ac'
--- configure.ac        2010-04-28 14:30:45 +0000
+++ configure.ac        2010-04-28 17:09:59 +0000
@@ -327,6 +327,6 @@
 fi
 
 
-AC_CONFIG_FILES([ Makefile doc/Doxyfile tools/hipdnskeyparse tools/hipdnsproxy 
])
+AC_CONFIG_FILES([ Makefile doc/Doxyfile tools/hipdnsproxy ])
 
 AC_OUTPUT

=== modified file 'doc/HOWTO.xml'
--- doc/HOWTO.xml       2010-04-20 10:34:37 +0000
+++ doc/HOWTO.xml       2010-04-28 17:09:59 +0000
@@ -2653,7 +2653,7 @@
 .... | sed -n -e '/^DJBDNS */s///p'
       </programlisting>
       a line for Dan Bernstein's tinydns is output. For further
-      information, please refer to parse-key-3.py and myasn.py.
+      information, please refer to hipdnskeyparse and myasn.py.
     </para>
   </section>
 

=== modified file 'test/packaging/create-deb.sh'
--- test/packaging/create-deb.sh        2010-04-28 12:49:35 +0000
+++ test/packaging/create-deb.sh        2010-04-28 17:09:59 +0000
@@ -368,14 +368,14 @@
     inst tools/pyip6.py* $PKGDIR/$PYEXECDIR/hipdnsproxy
     inst tools/hosts.py* $PKGDIR/$PYEXECDIR/hipdnsproxy
     inst tools/util.py* $PKGDIR/$PYEXECDIR/hipdnsproxy
-    inst tools/parse-key-3.py* $PKGDIR/$PYEXECDIR/hipdnsproxy
 
-    inst tools/myasn.py* $PKGDIR/$PYEXECDIR/hipdnskeyparse
+    inst tools/hipdnskeyparse/myasn.py* $PKGDIR/$PYEXECDIR
     inst tools/DNS/*py* $PKGDIR/$PYEXECDIR/DNS
 
     inst tools/hipdnsproxy $PKGDIR/usr/sbin/hipdnsproxy
     inst tools/hipdnskeyparse $PKGDIR/usr/sbin/hipdnskeyparse
 
+    inst tools/hipdnskeyparse/hipdnskeyparse $PKGDIR/usr/sbin
     inst tools/nsupdate.pl $PKGDIR/usr/sbin
 
     echo "** Copying init.d script to $PKGDIR"

=== modified file 'test/packaging/hipl-deb.spec'
--- test/packaging/hipl-deb.spec        2010-04-19 15:48:28 +0000
+++ test/packaging/hipl-deb.spec        2010-04-28 17:09:59 +0000
@@ -148,10 +148,8 @@
 install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy 
tools/pyip6.py*
 install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy 
tools/hosts.py*
 install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnsproxy 
tools/util.py*
-install -d %{buildroot}/usr/lib/python2.6/dist-packages/hipdnskeyparse
-install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnskeyparse 
tools/parse-key-3.py*
-install -t %{buildroot}/usr/lib/python2.6/dist-packages/hipdnskeyparse 
tools/myasn.py*
-install -m 755 tools/hipdnskeyparse %{buildroot}/usr/sbin/hipdnskeyparse
+install -t %{buildroot}/usr/lib/python2.6/dist-packages 
tools/hipdnskeyparse/myasn.py*
+install -m 755 tools/hipdnskeyparse/hipdnskeyparse 
%{buildroot}/usr/sbin/hipdnskeyparse
 install -m 755 tools/hipdnsproxy %{buildroot}/usr/sbin/hipdnsproxy
 install -m 755 agent/hipagent %{buildroot}/usr/sbin/hipagent
 

=== modified file 'test/packaging/hipl-rpm.spec'
--- test/packaging/hipl-rpm.spec        2010-04-15 06:29:34 +0000
+++ test/packaging/hipl-rpm.spec        2010-04-28 17:09:59 +0000
@@ -136,11 +136,9 @@
 install -t %{buildroot}%{python_sitelib}/hipdnsproxy tools/pyip6.py*
 install -t %{buildroot}%{python_sitelib}/hipdnsproxy tools/hosts.py*
 install -t %{buildroot}%{python_sitelib}/hipdnsproxy tools/util.py*
-install -d %{buildroot}%{python_sitelib}/hipdnskeyparse
-install -t %{buildroot}%{python_sitelib}/hipdnskeyparse tools/parse-key-3.py*
-install -t %{buildroot}%{python_sitelib}/hipdnskeyparse tools/myasn.py*
+install -t %{buildroot}%{python_sitelib} tools/hipdnskeyparse/myasn.py*
 # required in CentOS release 5.2
-install -m 755 tools/hipdnskeyparse %{buildroot}%{prefix}/sbin/hipdnskeyparse
+install -m 755 tools/hipdnskeyparse/hipdnskeyparse 
%{buildroot}%{prefix}/sbin/hipdnskeyparse
 install -m 755 tools/hipdnsproxy %{buildroot}%{prefix}/sbin/hipdnsproxy
 
 %post lib

=== added directory 'tools/hipdnskeyparse'
[hipl-commit] [trunk] Rev 4434: Properly resolve hipdnskeyparse installation.

Other related posts:
