Nut upsdev - Jul 2008 - r1515 - branches/trunk-make-package: anybody interested in taking over?

Hi,

I've taken a small bit of time to initiate this work.
There is now:
- an m4 macro to detect the system (linux only ATM, but simple to complete)
- a set of "make package" targets throughout the tree (limited to
debian
ATM)

The remaining tasks on this specific point are:
- m4 macro completion to handle all the supported platforms (at least the
ones that have files in the packaging/ dir)
- update and complete the packaging/ dir with the matching file (debian,
redhat, gentoo, ...) from the distributors, possibly using the existing
files for scripts/ dir
- complete the prerequisite stage of the target (ensure the build env. is
ok)

On my side, and on the packaging topic, I still have to complete the
doc/packaging.txt file (not that far!).

cheers,
Arnaud

2008/7/17 Arnaud Quette <aquette at alioth.debian.org>:
> Author: aquette
> Date: Thu Jul 17 14:27:24 2008
> New Revision: 1515
>
> Log:
> make-package and packaging related branch
>
>
> Added:
>   branches/trunk-make-package/
>      - copied from r1505, /trunk/
>   branches/trunk-make-package/ChangeLog
>      - copied, changed from r1511, /trunk/ChangeLog
>   branches/trunk-make-package/clients/upsclient.c
>      - copied unchanged from r1507, /trunk/clients/upsclient.c
>   branches/trunk-make-package/configure.in
>      - copied, changed from r1511, /trunk/configure.in
>   branches/trunk-make-package/data/driver.list
>      - copied, changed from r1506, /trunk/data/driver.list
>   branches/trunk-make-package/drivers/
>      - copied from r1510, /trunk/drivers/
>   branches/trunk-make-package/drivers/main-hal.c
>      - copied unchanged from r1511, /trunk/drivers/main-hal.c
>   branches/trunk-make-package/m4/nut_check_libhal.m4
>      - copied unchanged from r1511, /trunk/m4/nut_check_libhal.m4
>   branches/trunk-make-package/packaging/debian/po/
>      - copied from r1505, /branches/Testing/packaging/debian/po/
>   branches/trunk-make-package/scripts/
>      - copied from r1510, /trunk/scripts/
> Modified:
>   branches/trunk-make-package/Makefile.am
>   branches/trunk-make-package/docs/macros.txt
>   branches/trunk-make-package/drivers/libshut.c
>   branches/trunk-make-package/packaging/Makefile.am
>   branches/trunk-make-package/packaging/debian/Makefile.am
>
> Modified: branches/trunk-make-package/Makefile.am
>
>
=============================================================================>
--- /trunk/Makefile.am  (original)
> +++ branches/trunk-make-package/Makefile.am     Thu Jul 17 14:27:24 2008
> @@ -26,6 +26,10 @@
>  distcheck-light:
>        $(MAKE) $(AM_MAKEFLAGS)
DISTCHECK_FLAGS="$(DISTCHECK_LIGHT_FLAGS)"
> distcheck
>
> +package:
> +       @echo "Creating package(s) for $(OS_NAME)"
> +       cd packaging; $(MAKE) $(AM_MAKEFLAGS) $(OS_NAME)
> +
>  # ----------------------------------------------------------------------
>  # targets from old build system (pre-automake).
>  # supported for a period of time for backward "compatibility".
>
> Modified: branches/trunk-make-package/docs/macros.txt
>
>
=============================================================================>
--- /trunk/docs/macros.txt      (original)
> +++ branches/trunk-make-package/docs/macros.txt Thu Jul 17 14:27:24 2008
> @@ -2,6 +2,7 @@
>  File: macros.txt
>  Date: 27 December 2006
>  Auth: Peter Selinger <selinger at users.sourceforge.net>
> +      Arnaud Quette <aquette.dev at gmail.com>
>
>  The following NUT-specific autoconf macros are defined in the m4/
>  directory.
> @@ -43,6 +44,11 @@
>    if all the required features are present. Set nut_have_ipv6=no
>    otherwise.
>
> + - Macro: NUT_CHECK_OS
> +   Check for the exact system name and type. This is only used at the
> +   moment to determine the packaging rule to be used through the
> +   OS_NAME variable.
> +
>  - Macro: NUT_REPORT_FEATURE(FEATURE, VALUE)
>    Schedule a line for the end-of-configuration feature summary.  The
>    FEATURE is a descriptive string such that the sentence "Checking
>
> Modified: branches/trunk-make-package/drivers/libshut.c
>
>
=============================================================================>
--- /trunk/drivers/libshut.c    (original)
> +++ branches/trunk-make-package/drivers/libshut.c       Thu Jul 17 14:27:24
> 2008
> @@ -911,6 +911,10 @@
>                                break;
>                        case -3:
>                                /* FIXME: notification caught => to be
> processed */
> +
> +                               /* Send a NACK for the moment, to get a
> resend from the UPS */
> +                               ser_send_char(upsfd, SHUT_NOK);
> +                               Retry++;
>                        default:
>                                ;
>                }
>
> Modified: branches/trunk-make-package/packaging/Makefile.am
>
>
=============================================================================>
--- /trunk/packaging/Makefile.am        (original)
> +++ branches/trunk-make-package/packaging/Makefile.am   Thu Jul 17 14:27:24
> 2008
> @@ -1,2 +1,8 @@
> +ubuntu:
> +       cd debian; $(MAKE) $(AM_MAKEFLAGS) package
> +
> +debian:
> +       cd debian; $(MAKE) $(AM_MAKEFLAGS) package
> +
>  SUBDIRS = debian mandriva redhat opensuse generic-rpm
>  EXTRA_DIST = README
>
> Modified: branches/trunk-make-package/packaging/debian/Makefile.am
>
>
=============================================================================>
--- /trunk/packaging/debian/Makefile.am (original)
> +++ branches/trunk-make-package/packaging/debian/Makefile.am    Thu Jul 17
> 14:27:24 2008
> @@ -1,3 +1,7 @@
> +# FIXME: meet the build prereq (build-essential devscripts) + orig.tgz
> (dist + ln -sf)!
> +package:
> +       cd $(top_srcdir); ln -sf packaging/debian && debuild -us
-uc
> +
>  # Please keep this file sorted, with one file entry per line. This makes
> it
>  # easier to track changes.
>  EXTRA_DIST = \
>
> _______________________________________________
> nut-commits mailing list
> nut-commits at lists.alioth.debian.org
> http://lists.alioth.debian.org/mailman/listinfo/nut-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL:
http://lists.alioth.debian.org/pipermail/nut-upsdev/attachments/20080717/8ae3c64a/attachment.htm