Changeset 47a8d17 for src/driver


Ignore:
Timestamp:
Oct 27, 2016, 3:02:56 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, resolv-new, with_gc
Children:
24eb51ed, 3f0c6a5
Parents:
6d7c3df
Message:

cfa version is now based on file of the same name

Location:
src/driver
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/driver/Makefile.am

    r6d7c3df r47a8d17  
    66## file "LICENCE" distributed with Cforall.
    77##
    8 ## Makefile.am -- 
     8## Makefile.am --
    99##
    1010## Author           : Peter A. Buhr
     
    2626cc1_SOURCES = cc1.cc
    2727
     28cfa.cc : ${abs_top_srcdir}/version
     29        @true
     30
    2831MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}
  • src/driver/Makefile.in

    r6d7c3df r47a8d17  
    100100CFA_PREFIX = @CFA_PREFIX@
    101101CFLAGS = @CFLAGS@
     102CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
    102103CPP = @CPP@
    103104CPPFLAGS = @CPPFLAGS@
     
    542543
    543544
     545cfa.cc : ${abs_top_srcdir}/version
     546        @true
     547
    544548# Tell versions [3.59,3.63) of GNU make to not export all variables.
    545549# Otherwise a system limit (for SysV at least) may be exceeded.
  • src/driver/cfa.cc

    r6d7c3df r47a8d17  
    2525using std::endl;
    2626using std::string;
     27using std::to_string;
    2728
    2829
     
    5051
    5152int main( int argc, char *argv[] ) {
    52         string Version( VERSION );                                                      // current version number from CONFIG
    53         string Major( CFA_VERSION_MAJOR ), Minor( CFA_VERSION_MINOR ), Patch( CFA_VERSION_MINOR );
     53        string Version( CFA_VERSION_LONG );                                                     // current version number from CONFIG
     54        string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
    5455
    5556        string installincdir( CFA_INCDIR );                                     // fixed location of include files
Note: See TracChangeset for help on using the changeset viewer.