Changeset 18848

Show
Ignore:
Timestamp:
05/17/06 13:57:34 (2 years ago)
Author:
patrick
Message:

Merged Doozer++ 2.1.1 from its vendor branch. This fixes a bug with
detecting the GNU Make version when that version has pre-release
information in it. The current Ubuntu beta is using a GNU Make version
that identifies itself as "3.81beta4," and this case is now handled.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/Doozer++/ChangeLog

    r18644 r18848  
    11DATE       AUTHOR       CHANGE 
    22---------- ------------ ------------------------------------------------------- 
     32006-05-17 patrickh     Fixed a version detection bug in DPP_HAVE_GNU_MAKE for 
     4                        the case of GNU Make pre-releases. 
     5                        NEW VERSION: 2.1.1 
    362006-04-14 patrickh     dpp.libs.targets.mk no longer dictates naming 
    47                        conventions for static and shared libraries. 

  • juggler/trunk/Doozer++/config/basic_progs.m4

    r17068 r18848  
    2929dnl ----------------------------------------------------------------- 
    3030dnl File:          basic_progs.m4,v 
    31 dnl Date modified: 2005/03/20 17:17:12 
    32 dnl Version:       1.19 
     31dnl Date modified: 2006/05/17 18:42:30 
     32dnl Version:       1.20 
    3333dnl ----------------------------------------------------------------- 
    3434dnl ************** <auto-copyright.pl END do not edit this line> ************** 
    …… 
    5050dnl =========================================================================== 
    5151 
    52 dnl basic_progs.m4,v 1.19 2005/03/20 17:17:12 patrickh Exp 
     52dnl basic_progs.m4,v 1.20 2006/05/17 18:42:30 patrickh Exp 
    5353 
    5454dnl --------------------------------------------------------------------------- 
    …… 
    155155   fi 
    156156 
    157    dnl The sed(1) expressions below will work with GNU Make 3.7x and 3.80. 
     157   dnl The sed(1) expressions below will work with GNU Make 3.7x and 3.8x. 
    158158   dnl The basic idea is to extract the "GNU Make x.yz" string and then pick 
    159159   dnl out the "x.yz" part. 
     160   dnl dpp_gmake_ver_exp2 handles cases such as "3.82alpha12" by taking out 
     161   dnl the "alpha12" part. 
    160162   changequote(<<, >>) 
    161163   dpp_gmake_ver_exp1='s/^\(.*\),.*$/\1/' 
    162    dpp_gmake_ver_exp2='s/^GNU Make[^0-9]*\(.*\)/\1/' 
    163    dpp_gmake_ver=`$GMAKE --version | grep 'GNU Make' | sed -e "$dpp_gmake_ver_exp1" -e "$dpp_gmake_ver_exp2"` 
     164   dpp_gmake_ver_exp2='s/^\(.*[0-9]\)[a-bA-B].*$/\1/' 
     165   dpp_gmake_ver_exp3='s/^GNU Make[^0-9]*\(.*\)/\1/' 
     166   dpp_gmake_ver=`$GMAKE --version | grep 'GNU Make' | sed -e "$dpp_gmake_ver_exp1" -e "$dpp_gmake_ver_exp2" -e "$dpp_gmake_ver_exp3"` 
    164167   changequote([, ]) 
    165168 

  • juggler/trunk/Doozer++/config/general.m4

    r18644 r18848  
    2222dnl ----------------------------------------------------------------- 
    2323dnl File:          general.m4,v 
    24 dnl Date modified: 2006/04/14 19:06:11 
    25 dnl Version:       1.83 
     24dnl Date modified: 2006/05/17 18:45:40 
     25dnl Version:       1.84 
    2626dnl ----------------------------------------------------------------- 
    2727dnl ************** <auto-copyright.pl END do not edit this line> ************** 
    …… 
    4747dnl =========================================================================== 
    4848 
    49 dnl general.m4,v 1.83 2006/04/14 19:06:11 patrickh Exp 
     49dnl general.m4,v 1.84 2006/05/17 18:45:40 patrickh Exp 
    5050 
    5151dnl Set the version of Doozer++. 
    52 define(DPP_DPPVERSION, 2.1.0) 
     52define(DPP_DPPVERSION, 2.1.1) 
    5353 
    5454dnl ---------------------------------------------------------------------------