Changeset 47a8d17 for src/driver

Timestamp:

Oct 27, 2016, 3:02:56 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, 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, qualifiedEnum, 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:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (2 diffs)
• cfa.cc (modified) (2 diffs)

src/driver/Makefile.am

@@ -6 +6 @@
 ## file "LICENCE" distributed with Cforall.
 ##
-## Makefile.am -- 
+## Makefile.am --
 ##
 ## Author           : Peter A. Buhr
@@ -26 +26 @@
 cc1_SOURCES = cc1.cc
 
+cfa.cc : ${abs_top_srcdir}/version
+        @true
+
 MAINTAINERCLEANFILES = @CFA_PREFIX@/bin/${bin_PROGRAMS} @CFA_PREFIX@/lib/${cc1lib_PROGRAMS}

src/driver/Makefile.in

@@ -100 +100 @@
 CFA_PREFIX = @CFA_PREFIX@
 CFLAGS = @CFLAGS@
+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
@@ -542 +543 @@
 
 
+cfa.cc : ${abs_top_srcdir}/version
+        @true
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

src/driver/cfa.cc

@@ -25 +25 @@
 using std::endl;
 using std::string;
+using std::to_string;
 
 
@@ -50 +51 @@
 
 int main( int argc, char *argv[] ) {
-        string Version( VERSION );                                                      // current version number from CONFIG
-        string Major( CFA_VERSION_MAJOR ), Minor( CFA_VERSION_MINOR ), Patch( CFA_VERSION_MINOR );
+        string Version( CFA_VERSION_LONG );                                                     // current version number from CONFIG
+        string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
 
         string installincdir( CFA_INCDIR );                                     // fixed location of include files