Changeset 1321 for trunk


Ignore:
Timestamp:
May 23, 2008, 4:14:41 PM (13 years ago)
Author:
Peter
Message:

Basically reverting r1319. I was not happy with the macro, so create defines are now placed in version.h instead. version.h is generated by configure from version.h.in. The macro ax_prefix_config_h.m4 will be removed later.

Location:
trunk
Files:
6 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

    r1319 r1321  
    88  - is_int now depends on numerical_limits for inf and NaN treatment
    99  - Similar for is_float. See revision [1312] for details.
    10   - yat-config.h is installed rather than config.h
     10  - config.h is no longer installed
    1111
    1212Version 0.4.1 (released 14 May 2008)
  • trunk/build_support/version.m4

    r1319 r1321  
    2525#
    2626# MAJOR - Modify when incompatible changes are made
    27 m4_define([yat_major_version], [0])
     27m4_define([MAJOR_VERSION], [0])
    2828# MINOR - Modify when new functionality is added
    29 m4_define([yat_minor_version], [5])
     29m4_define([MINOR_VERSION], [5])
    3030# PATCH - Modify for every released patch
    31 m4_define([yat_patch_version], [0])
     31m4_define([PATCH_VERSION], [0])
    3232
    3333# DEV_BUILD - When rolling a tarball we set this to `false'. In
    3434# repository value remains `true'.
    35 m4_define([yat_dev_build], [true])
     35m4_define([DEV_BUILD], [true])
    3636
    3737# Library versioning (current:revision:age)
     
    5454# yat-0.4.1  1:0:0
    5555#
    56 m4_define([yat_lt_version], [1:0:0])
     56m4_define([LT_VERSION], [1:0:0])
    5757
    5858
     
    6262
    6363# Setting YAT_VERSION based upon settings above
    64 m4_define([yat_version],yat_major_version.yat_minor_version)
     64m4_define([YAT_VERSION],MAJOR_VERSION.MINOR_VERSION)
    6565# disregarding patch number if zero
    66 m4_define([yat_version], m4_if(yat_patch_version,[0], yat_version,
    67                                   yat_version.yat_patch_version))
    68 m4_define([yat_version], m4_if(yat_dev_build,[true], yat_version[pre],
    69                                   yat_version))
     66m4_define([YAT_VERSION], m4_if(PATCH_VERSION,[0], YAT_VERSION,
     67                                  YAT_VERSION.PATCH_VERSION))
     68m4_define([YAT_VERSION], m4_if(DEV_BUILD,[true], YAT_VERSION[pre],
     69                                  YAT_VERSION))
    7070
  • trunk/configure.ac

    r1319 r1321  
    3333
    3434m4_include([./build_support/version.m4])
    35 AC_INIT([yat],[yat_version],[jari@thep.lu.se])
     35AC_INIT([yat],[YAT_VERSION],[jari@thep.lu.se])
    3636AC_PREREQ(2.60)
    3737AC_CONFIG_SRCDIR([yat/utility/Matrix.h])
     
    3939AC_PREFIX_DEFAULT([/usr/local])
    4040
    41 AC_SUBST([YAT_LT_VERSION], [yat_lt_version])
    42 AC_SUBST([YAT_MAJOR_VERSION], [yat_major_version])
    43 AC_SUBST([YAT_MINOR_VERSION], [yat_minor_version])
    44 AC_SUBST([YAT_PATCH_VERSION], [yat_patch_version])
     41AC_SUBST([YAT_LT_VERSION], [LT_VERSION])
     42AC_SUBST([YAT_MAJOR_VERSION], [MAJOR_VERSION])
     43AC_SUBST([YAT_MINOR_VERSION], [MINOR_VERSION])
     44AC_SUBST([YAT_PATCH_VERSION], [PATCH_VERSION])
     45AC_SUBST([YAT_DEV_BUILD], [DEV_BUILD])
    4546
    4647AC_CONFIG_HEADER([config.h])
    47 m4_include(build_support/ax_prefix_config_h.m4)
    48 AX_PREFIX_CONFIG_H(yat/[AC_PACKAGE_NAME]-config.h,, config.h)
    49 
    5048AM_INIT_AUTOMAKE()
    5149
     
    161159AC_SUBST(YAT_LIB)
    162160AC_SUBST(YAT_LIB_LOCATION)
    163 AC_DEFINE([MAJOR_VERSION], [yat_major_version], [Define to yat MAJOR version])
    164 AC_DEFINE([MINOR_VERSION],[yat_minor_version], [Define to yat MINOR version])
    165 AC_DEFINE([PATCH_VERSION],[yat_patch_version], [Define to yat PATCH version])
    166 AC_DEFINE([DEV_BUILD],[yat_dev_build], [false if tagged release])
    167161
    168162#doxygen stuff
     
    184178     yat/regression/Makefile
    185179     yat/statistics/Makefile
     180     yat/utility/version.h
    186181     yat/utility/Makefile])
    187182
  • trunk/yat/Makefile.am

    r1319 r1321  
    2727SUBDIRS = classifier random regression statistics utility
    2828
    29 include_yatdir = $(includedir)/yat
    30 
    31 include_yat_HEADERS = yat-config.h
    32 
    3329lib_LTLIBRARIES = libyat.la
    3430
  • trunk/yat/utility/Makefile.am

    r1292 r1321  
    4646  SVD.h TypeInfo.h utility.h Vector.h \
    4747  VectorBase.h VectorConstView.h VectorMutable.h VectorView.h \
    48   version.h WeNNI.h yat_assert.h
     48  WeNNI.h yat_assert.h
    4949
  • trunk/yat/utility/version.cc

    r1319 r1321  
    2323
    2424#include "version.h"
    25 #include "yat/yat-config.h"
    2625
    2726namespace theplu {
  • trunk/yat/utility/version.h.in

    r1317 r1321  
     1// @configure_input@
    12#ifndef _theplu_yat_utility_version_
    23#define _theplu_yat_utility_version_
     
    2930///
    3031
     32/*
     33  Compile-time version constants
     34
     35  \see http://apr.apache.org/versioning.html
     36*/
     37#define YAT_MAJOR_VERSION @YAT_MAJOR_VERSION@
     38#define YAT_MINOR_VERSION @YAT_MINOR_VERSION@
     39#define YAT_PATCH_VERSION @YAT_PATCH_VERSION@
     40#define YAT_VERSION "@VERSION@"
     41#define YAT_DEV_BUILD @YAT_DEV_BUILD@
     42
    3143#include <string>
    32 #include <stdexcept>
    33 #include <sstream>
    34 #include <utility>
    35 #include <vector>
    3644
    3745namespace theplu {
Note: See TracChangeset for help on using the changeset viewer.