Changeset 2431

Timestamp:

Mar 6, 2011, 9:04:31 PM (12 years ago)

Author:

Peter

Message:

fixes #620. Move version defines from 'version.h' to
'config_public.h'. The latter is included from the former so the api
is not changed in the sense that a program that used e.g. YAT_VERSIOn
and included 'version.h' will still compile. version.h is no longer
generated but checked into the repository. This may cause a confict in
developers wc, which can easily be avoided by removing version.h
before updating to with this ChangeSet?.

Location:

trunk

Files:

• configure.ac (modified) (3 diffs)
• m4/version.m4 (modified) (1 diff)
• yat/utility/config_public.h.in (modified) (2 diffs)
• yat/utility/version.h (moved) (moved from trunk/yat/utility/version.h.in) (1 diff)

trunk/configure.ac

@@ -34 +34 @@
 
 m4_include([m4/version.m4])
-AC_INIT([yat],[YAT_VERSION],[libyat-users@lists.sourceforge.net],,
+AC_INIT([yat],[YAT_VERSION__],[libyat-users@lists.sourceforge.net],,
         [http://dev.thep.lu.se/yat])
 AC_PREREQ(2.63)
@@ -48 +48 @@
 AC_SUBST([YAT_PATCH_VERSION], [PATCH_VERSION])
 AC_SUBST([YAT_DEV_BUILD], [DEV_BUILD])
+AC_DEFINE([YAT_VERSION], ["YAT_VERSION__"], [version])
+AC_DEFINE([YAT_MAJOR_VERSION], [MAJOR_VERSION], [major version])
+AC_DEFINE([YAT_MINOR_VERSION], [MINOR_VERSION], [minor version])
+AC_DEFINE([YAT_PATCH_VERSION], [PATCH_VERSION], [patch version])
+AC_DEFINE([YAT_DEV_BUILD], [DEV_BUILD], [Define to false if offical version])
 
 AC_CONFIG_HEADERS([config.h])
@@ -283 +288 @@
      yat/regression/Makefile
      yat/statistics/Makefile
-     yat/utility/version.h
      yat/utility/Makefile])
 

trunk/m4/version.m4

@@ -76 +76 @@
 ###
 
-# Setting YAT_VERSION based upon settings above
-m4_define([YAT_VERSION],MAJOR_VERSION.MINOR_VERSION) 
+# Setting YAT_VERSION__ based upon settings above
+m4_define([YAT_VERSION__],MAJOR_VERSION.MINOR_VERSION) 
 # disregarding patch number if zero
-m4_define([YAT_VERSION], m4_if(PATCH_VERSION,[0], YAT_VERSION,
-                                  YAT_VERSION.PATCH_VERSION))
-m4_define([YAT_VERSION], m4_if(DEV_BUILD,[true], YAT_VERSION[pre],
-                                  YAT_VERSION))
+m4_define([YAT_VERSION__], m4_if(PATCH_VERSION,[0], YAT_VERSION__,
+                                 YAT_VERSION__.PATCH_VERSION))
+m4_define([YAT_VERSION__], m4_if(DEV_BUILD,[true], YAT_VERSION__[pre],
+                                 YAT_VERSION__))

trunk/yat/utility/config_public.h.in

@@ -6 +6 @@
 /*
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2011 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -31 +31 @@
 #undef YAT_HAVE_GCC_DEPRECATED
 
+/// Version of yat in string format
+#undef YAT_VERSION
+/// First digit in VERSION triplet
+#undef YAT_MAJOR_VERSION
+/// Second digit in VERSION triplet
+#undef YAT_MINOR_VERSION
+/// Third digit in VERSION triplet or zero if VERSION is MAJOR.MINOR
+#undef YAT_PATCH_VERSION
+/// Set to true when releasing tarball
+#undef YAT_DEV_BUILD
+
 #endif

trunk/yat/utility/version.h

@@ -36 +36 @@
 */
 
-/**
-   MAJOR version
-
-   No compatibility is guarenteed between MAJOR versions.
-
-   \since New in yat 0.5
- */
-#define YAT_MAJOR_VERSION @YAT_MAJOR_VERSION@ 
-
-/**
-   MINOR version
-
-   Minor API changes that do not cause binary compatibility problems.
-   Reset to 0 when upgrading YAT_MAJOR_VERSION
-
-   \since New in yat 0.5
- */
-#define YAT_MINOR_VERSION @YAT_MINOR_VERSION@ 
-
-/**
-   PATCH version
-
-   The Patch level never includes API changes, simply bug fixes.
-   Reset to 0 when upgrading YAT_MINOR_VERSION
-
-   \since New in yat 0.5
- */
-#define YAT_PATCH_VERSION @YAT_PATCH_VERSION@ 
-
-/**
-   VERSION
-
-   The version of yat in string format
-
-   \since New in yat 0.5
- */
-#define YAT_VERSION "@VERSION@" 
-
-/**
-   DEV_BUILD 
-
-   Is set to false in releases
-
-   \since New in yat 0.5
- */
-#define YAT_DEV_BUILD @YAT_DEV_BUILD@
+#include "config_public.h"
 
 /**