<div dir="ltr">Hi,<br><br>I've taken a small bit of time to initiate this work.<br>There is now:<br>- an m4 macro to detect the system (linux only ATM, but simple to complete)<br>- a set of "make package" targets throughout the tree (limited to debian ATM)<br>
<br>The remaining tasks on this specific point are:<br>- m4 macro completion to handle all the supported platforms (at least the ones that have files in the packaging/ dir)<br>- update and complete the packaging/ dir with the matching file (debian, redhat, gentoo, ...) from the distributors, possibly using the existing files for scripts/ dir<br>
- complete the prerequisite stage of the target (ensure the build env. is ok)<br><br>On my side, and on the packaging topic, I still have to complete the doc/packaging.txt file (not that far!).<br><br>cheers,<br>Arnaud<br>
<br><div class="gmail_quote">2008/7/17 Arnaud Quette <<a href="mailto:aquette@alioth.debian.org">aquette@alioth.debian.org</a>>:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Author: aquette<br>
Date: Thu Jul 17 14:27:24 2008<br>
New Revision: 1515<br>
<br>
Log:<br>
make-package and packaging related branch<br>
<br>
<br>
Added:<br>
branches/trunk-make-package/<br>
- copied from r1505, /trunk/<br>
branches/trunk-make-package/ChangeLog<br>
- copied, changed from r1511, /trunk/ChangeLog<br>
branches/trunk-make-package/clients/upsclient.c<br>
- copied unchanged from r1507, /trunk/clients/upsclient.c<br>
branches/trunk-make-package/<a href="http://configure.in" target="_blank">configure.in</a><br>
- copied, changed from r1511, /trunk/<a href="http://configure.in" target="_blank">configure.in</a><br>
branches/trunk-make-package/data/driver.list<br>
- copied, changed from r1506, /trunk/data/driver.list<br>
branches/trunk-make-package/drivers/<br>
- copied from r1510, /trunk/drivers/<br>
branches/trunk-make-package/drivers/main-hal.c<br>
- copied unchanged from r1511, /trunk/drivers/main-hal.c<br>
branches/trunk-make-package/m4/nut_check_libhal.m4<br>
- copied unchanged from r1511, /trunk/m4/nut_check_libhal.m4<br>
branches/trunk-make-package/packaging/debian/po/<br>
- copied from r1505, /branches/Testing/packaging/debian/po/<br>
branches/trunk-make-package/scripts/<br>
- copied from r1510, /trunk/scripts/<br>
Modified:<br>
branches/trunk-make-package/Makefile.am<br>
branches/trunk-make-package/docs/macros.txt<br>
branches/trunk-make-package/drivers/libshut.c<br>
branches/trunk-make-package/packaging/Makefile.am<br>
branches/trunk-make-package/packaging/debian/Makefile.am<br>
<br>
Modified: branches/trunk-make-package/Makefile.am<br>
==============================================================================<br>
--- /trunk/Makefile.am (original)<br>
+++ branches/trunk-make-package/Makefile.am Thu Jul 17 14:27:24 2008<br>
@@ -26,6 +26,10 @@<br>
distcheck-light:<br>
$(MAKE) $(AM_MAKEFLAGS) DISTCHECK_FLAGS="$(DISTCHECK_LIGHT_FLAGS)" distcheck<br>
<br>
+package:<br>
+ @echo "Creating package(s) for $(OS_NAME)"<br>
+ cd packaging; $(MAKE) $(AM_MAKEFLAGS) $(OS_NAME)<br>
+<br>
# ----------------------------------------------------------------------<br>
# targets from old build system (pre-automake).<br>
# supported for a period of time for backward "compatibility".<br>
<br>
Modified: branches/trunk-make-package/docs/macros.txt<br>
==============================================================================<br>
--- /trunk/docs/macros.txt (original)<br>
+++ branches/trunk-make-package/docs/macros.txt Thu Jul 17 14:27:24 2008<br>
@@ -2,6 +2,7 @@<br>
File: macros.txt<br>
Date: 27 December 2006<br>
Auth: Peter Selinger <<a href="mailto:selinger@users.sourceforge.net">selinger@users.sourceforge.net</a>><br>
+ Arnaud Quette <<a href="mailto:aquette.dev@gmail.com">aquette.dev@gmail.com</a>><br>
<br>
The following NUT-specific autoconf macros are defined in the m4/<br>
directory.<br>
@@ -43,6 +44,11 @@<br>
if all the required features are present. Set nut_have_ipv6=no<br>
otherwise.<br>
<br>
+ - Macro: NUT_CHECK_OS<br>
+ Check for the exact system name and type. This is only used at the<br>
+ moment to determine the packaging rule to be used through the<br>
+ OS_NAME variable.<br>
+<br>
- Macro: NUT_REPORT_FEATURE(FEATURE, VALUE)<br>
Schedule a line for the end-of-configuration feature summary. The<br>
FEATURE is a descriptive string such that the sentence "Checking<br>
<br>
Modified: branches/trunk-make-package/drivers/libshut.c<br>
==============================================================================<br>
--- /trunk/drivers/libshut.c (original)<br>
+++ branches/trunk-make-package/drivers/libshut.c Thu Jul 17 14:27:24 2008<br>
@@ -911,6 +911,10 @@<br>
break;<br>
case -3:<br>
/* FIXME: notification caught => to be processed */<br>
+<br>
+ /* Send a NACK for the moment, to get a resend from the UPS */<br>
+ ser_send_char(upsfd, SHUT_NOK);<br>
+ Retry++;<br>
default:<br>
;<br>
}<br>
<br>
Modified: branches/trunk-make-package/packaging/Makefile.am<br>
==============================================================================<br>
--- /trunk/packaging/Makefile.am (original)<br>
+++ branches/trunk-make-package/packaging/Makefile.am Thu Jul 17 14:27:24 2008<br>
@@ -1,2 +1,8 @@<br>
+ubuntu:<br>
+ cd debian; $(MAKE) $(AM_MAKEFLAGS) package<br>
+<br>
+debian:<br>
+ cd debian; $(MAKE) $(AM_MAKEFLAGS) package<br>
+<br>
SUBDIRS = debian mandriva redhat opensuse generic-rpm<br>
EXTRA_DIST = README<br>
<br>
Modified: branches/trunk-make-package/packaging/debian/Makefile.am<br>
==============================================================================<br>
--- /trunk/packaging/debian/Makefile.am (original)<br>
+++ branches/trunk-make-package/packaging/debian/Makefile.am Thu Jul 17 14:27:24 2008<br>
@@ -1,3 +1,7 @@<br>
+# FIXME: meet the build prereq (build-essential devscripts) + orig.tgz (dist + ln -sf)!<br>
+package:<br>
+ cd $(top_srcdir); ln -sf packaging/debian && debuild -us -uc<br>
+<br>
# Please keep this file sorted, with one file entry per line. This makes it<br>
# easier to track changes.<br>
EXTRA_DIST = \<br>
<br>
_______________________________________________<br>
nut-commits mailing list<br>
<a href="mailto:nut-commits@lists.alioth.debian.org">nut-commits@lists.alioth.debian.org</a><br>
<a href="http://lists.alioth.debian.org/mailman/listinfo/nut-commits" target="_blank">http://lists.alioth.debian.org/mailman/listinfo/nut-commits</a><br>
</blockquote></div><br></div>