[hipl-commit] [trunk] Rev 4465: Move packaging directory to the top level; the test subdir is not a good place.

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Tue, 4 May 2010 23:58:51 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 04/05/2010 at 23:58:51
Revision: 4465
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Move packaging directory to the top level; the test subdir is not a good 
place.

Modified:
  R  test/packaging/ => packaging/
  M  Makefile.am
  M  doc/HACKING
  M  doc/HOWTO.xml
  M  packaging/create-deb.sh
  M  packaging/create-package.sh
  M  packaging/hipl-deb.spec
  M  packaging/hipl-rpm.spec
  M  patches/opendht/how-to-steps

=== modified file 'Makefile.am'
--- Makefile.am 2010-05-04 17:13:38 +0000
+++ Makefile.am 2010-05-04 20:58:15 +0000
@@ -6,7 +6,7 @@
 EXTRA_DIST =  .vimrc debian doc patches release.version version.h
 EXTRA_DIST += i3/i3-cfg-PL.xml i3/aeshash/aescpp.hh i3/i3/i3_debug.c 
i3/utils/netwrap_win32.c
 EXTRA_DIST += lib/ipsec/policy_parse.c lib/ipsec/policy_parse.y 
lib/ipsec/policy_token.l
-EXTRA_DIST += test/maintainer test/packaging
+EXTRA_DIST += packaging test/maintainer
 EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/agent/,*.lang))
 EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/lib/dht/,*.txt))
 EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/lib/ipsec/,*.3))
@@ -450,7 +450,7 @@
 
 # The olddeb target is for maemo builds only
 bin deb increl olddeb rpm syncrepo:
-       env PYEXECDIR=$(pyexecdir) @srcdir@/test/packaging/create-package.sh $@
+       env PYEXECDIR=$(pyexecdir) @srcdir@/packaging/create-package.sh $@
 
 autotools-clean: maintainer-clean
        rm -f aclocal.m4 compile config.* configure depcomp install-sh
@@ -473,7 +473,7 @@
 # Ensure that version.h is created before everything else. This does not work
 # when creating specific objects that may depend on version.h directly.
 BUILT_SOURCES = version.h
-$(srcdir)/version.h: $(wildcard $(srcdir)/.bzr/branch/last-revision)
+$(srcdir)/version.h: $(wildcard $(srcdir)/.bzr/branch/last-revision) Makefile
        echo "$$(bzr version-info $(srcdir) --custom --template="#define 
BZR_REVISION \"{revno}\"\n\n#define BZR_BRANCH \"{branch_nick}\"")" > $@
 
 # The complete doc/ subdirectory is in EXTRA_DIST, so files that should

=== modified file 'doc/HACKING'
--- doc/HACKING 2010-05-03 16:43:45 +0000
+++ doc/HACKING 2010-05-04 20:58:15 +0000
@@ -966,7 +966,7 @@
 scripts for building user space packages exist.
 
 
-There are scripts in directory test/packaging that can be used to create
+There are scripts in the 'packaging' directory that can be used to create
 binary packages. The aim for these packages is for easier testing of HIPL
 software. With the scripts, RPM (e.g. for Fedora Core) and DEB (for Debian)
 packages can be created.
@@ -981,7 +981,7 @@
 script. That is, login as root and copy the source package (e.g.
 hipl-userspace-1.0-1.tgz) to directory /usr/src/redhat/SOURCES. Then
 issue the command "rpmbuild -ba
-<hiplroot>/test/packaging/hiplx.spec".  When everyting
+<hiplroot>/packaging/hiplx.spec".  When everything
 is finished successfully, there will be a binary RPM package
 "/usr/src/rpm/RPMS/i386/hipl-userspace-1.0-1.i386.rpm". The package
 can then be installed with rpm -i.

=== modified file 'doc/HOWTO.xml'
--- doc/HOWTO.xml       2010-05-03 16:43:45 +0000
+++ doc/HOWTO.xml       2010-05-04 20:58:15 +0000
@@ -1579,7 +1579,7 @@
       </programlisting></para>
 
       <para>
-      The packages will be created in test/packaging/
+      The packages will be created in packaging/
       </para>
 
       </section>

=== renamed directory 'test/packaging' => 'packaging'
=== modified file 'packaging/create-deb.sh'
--- test/packaging/create-deb.sh        2010-04-28 17:49:19 +0000
+++ packaging/create-deb.sh     2010-05-04 20:58:15 +0000
@@ -51,7 +51,7 @@
 DEBIAN=${DEBARCH}/DEBIAN
 DEBIANGPL=$DEBARCH/DEBIAN-hiptool
 CORPORATE=
-PKGROOT=$PWD/test/packaging
+PKGROOT=$PWD/packaging
 PKGDIR=$PKGROOT/${NAME}${PKG_SUFFIX}-deb
 PKGDIR_SRC=$PKGROOT/${NAME}${PKG_SUFFIX}-deb-src
 SRCDIR=${PKGDIR_SRC}/${NAME}${SUFFIX}
@@ -316,7 +316,7 @@
 
     inst hipd/hipd $PKGDIR/usr/sbin/
     echo "** Copying init.d script to $PKGDIR"
-    inst test/packaging/debian-init.d-hipd $PKGDIR/etc/init.d/hipd
+    inst packaging/debian-init.d-hipd $PKGDIR/etc/init.d/hipd
 
     PKGNAME="${NAME}-$TMP-${TMPNAME}.${POSTFIX}"
     create_sub_package;
@@ -337,7 +337,7 @@
     inst firewall/hipfw $PKGDIR/usr/sbin/
 
     echo "** Copying init.d script to $PKGDIR"
