Added automatic building of RPMs

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@65 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/check/Makefile.am b/check/Makefile.am
index 2b054162118e3284f23c0d923360bcb8355b9067..3179da3f63a425f5407d2275e5158c2fe5e26e9e 100644 (file)
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -3,8 +3,11 @@ docdir = $(DOCROOTDIR)
 
 doc_DATA = ChangeLog ChangeLogOld NEWS README COPYING
 
-SUBDIRS=src tests doc
+SUBDIRS=src tests doc rpm
 
 EXTRA_DIST= ChangeLogOld
 
-CLEANFILES=*.*~
\ No newline at end of file
+CLEANFILES=*~ ${PACKAGE}-${VERSION}*.gz ${PACKAGE}-${VERSION}*.rpm
+
+rpm: dist
+       (cd rpm && ${MAKE} ${AM_MAKEFLAGS} rpm)
\ No newline at end of file

diff --git a/check/Makefile.in b/check/Makefile.in
index 8da967abe4109ef53ea1e380dde60506634ebf9e..77793f69ba21cf5320c7f7fa0f3b24e7eff0ff38 100644 (file)
--- a/check/Makefile.in
+++ b/check/Makefile.in
@@ -72,11 +72,11 @@ docdir = $(DOCROOTDIR)
 
 doc_DATA = ChangeLog ChangeLogOld NEWS README COPYING
 
-SUBDIRS = src tests doc
+SUBDIRS = src tests doc rpm
 
 EXTRA_DIST = ChangeLogOld
 
-CLEANFILES = *.*~
+CLEANFILES = *~ ${PACKAGE}-${VERSION}*.gz ${PACKAGE}-${VERSION}*.rpm
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -84,8 +84,8 @@ CONFIG_CLEAN_FILES =
 DATA =  $(doc_DATA)
 
 DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS aclocal.m4 config.h.in configure \
-configure.in install-sh missing mkinstalldirs
+Makefile.am Makefile.in NEWS acinclude.m4 aclocal.m4 config.h.in \
+configure configure.in install-sh missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -101,7 +101,7 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
        cd $(top_builddir) \
          && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-$(ACLOCAL_M4):  configure.in 
+$(ACLOCAL_M4):  configure.in  acinclude.m4
        cd $(srcdir) && $(ACLOCAL)
 
 config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
@@ -385,6 +385,9 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+rpm: dist
+       (cd rpm && ${MAKE} ${AM_MAKEFLAGS} rpm)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/check/aclocal.m4 b/check/aclocal.m4
index 7d5836b91f4d1fbed719541171644fe7ba3a68b6..12e1d15dc47c688514bae463188bd8fc4831e6cb 100644 (file)
--- a/check/aclocal.m4
+++ b/check/aclocal.m4
@@ -10,6 +10,7 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
+
 # Do all the work for Automake.  This macro actually does too much --
 # some checks are only needed if your package does certain things.
 # But this isn't really a big deal.

diff --git a/check/configure b/check/configure
index 09c790d014ed691a2e7b3e62479aa74e893eb7a7..143b88d09de27b582fb7398b6bafad555c65dc8d 100755 (executable)
--- a/check/configure
+++ b/check/configure
@@ -1896,7 +1896,8 @@ ac_given_INSTALL="$INSTALL"
 trap 'rm -fr `echo "Makefile
          src/Makefile
          tests/Makefile
-         doc/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+         doc/Makefile
+         rpm/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1992,7 +1993,8 @@ cat >> $CONFIG_STATUS <<EOF
 CONFIG_FILES=\${CONFIG_FILES-"Makefile
          src/Makefile
          tests/Makefile
-         doc/Makefile"}
+         doc/Makefile
+         rpm/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

diff --git a/check/configure.in b/check/configure.in
index 65361c2ebb6bfafff20249180e50f0903d0edccb..75b041ff5179f33b40a0dd41e7b1607a3d067e56 100644 (file)
--- a/check/configure.in
+++ b/check/configure.in
@@ -37,4 +37,5 @@ AC_CHECK_FUNCS(strerror)
 AC_OUTPUT(Makefile
          src/Makefile
          tests/Makefile
-         doc/Makefile)
+         doc/Makefile
+         rpm/Makefile)

diff --git a/check/doc/index.html b/check/doc/index.html
index 3759c23870430f5a5cb0e7d0048b314b8924d29a..147f4cafabf20c04de5e1c268ed2a6c950d9f211 100644 (file)
--- a/check/doc/index.html
+++ b/check/doc/index.html
@@ -82,7 +82,9 @@
 
     <h3>TODO</h3>
 
-    The following enhancements are being considered for Check:
+    The following enhancements are being considered for Check. Please
+    let the author know if you would like to assist in any of these,
+    or if you would like to suggest additional enhancements:
 
     <ul>
       <li>Printing and Logging
@@ -126,6 +128,15 @@
          functionality (without end-to-end testing of output</li>
        </ul>
       </li>
+      <li>
+       <ul>Internals
+           <li>Currently Check can only be used on POSIX machines
+           supporting SysV message queues. This excludes Win32 native
+           and broken POSIX implementations (e.g., cygwin on
+           Win9x). Abstract the forking and message passing
+           implementation to allow Win32 compatibility.</li>
+       </ul>
+      </li>
       <li>Packaging
        <ul>
          <li>Automate RPM production</li>

diff --git a/check/rpm/Makefile.am b/check/rpm/Makefile.am
new file mode 100644 (file)
index 0000000..e4aa510
--- /dev/null
+++ b/check/rpm/Makefile.am
@@ -0,0 +1,21 @@
+WD=`pwd`
+TOPDIRFLAGS=--define "_topdir ${WD}"
+RPMFLAGS=
+
+EXTRA_DISTS=check.spec
+
+SOURCE_FILE=${PACKAGE}-${VERSION}.tar.gz
+RPM_I386=./RPMS/i386/${PACKAGE}-$(VERSION)-1.i386.rpm
+RPM_SRC=./SRPMS/${PACKAGE}-$(VERSION)-1.src.rpm
+
+RPMDIRS=BUILD SOURCES RPMS RPMS/i386 SRPMS
+
+rpm: check.spec
+       mkdir -p ${RPMDIRS}
+       cp ../${SOURCE_FILE} SOURCES
+       rpm ${TOPDIRFLAGS} ${RPMFLAGS} -ba check.spec
+       cp ${RPM_I386} ..
+       cp ${RPM_SRC} ..
+       rm -rf ${RPMDIRS}
+
+CLEANFILES=*.*~

diff --git a/check/rpm/buildrpm.sh b/check/rpm/buildrpm.sh
deleted file mode 100755 (executable)
index f5e3054..0000000
--- a/check/rpm/buildrpm.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rpm --define "_topdir /home/amalec/src/check/rpm" -ba SPECS/check.spec --nodeps