Changeset 11388 for trunk

Timestamp:

07/13/11 23:09:17 (13 years ago)

Author:

tbretz

Message:

Added svn revision to output at startup.

Location:

trunk/FACT++

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• src/Main.h (modified) (1 diff, 1 prop)

trunk/FACT++/Makefile.am

@@ -4 +4 @@
 
 ACLOCAL_AMFLAGS = -I .macro_dir
+
+SVN_REVISION = -DREVISION=\"`svnversion -n .`\"
 
 DIM_FLAGS    = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux
@@ -9 +11 @@
 
 AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
-   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2
+   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
+   $(SVN_REVISION)
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \

trunk/FACT++/Makefile.in

@@ -625 +625 @@
 #-------------------------------------------------------------------------
 ACLOCAL_AMFLAGS = -I .macro_dir
+SVN_REVISION = -DREVISION=\"`svnversion -n .`\"
 DIM_FLAGS = -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux
 BOOST_FLAGS = -DBOOST_DISABLE_ASSERTS
 AM_CPPFLAGS = -Idim/dim $(DIM_FLAGS) $(BOOST_FLAGS) $(ROOTCPPFLAGS) \
-   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2
+   -O3 -Wall -Winit-self -Wpointer-arith -Wcast-align -Wextra -Wformat=2 \
+   $(SVN_REVISION)
 
 AM_CXXFLAGS = $(AM_CPPFLAGS) $(QT4_INCLUDES) \

trunk/FACT++/src/Main.h

@@ -62 +62 @@
     const Time now;
     io_service.Write(now, "---------------------------- Program ----------------------------");
-    io_service.Write(now, " Time: "+now.GetAsStr("%c"));
+    io_service.Write(now, " Current time: "+now.GetAsStr("%c"));
     io_service.Write(now, " Name: "+conf.GetName());
     io_service.Write(now, " Compiled: "__DATE__" "__TIME__);
-    io_service.Write(now, $Rev$);
+    io_service.Write(now, " Revision: "REVISION);
     io_service.Write(now, "---------------------------- Options ----------------------------");
     const multimap<string,string> map = conf.GetOptions();