Changeset 547

Timestamp:

Jan 7, 2008, 3:13:57 PM (14 years ago)

Author:

Peter Johansson

Message:

removed configure option wctests - now detected automatically. Also parsing version number and setting variables MAJOR, MINOR, PATCH, and DEV_BUILD

Location:

trunk

Files:

• NEWS (modified) (2 diffs)
• README.developer (modified) (2 diffs)
• configure.ac (modified) (7 diffs)
• test/Makefile.am (modified) (1 diff)

trunk/NEWS

@@ -4 +4 @@
 
 Version 0.7 (released DATE)
+  - configure option --enable-wctests is removed (ticket:295)
   - parsing rules can be set in config file (ticket:283)
 
@@ -78 +79 @@
 Copyright (C) 2005, 2006 Jari Häkkinen
 Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+Copyright (C) 2008 Peter Johansson
 
 This file is part of svndigest, http://trac.thep.lu.se/svndigest

trunk/README.developer

@@ -38 +38 @@
 Run the generated configure script with 
 
-  `./configure --enable-debug --enable-wctests`
+  `./configure --enable-debug
 
 The option flag `--enable-debug` turns on debug options (e.g. enables
-assertions). The option flag `--enable-wctests` turns on some
-additional tests. All tests are not enabled by default since some of
-the tests depend on being run from a subversion WC.
+assertions). 
 
 
@@ -133 +131 @@
 Copyright (C) 2005, 2006 Jari Häkkinen
 Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+Copyright (C) 2008 Peter Johansson
 
 This file is part of svndigest, http://trac.thep.lu.se/svndigest

trunk/configure.ac

@@ -13 +13 @@
 # Copyright (C) 2006 Jari Häkkinen
 # Copyright (C) 2007 Jari Häkkinen, Peter Johansson
+# Copyright (C) 2008 Peter Johansson
 #
 # This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -32 +33 @@
 
 AC_PREREQ(2.57)
+
+
 AC_INIT([svndigest],[pre0.7],[jari@thep.lu.se])
 AC_CONFIG_SRCDIR([lib/File.h])
@@ -41 +44 @@
 AM_INIT_AUTOMAKE([std-options check-news])
 
+AC_MSG_NOTICE([version $VERSION])
+DEV=`echo $VERSION|sed 's/\([[a-z]]*\).*/\1/'`
+if test "$DEV" = "pre"; then
+  DEV="1"
+else
+  DEV="0"
+fi
+MY_MAJOR=`echo $VERSION|sed 's/[[a-z]]*\([[0-9]]*\).*/\1/'`
+MY_MINOR=`echo $VERSION|sed 's/[[a-z]]*[[0-9]]*\.\([[0-9]]*\).*/\1/'`
+if test "$MY_MINOR" = "$VERSION" || "$MY_MAJOR" = "$VERSION" ; then
+ AC_MSG_ERROR([version number is incorrect])
+fi
+
+MY_PATCH=`echo $VERSION|sed 's/[[a-z]]*[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\).*/\1/'`
+
+if test "$MY_PATCH" = "$VERSION"; then
+ MY_PATCH="0"
+fi
+
+# AM_CONDITIONAL(DEV_BUILD, $DEV )
+AC_SUBST([VERSION_MAJOR], [$MY_MAJOR])
+AC_SUBST([VERSION_MINOR], [$MY_MINOR])
+AC_SUBST([VERSION_PATCH], [$MY_PATCH])
+AC_DEFINE_UNQUOTED([DEV_BUILD],[$DEV], 
+                   [true if dev build (version starts with pre)])
+AC_DEFINE_UNQUOTED([VERSION_MAJOR], [$MY_MAJOR], 
+                   [Define to the svndigest major version])
+AC_DEFINE_UNQUOTED([VERSION_MINOR], [$MY_MINOR],
+                   [Define to the svndigest minor version])
+AC_DEFINE_UNQUOTED([VERSION_PATCH], [$MY_PATCH],
+                   [Define to the svndigest patch version])
+
+
+# seems like these variables are not set with older autoconf(?)
+AC_SUBST([abs_srcdir], ["`cd $srcdir && pwd`"])
+AC_SUBST([abs_builddir], ["`pwd`"])
+
 # Set default programming language
 AC_LANG(C++)
@@ -47 +87 @@
 AC_PROG_CPP
 AC_PROG_CXX
+AC_PROG_GREP
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 AC_PROG_RANLIB
+AC_PROG_SED
 AC_CHECK_PROG([GNUPLOT],[gnuplot],[ok])
 
@@ -61 +103 @@
   [CXXFLAGS="$CXXFLAGS -g -O"], 
   [CPPFLAGS="$CPPFLAGS -DNDEBUG" CXXFLAGS="$CXXFLAGS -O3"])
-
-AC_ARG_ENABLE(wctests,
-  [AS_HELP_STRING([--enable-wctests],[turn on all tests, tests
-  requiring a subversion WC are disabled by default])], [wctests=true])
-AM_CONDITIONAL(WCTESTS, test x$wctests = xtrue)
 
 # optionally prepare for building static libraries.
@@ -131 +168 @@
    wc_found="yes";
 fi
-AC_CHECK_FILE("lib/subversion_info.h", info_found="yes", info_found="no")   
+AC_CHECK_FILE("lib/subversion_info.h", info_found="yes", info_found="no")
 
 # devel version should have svn WC and SVNVERSION installed
@@ -236 +273 @@
 
 AC_MSG_NOTICE([Now type 'make ; make check'.])
+

trunk/test/Makefile.am

@@ -26 +26 @@
 TESTS = $(check_PROGRAMS)
 # these tests are only for developers since we do not distribute test repository
-if WCTESTS
+if HAVE_SVN_WC
 TESTS += test_repo.sh check_repo_status.sh
 endif