Changeset 1775 for trunk

Timestamp:

29/11/11 10:27:33 (6 months ago)

Author:

Freddie Akeroyd

Message:

Add m4 macros to pick up svn version automatically and set release information in generated distribution and RPM
Refs #307

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• build_rpm.in (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• nexus_spec.in (modified) (2 diffs)
• svn2cl_nexus_authors.xml (added)

trunk/Makefile.am

@@ -55 +55 @@
  `find "$(srcdir)" -type f -name Makefile.in -print`
 
+ChangeLog :
+        svn2cl --non-interactive --authors=svn2cl_nexus_authors.xml .
+
 maintainer-clean-local:
         -rm -rf config

trunk/build_rpm.in

@@ -11 +11 @@
 topdir=`rpm --showrc|grep topdir| awk '{print $3}' | tail -1`
 if test ! -e "$topdir"; then
-    echo "Unable to determine RPM topdir from rpmrc; assuming /usr/src/redhat"
-    topdir="/usr/src/redhat"
+    echo "Unable to determine RPM topdir from rpmrc; assuming $HOME/rpmbuild"
+    topdir="$HOME/rpmbuild"
 fi
 if test ! -w "$topdir"; then

trunk/configure.ac

@@ -31 +31 @@
 AC_PREREQ(2.61)
 AC_REVISION($Revision$)
-AC_INIT([NeXus Library], [4.3.0], [nexus-developers@nexusformat.org], [nexus])
+
+m4_define([ISODATE],m4_esyscmd_s([date +%Y%m%d]))dnl
+dnl m4_define([SVNREV],m4_esyscmd_s([`svnversion`]))
+m4_define([SVNREV],m4_esyscmd_s([svn info | grep Revision | awk '{print $2}']))dnl
+m4_define([SVN_RELEASE],m4_join([],ISODATE,[svn],SVNREV)))dnl
+
+m4_define([NEXUS_VERSION],[4.3.0])dnl main version we are based on
+m4_define([NEXUS_RELEASE],SVN_RELEASE)dnl things like  rc1   or  20100903svn1734
+m4_define([PACKAGE_RELEASE],[0.1])dnl 0.* for pre release; 1, 2, ... post release
+
+AC_INIT([NeXus Library], m4_join([],NEXUS_VERSION,[-],NEXUS_RELEASE), [nexus-developers@nexusformat.org], [nexus])
 AC_COPYRIGHT([Copyright (C) 2004 NeXus International Advisory Committee
 This software is covered by the GNU LESSER GENERAL PUBLIC LICENSE
 see file COPYING for further information])
+
+m4_join([],[NEXUS_VERSION=],"NEXUS_VERSION")
+m4_join([],[NEXUS_RELEASE=],"NEXUS_RELEASE")
+m4_join([],[SVN_REVISION=],"SVN_REVISION")
+m4_join([],[PACKAGE_RELEASE=],"PACKAGE_RELEASE")
+AC_SUBST([NEXUS_VERSION])
+AC_SUBST([NEXUS_RELEASE])
+AC_SUBST([SVN_REVISION])
+AC_SUBST([PACKAGE_RELEASE])
+AC_DEFINE([[NEXUS_VERSION]], "NEXUS_VERSION", [NeXus Version])dnl
+AC_DEFINE([[NEXUS_RELEASE]], "NEXUS_RELEASE", [NeXus Release])dnl
+AC_DEFINE([[PACKAGE_RELEASE]], "PACKAGE_RELEASE", [Package Release])dnl
+AC_DEFINE([[SVN_REVISION]], "SVNREV", [SVN Revision])dnl
+
 
 # used by libtool - need to get if from 4.3.0 better
@@ -222 +246 @@
 AC_SUBST(SHARED_LDFLAGS)
 AC_SUBST(JAVAINCLUDE)
-AC_SUBST(PACKAGE_RELEASE)
-test -z "$PACKAGE_RELEASE" && PACKAGE_RELEASE=1
 
 SHARED_LDFLAGS=""

trunk/nexus_spec.in

@@ -6 +6 @@
 Summary: Libraries and utilities for using NeXus format data files
 Name: @PACKAGE_TARNAME@
-Version: @PACKAGE_VERSION@
+Version: @NEXUS_VERSION@
 # Release is the number of times this version of the software was 
 # built into an RPM file; it should be incremented each RPM build and
 # then reset to 1 when a new version of the software is released
-Release: @PACKAGE_RELEASE@
+Release: @PACKAGE_RELEASE@.@NEXUS_RELEASE@%{?dist}
 License: LGPL
 # Group: there is more than one choice for this - maybe we need to split
@@ -83 +83 @@
 
 %prep
-%setup -q
+%setup -q -n @PACKAGE_TARNAME@-@PACKAGE_VERSION@
 
 %build