-    inst test/packaging/debian-init.d-hipfw $PKGDIR/etc/init.d/hipfw
+    inst packaging/debian-init.d-hipfw $PKGDIR/etc/init.d/hipfw
 
     PKGNAME="${NAME}-$TMP-${TMPNAME}.${POSTFIX}"
     create_sub_package;
@@ -379,7 +379,7 @@
     inst tools/nsupdate.pl $PKGDIR/usr/sbin
 
     echo "** Copying init.d script to $PKGDIR"
-    inst test/packaging/debian-init.d-dnsproxy $PKGDIR/etc/init.d/hipdnsproxy
+    inst packaging/debian-init.d-dnsproxy $PKGDIR/etc/init.d/hipdnsproxy
 
     PKGNAME="${NAME}-$TMP-${TMPNAME}.${POSTFIX}"
     create_sub_package;
@@ -400,7 +400,7 @@
     inst tools/hipconf $PKGDIR/usr/sbin/
 
     echo "** Copying init.d script to $PKGDIR"
-    inst test/packaging/debian-init.d-dnsproxy $PKGDIR/etc/init.d/hipdnsproxy
+    inst packaging/debian-init.d-dnsproxy $PKGDIR/etc/init.d/hipdnsproxy
 
     PKGNAME="${NAME}-$TMP-${TMPNAME}.${POSTFIX}"
     create_sub_package;

=== modified file 'packaging/create-package.sh'
--- test/packaging/create-package.sh    2010-03-30 15:59:20 +0000
+++ packaging/create-package.sh 2010-05-04 20:58:15 +0000
@@ -3,7 +3,7 @@
 VERSION=
 NAME=hipl
 PKGROOT=$PWD
-PKGEXE=$PKGROOT/test/packaging
+PKGEXE=$PKGROOT/packaging
 PKG_WEB_DIR=
 PKG_SERVER_DIR=
 DEBDIR=$PWD/debbuild

=== modified file 'packaging/hipl-deb.spec'
--- test/packaging/hipl-deb.spec        2010-04-28 17:49:19 +0000
+++ packaging/hipl-deb.spec     2010-05-04 20:58:15 +0000
@@ -137,9 +137,9 @@
 install -d %{buildroot}/etc/init.d
 install -d %{buildroot}/doc
 make DESTDIR=%{buildroot} install
-install -m 755 test/packaging/debian-init.d-hipfw %{buildroot}/etc/init.d/hipfw
-install -m 755 test/packaging/debian-init.d-hipd %{buildroot}/etc/init.d/hipd
-install -m 755 test/packaging/debian-init.d-dnsproxy 
%{buildroot}/etc/init.d/hipdnsproxy
+install -m 755 packaging/debian-init.d-hipfw %{buildroot}/etc/init.d/hipfw
+install -m 755 packaging/debian-init.d-hipd %{buildroot}/etc/init.d/hipd
+install -m 755 packaging/debian-init.d-dnsproxy 
%{buildroot}/etc/init.d/hipdnsproxy
 install -m 644 doc/HOWTO.txt %{buildroot}/doc
 install -d %{buildroot}/usr/lib/python2.6/dist-packages/DNS
 install -t %{buildroot}/usr/lib/python2.6/dist-packages/DNS 
tools/hipdnsproxy/DNS/*py*

=== modified file 'packaging/hipl-rpm.spec'
--- test/packaging/hipl-rpm.spec        2010-04-28 17:49:19 +0000
+++ packaging/hipl-rpm.spec     2010-05-04 20:58:15 +0000
@@ -125,9 +125,9 @@
 install -d %{buildroot}/etc/rc.d/init.d
 install -d %{buildroot}/doc
 make DESTDIR=%{buildroot} install
-install -m 755 test/packaging/rh-init.d-hipfw 
%{buildroot}/etc/rc.d/init.d/hipfw
-install -m 755 test/packaging/rh-init.d-hipd %{buildroot}/etc/rc.d/init.d/hipd
-install -m 755 test/packaging/rh-init.d-dnsproxy 
%{buildroot}/etc/rc.d/init.d/hipdnsproxy
+install -m 755 packaging/rh-init.d-hipfw %{buildroot}/etc/rc.d/init.d/hipfw
+install -m 755 packaging/rh-init.d-hipd %{buildroot}/etc/rc.d/init.d/hipd
+install -m 755 packaging/rh-init.d-dnsproxy 
%{buildroot}/etc/rc.d/init.d/hipdnsproxy
 install -m 644 doc/HOWTO.txt %{buildroot}/doc
 install -d %{buildroot}%{python_sitelib}/DNS
 install -t %{buildroot}%{python_sitelib}/DNS tools/hipdnsproxy/DNS/*py*

=== modified file 'patches/opendht/how-to-steps'
--- patches/opendht/how-to-steps        2010-02-20 21:16:48 +0000
+++ patches/opendht/how-to-steps        2010-05-04 20:58:15 +0000
@@ -41,7 +41,7 @@
 
 
 
-In test/packaging/ inside hipd code, there are some sample /etc/init.d/ 
scripts for running both bamboo versions (ipv4 and ipv6) on fedora and ubuntu:
+In packaging/ inside hipl code, there are some sample /etc/init.d/ scripts for 
running both bamboo versions (ipv4 and ipv6) on fedora and ubuntu:
         ubuntu-init.d-bamboo_v4
         ubuntu-init.d-bamboo_v6
         fedora-init.d-bamboo_v4

Other related posts:

  • » [hipl-commit] [trunk] Rev 4465: Move packaging directory to the top level; the test subdir is not a good place. - Diego Biurrun