--- trunk/src/applications/openmd/openmd.cpp 2010/03/30 15:25:09 1429 +++ trunk/src/applications/openmd/openmd.cpp 2010/07/07 16:58:41 1463 @@ -59,7 +59,6 @@ using namespace OpenMD; using namespace OpenMD; - int main(int argc,char* argv[]){ // first things first, all of the initializations @@ -70,7 +69,19 @@ int main(int argc,char* argv[]){ initSimError(); // the error handler srand48( 1337 ); // the random number generator. - + + std::string svnrev; + //convert a macro from compiler to a string in c++ + STR_DEFINE(svnrev, SVN_REV ); + + std::string revision; + + if (!svnrev.empty()) { + revision.assign(" Revision: " + svnrev); + } + + revision.resize(19,' '); + #ifdef IS_MPI if( worldRank == 0 ){ #endif @@ -83,9 +94,9 @@ int main(int argc,char* argv[]){ " | \\____/ .___/\\___/_/ /_//_/ /_//_____/ Copyright 2004-2010 by the |\n"<< " | /_/ University of Notre Dame. |\n"<< " | |\n"<< - " | version " << - OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << " Rev:" << __get_svn_version() << - " http://www.openmd.net |\n"<< + " | version " << + OPENMD_VERSION_MAJOR << "." << OPENMD_VERSION_MINOR << revision << + " http://www.openmd.net |\n"<< " | |\n"<< " | OpenMD is an OpenScience project. All source code is available for |\n"<< " | any use whatsoever under a BSD-style license. |\n"<< @@ -193,18 +204,3 @@ int main(int argc,char* argv[]){ return 0 ; } - -extern "C" { - - char svnVersionString[1024]; - char* __get_svn_version(){ - int howMuchToCopy=0; - char *theVersion="$Revision$"; - howMuchToCopy=strlen(theVersion+11) - 2; - assert(howMuchToCopy>0); - memcpy(svnVersionString, theVersion+11, howMuchToCopy); - svnVersionString[howMuchToCopy] = '\0'; - return svnVersionString; - } - -}