Merge lp:~adrien-saladin/ptools/bzrrev into lp:ptools

[Adrien Saladin]

switch from svnrev to a bzr-powered revision numbering system.

Please test :)

[Pierre Poulain (pierrepo)]

How do I test correctly?
Just downloading the branch, compiling PTools and running PyAttract?

[Pierre Poulain (pierrepo)]

I tried. Compiled fine.
I get this with Attract.py
----------------------------------------------------------------------------------

**********************************************************************
** ATTRACT (Python edition) **
** version: 0.3 **
**********************************************************************
Attract.py
using PTools rev.:433, from branch: bzrrev, unique id: <email address hidden>

----------------------------------------------------------------------------------
I am not sure "version: 0.3" means anything. Is it for major revision, i.e milestones?
Instead of "0.3", could we have "1.0"?

Can you remove ":" after version, PTools, branch and unique id?

[Adrien Saladin (adrien-saladin)]

I'll do this tonight.
Should I encapsulate revision number, unique id, etc inside the
Attract header, instead of
'version 0.3' ?

Cheers,
Adrien

On Tue, Mar 16, 2010 at 11:16 AM, Pierre Poulain <email address hidden> wrote:
> I tried. Compiled fine.
> I get this with Attract.py
> ----------------------------------------------------------------------------------
>
> **********************************************************************
> **                ATTRACT  (Python edition)                         **
> **                version: 0.3                                      **
> **********************************************************************
> Attract.py
> using PTools rev.:433, from branch: bzrrev, unique id: <email address hidden>
>
> ----------------------------------------------------------------------------------
> I am not sure "version: 0.3" means anything. Is it for major revision, i.e milestones?
> Instead of "0.3", could we have "1.0"?
>
> Can you remove ":" after version, PTools, branch and unique id?
>
>
>
> --
> https://code.launchpad.net/~adrien-saladin/ptools/bzrrev/+merge/21328
> You are the owner of lp:~adrien-saladin/ptools/bzrrev.
>

[Pierre Poulain (pierrepo)]

I believe we should have two numberings.
One corresponding to the PTools library revision number (i.e 433), updated automatically by bazaar.
A second, corresponding to the PTools library version number (i.e. 1.0.4c a this time), updated manually and linked to what launchpad calls milestones.

As I said, revision number is increased at each commit. We increase version number only if major improvements have been brought to PTools.

The revision numbering system is coded in PTools (this is the purpose of this branch).
Could we had a version numbering system in PTools ? For example, in defining a new "std::string verstr" in version.h and setting up "this->verstr = 1.0.4c" in version.ccp

This way we could have:
----------------------------------------------------------------------------------

**********************************************************************
** ATTRACT (Python edition) **
** version: 1.0.4c **
**********************************************************************
Attract.py
using PTools rev.:433, from branch: bzrrev, unique id: <email address hidden>
----------------------------------------------------------------------------------

[lp:~adrien-saladin/ptools/bzrrev]

434. By Adrien Saladin on 2010-03-16

minor output format fix

[Adrien Saladin (adrien-saladin)]

Did my last commit fix the version issue ?

[Pierre Poulain (pierrepo)]

Yes and no.
Yes for the revision numbering and no for the version numbering.
"version: this is a development version," is not sufficient.
However, I will approve the branch.
I guess we have to talk more on the version numbering, I'll raise a bug for it.

review: Approve

[lp:~adrien-saladin/ptools/bzrrev]

435. By Adrien Saladin on 2010-03-18

cleaning all $Id$ from .h and .cpp files

=== modified file '.bzrignore'
--- .bzrignore	2010-01-30 17:37:52 +0000
+++ .bzrignore	2010-03-17 22:36:38 +0000
@@ -6,3 +6,5 @@
 svnrev
 .sconsign*
 Tests/ptoolstest.bin
+version.py
+bzrrev.h

=== modified file 'PyAttract/Attract.py'
--- PyAttract/Attract.py	2008-11-25 12:42:39 +0000
+++ PyAttract/Attract.py	2010-03-17 22:36:38 +0000
@@ -191,11 +191,12 @@
 print """
 **********************************************************************
 **                ATTRACT  (Python edition)                         **
-**                version: 0.3                                      **
+**                version: this is a development version,           **
+**                         see below for details                    **
 **********************************************************************
-Attract.py: $Id$
-using PTools: %s
-"""%(Version().revstr)
+Attract.py
+using PTools revision %s, from branch %s, unique id %s
+"""%(Version().revstr, Version().branchnick, Version().revid)
 
 
 

=== modified file 'SConstruct'
--- SConstruct	2010-02-04 13:30:21 +0000
+++ SConstruct	2010-03-17 22:36:38 +0000
@@ -18,11 +18,6 @@
 user_path_boost = ""
 
 
-
-
-#if you add a file in this list, please make sure that
-#this .cpp file begins with  " //$Id$"
-#and type: svn propset svn:keywords Id filename
 COMMON_CPP = Split ("""atom.cpp
                        basetypes.cpp
                        rigidbody.cpp
@@ -53,6 +48,8 @@
 COMMON_CPPPATH=['.']
 FFLAGS="-g"
 
+#generates bzrrev.h:
+import bzrrev
 
 
 def FIND_FILE(name,path, useEnvPath=False):
@@ -186,11 +183,6 @@
         PYTHON_CPP.append("Pybindings/%s"%file)
 
 
-#generate svnrev.h (revision number of the library)
-os.system("gcc svnrev.c -o svnrev")
-svnrevfiles = [f for f in os.listdir('.') if fnmatch.fnmatch(f, "*.cpp") or fnmatch.fnmatch(f,"*.h") and not fnmatch.fnmatch(f,"svnrev.*") ]  #list every .h or .cpp
-os.system("./svnrev %s"%(" ".join(svnrevfiles)))
-
 
 if compile_mode == "release":
     ccflags = "-Wall -O2 -fPIC -Woverloaded-virtual -DNDEBUG -ffunction-sections -fvisibility=hidden"

=== modified file 'atom.cpp'
--- atom.cpp	2009-05-24 20:30:19 +0000
+++ atom.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include <sstream>
 #include <stdio.h>
 

=== modified file 'atom.h'
--- atom.h	2008-11-25 12:26:40 +0000
+++ atom.h	2010-03-17 22:36:38 +0000
@@ -1,6 +1,3 @@
-// $Id$
-
-
 #ifndef ATOM_H
 #define ATOM_H
 

=== modified file 'atomselection.cpp'
--- atomselection.cpp	2008-12-23 11:05:27 +0000
+++ atomselection.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 //
 // C++ Implementation: atomselection
 //

=== modified file 'atomselection.h'
--- atomselection.h	2008-12-23 11:05:27 +0000
+++ atomselection.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 //
 // C++ Interface: atomselection
 //

=== modified file 'attractrigidbody.cpp'
--- attractrigidbody.cpp	2009-03-12 13:32:25 +0000
+++ attractrigidbody.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2008   Adrien Saladin                                    *
  *   [e-mail]                                               *

=== modified file 'attractrigidbody.h'
--- attractrigidbody.h	2009-03-12 13:32:25 +0000
+++ attractrigidbody.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2008   Adrien Saladin                                    *
  *   [e-mail]                                               *

=== modified file 'basetypes.cpp'
--- basetypes.cpp	2008-12-22 15:05:30 +0000
+++ basetypes.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2006-2008   Adrien Saladin                               *
  *   [e-mail]                                               *

=== modified file 'basetypes.h'
--- basetypes.h	2010-03-12 22:33:32 +0000
+++ basetypes.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2006-2008   Adrien Saladin                               *
  *   [e-mail]                                               *

=== added file 'bzrrev.py'
--- bzrrev.py	1970-01-01 00:00:00 +0000
+++ bzrrev.py	2010-03-17 22:36:38 +0000
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+
+import os
+
+
+################### bzrRev: uses bzr branch (if exists) information to 
+# determine a unique revision number
+def bzrRev():
+    if os.path.exists(".bzr"):
+       os.system("bzr version-info --python> version.py")
+       from string import Template
+       import version  #import newly generated version.py file
+       fich = open("bzrrev.h","w")
+       
+       template=Template("""/* This file was generated by the "bzrRev" function
+ * in SConstruct      
+ * You should not modify it manually, as it may be re-generated.
+
+ */
+
+#ifndef BZRREH_H
+#define BZRREV_H
+
+#define BZR_REV		 $revno
+#define BZR_REVSTR      "$revno"
+#define BZR_BRANCHNICK	"$branch_nick"
+#define BZR_REVDATE	"$date"
+#define BZR_REVID	"$revision_id"
+#define SVN_MODIFIED	"$clean"
+
+#endif /* BZRREV_H */
+
+
+""")
+       fich.write(template.substitute(version.version_info))
+    
+
+
+bzrRev()
\ No newline at end of file

=== modified file 'coord3d.cpp'
--- coord3d.cpp	2008-11-25 12:26:40 +0000
+++ coord3d.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include "coord3d.h"
 
 #include <string>

=== modified file 'coord3d.h'
--- coord3d.h	2008-11-25 12:26:40 +0000
+++ coord3d.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef COORD3D_H
 #define COORD3D_H
 

=== modified file 'coordsarray.cpp'
--- coordsarray.cpp	2009-06-02 14:57:07 +0000
+++ coordsarray.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2008   Adrien Saladin                                    *
  *   [e-mail]                                               *

=== modified file 'coordsarray.h'
--- coordsarray.h	2008-11-25 12:26:40 +0000
+++ coordsarray.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2008   Adrien Saladin                                    *
  *   [e-mail]                                               *

=== modified file 'derivify.h'
--- derivify.h	2008-11-25 12:26:40 +0000
+++ derivify.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright Joaquim R. R. A. Martins,  Peter Sturdza                     *
  *                                                                          *

=== modified file 'forcefield.cpp'
--- forcefield.cpp	2010-02-04 13:30:21 +0000
+++ forcefield.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include "forcefield.h"
 #include "geometry.h"
 #include "rmsd.h"

=== modified file 'forcefield.h'
--- forcefield.h	2010-02-04 13:30:21 +0000
+++ forcefield.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef FORCEFIELD_H
 #define FORCEFIELD_H
 

=== modified file 'geometry.cpp'
--- geometry.cpp	2008-12-19 23:07:46 +0000
+++ geometry.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include "geometry.h"
 
 

=== modified file 'geometry.h'
--- geometry.h	2008-12-19 23:07:46 +0000
+++ geometry.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef GEOMETRY
 #define GEOMETRY
 

=== modified file 'interface.py'
--- interface.py	2009-01-24 17:35:21 +0000
+++ interface.py	2010-03-17 22:36:38 +0000
@@ -3,10 +3,9 @@
 
 import fnmatch
 
-#generate svnrev.h (revision number of the library)
-os.system("gcc svnrev.c -o svnrev")
-svnrevfiles = [f for f in os.listdir('.') if fnmatch.fnmatch(f, "*.cpp") or fnmatch.fnmatch(f,"*.h") and not fnmatch.fnmatch(f,"svnrev.*") ]  #list every .h or .cpp
-os.system("./svnrev %s"%(" ".join(svnrevfiles)))
+#generates bzrrev.h:
+import bzrrev
+
 
 #Creating an instance of class that will help you to expose your declarations
 mb = module_builder.module_builder_t( [os.path.abspath('./ptools.h'), os.path.abspath('./py_details.h')]

=== modified file 'mcopff.cpp'
--- mcopff.cpp	2008-11-25 12:26:40 +0000
+++ mcopff.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include "mcopff.h"
 #include <cassert>
 

=== modified file 'mcopff.h'
--- mcopff.h	2010-02-04 13:30:21 +0000
+++ mcopff.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 //  multicopy-forcefield
 //
 //

=== modified file 'pairlist.cpp'
--- pairlist.cpp	2008-11-25 12:26:40 +0000
+++ pairlist.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include "pairlist.h"
 
 namespace PTools

=== modified file 'pairlist.h'
--- pairlist.h	2008-11-25 12:26:40 +0000
+++ pairlist.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef PAIRLIST_H
 #define PAIRLIST_H
 

=== modified file 'pdbio.cpp'
--- pdbio.cpp	2009-01-23 10:24:54 +0000
+++ pdbio.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include <algorithm>
 #include <cctype>
 #include <iostream>

=== modified file 'pdbio.h'
--- pdbio.h	2009-01-23 10:24:54 +0000
+++ pdbio.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef PDBIO_H
 #define PDBIO_H
 

=== modified file 'ptools.h'
--- ptools.h	2008-12-22 15:05:30 +0000
+++ ptools.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 //
 // C++ Interface: generic interface for ptools
 //

=== modified file 'py_details.h'
--- py_details.h	2008-11-25 12:26:40 +0000
+++ py_details.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include "pairlist.h"
 #include "ptools.h"
 #include "coord3d.h"

=== modified file 'rigidbody.cpp'
--- rigidbody.cpp	2009-05-24 20:30:19 +0000
+++ rigidbody.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2006-2008   Adrien Saladin                               *
  *   [e-mail]                                               *

=== modified file 'rigidbody.h'
--- rigidbody.h	2009-05-24 20:30:19 +0000
+++ rigidbody.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2006-2008   Adrien Saladin                               *
  *   [e-mail]                                               *

=== modified file 'rmsd.cpp'
--- rmsd.cpp	2008-12-22 15:05:30 +0000
+++ rmsd.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include <iostream>
 #include <cassert>
 #include <stdexcept>

=== modified file 'rmsd.h'
--- rmsd.h	2008-12-22 15:05:30 +0000
+++ rmsd.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #ifndef RMSD_H
 #define RMSD_H
 

=== modified file 'screw.h'
--- screw.h	2008-12-22 15:05:30 +0000
+++ screw.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2006-2008   Adrien Saladin                               *
  *   [e-mail]                                               *

=== modified file 'superpose.cpp'
--- superpose.cpp	2008-12-22 15:05:30 +0000
+++ superpose.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2006-2008   Adrien Saladin                               *
  *   [e-mail]                                               *

=== modified file 'superpose.h'
--- superpose.h	2008-12-22 15:05:30 +0000
+++ superpose.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 /****************************************************************************
  *   Copyright (C) 2006-2008   Adrien Saladin                               *
  *   [e-mail]                                               *

=== modified file 'surface.cpp'
--- surface.cpp	2010-03-12 22:04:33 +0000
+++ surface.cpp	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 
 #include "surface.h"
 #include "attractrigidbody.h"

=== modified file 'surface.h'
--- surface.h	2010-03-12 22:04:33 +0000
+++ surface.h	2010-03-17 22:36:38 +0000
@@ -1,4 +1,3 @@
-// $Id$
 #include <iostream>
 #include <fstream>
 #include <string>

=== removed file 'svnrev.c'
--- svnrev.c	2008-11-25 12:26:40 +0000
+++ svnrev.c	1970-01-01 00:00:00 +0000
@@ -1,280 +0,0 @@
-/*  SvnRev
- *
- *  This utility retrieves the highest number that follows the "$Id:�$" keyword
- *  or a combination of the $Rev:�$ and $Date:�$ keywords. The Subversion
- *  version control system expands these keywords and keeps them up to date.
- *  For an example of the tag, see the end of this comment.
- *
- *  Details on the usage and the operation of this utility is available on-line
- *  at http://www.compuphase.com/svnrev.htm.
- *
- *
- *  License
- *
- *  Copyright (c) 2005-2007, ITB CompuPhase (www.compuphase.com).
- *
- *  This software is provided "as-is", without any express or implied warranty.
- *  In no event will the authors be held liable for any damages arising from
- *  the use of this software.
- *
- *  Permission is granted to anyone to use this software for any purpose,
- *  including commercial applications, and to alter it and redistribute it
- *  freely, subject to the following restrictions:
- *
- *  1.  The origin of this software must not be misrepresented; you must not
- *      claim that you wrote the original software. If you use this software in
- *      a product, an acknowledgment in the product documentation would be
- *      appreciated but is not required.
- *  2.  Altered source versions must be plainly marked as such, and must not be
- *      misrepresented as being the original software.
- *  3.  This notice may not be removed or altered from any source distribution.
- *
- *  Pursuant to #2 above: this version was modified by Tom McCann ([e-mail])
- *  to support output of .java files.
- *
- * Version: $Id: svnrev.c 3852 2007-11-26 10:37:51Z thiadmer $
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "svnrev.h"
-
-
-#if defined __WIN32__ || defined _Win32 || defined _WIN32
-  #define DIRSEP '\\'
-#elif defined macintosh
-  #define DIRSEP ':'
-#else
-  /* assume Linux/Unix */
-  #define DIRSEP '/'
-#endif
-
-
-static void about(void)
-{
-  printf("svnrev 1.5." SVN_REVSTR "\n\n");
-  printf("Usage: svnrev [-ofilename] [-i] [-jpackage] <input> [input [...]]\n\n"
-         "The -o option sets the filename for the output file with the build number.\n"
-         "When no filename follows \"-o\", the result is written to stdout. The default\n"
-         "filename is \"svnrev.h\" for C/C++ and \"VersionInfo.java\" for Java.\n\n"
-         "The -i option should be used when the file list is only a partial set of all\n"
-         "files. With this option, svnrev also scans the output file that was generated\n"
-         "on a previous run.\n\n"
-         "The -j option writes a java package file instead of a C/C++ header file. The\n"
-         "name of the package must follow the option.\n");
-  exit(1);
-}
-
-static void processfile(const char *name, int failsilent,
-                        int *max_build, int *accum_build,
-                        int *max_year, int *max_month, int *max_day,
-                        int *ismodified)
-
-{
-  char str[512], str_base[512];
-  char name_base[512];
-  char *p1;
-  FILE *fp, *fp_base;
-  int build, maj_build;
-  int year, month, day;
-  int cnt;
-  char modchar;
-
-  /* since we also want to verify whether the file is modified in version
-   * control, get the path to the working copy name
-   * for every source file "<path>\<filename>, the "working copy" base can
-   * be found in "<path>\.svn\text-base\<filename>.svn-base"
-   */
-  if ((p1 = strrchr(name, DIRSEP)) != NULL) {
-    ++p1; /* skip directory separator character ('\' in Windows, '/' in Linux) */
-    strncpy(name_base, name, (int)(p1 - name));
-    name_base[(int)(p1 - name)] = '\0';
-  } else {
-    name_base[0] = '\0';
-    p1 = (char*)name;
-  } /* if */
-  sprintf(name_base + strlen(name_base), ".svn%ctext-base%c%s.svn-base",
-          DIRSEP, DIRSEP, p1);
-
-  /* first extract the revision keywords */
-  fp = fopen(name, "r");
-  if (fp == NULL) {
-    if (!failsilent)
-      fprintf(stderr, "Failed to open input file '%s'\n", name);
-    return;
-  } /* if */
-  fp_base = fopen(name_base, "r");  /* fail silently */
-  build = 0;
-  maj_build = 0;      /* RCS / CVS */
-  year = month = day = 0;
-
-  while (fgets(str, sizeof str, fp) != NULL) {
-    if (fp_base == NULL || fgets(str_base, sizeof str_base, fp_base) == NULL)
-      str_base[0] = '\0';
-    if ((p1 = strstr(str, "$Id:")) != NULL && strchr(p1+1, '$') != NULL) {
-      if (sscanf(p1, "$Id: %*s %d %d-%d-%d", &build, &year, &month, &day) < 4
-          && sscanf(p1, "$Id: %*s %d %d/%d/%d", &build, &year, &month, &day) < 4)
-        if (sscanf(p1, "$Id: %*s %d.%d %d-%d-%d", &maj_build, &build, &year, &month, &day) < 5)
-          sscanf(p1, "$Id: %*s %d.%d %d/%d/%d", &maj_build, &build, &year, &month, &day);
-    } else if ((p1 = strstr(str, "$Rev:")) != NULL && strchr(p1+1, '$') != NULL) {
-      if (sscanf(p1, "$Rev: %d.%d", &maj_build, &build) < 2) {
-        sscanf(p1, "$Rev: %d", &build);
-        maj_build = 0;
-      } /* if */
-    } else if ((p1 = strstr(str, "$Revision:")) != NULL && strchr(p1+1, '$') != NULL) {
-      if (sscanf(p1, "$Revision: %d.%d", &maj_build, &build) < 2) {
-        /* SvnRev also writes this keyword in its own generated file; read it
-         * back for partial updates
-         */
-        cnt = sscanf(p1, "$Revision: %d%c", &build, &modchar);
-        if (cnt == 2 && modchar == 'M' && ismodified != NULL)
-          *ismodified = 1;
-        maj_build = 0;
-      } /* if */
-    } else if ((p1 = strstr(str, "$Date:")) != NULL && strchr(p1+1, '$') != NULL) {
-      if (sscanf(p1, "$Date: %d-%d-%d", &year, &month, &day) < 3)
-        sscanf(p1, "$Date: %d/%d/%d", &year, &month, &day);
-    } else if (ismodified != NULL && *ismodified == 0 && fp_base != NULL) {
-      /* no keyword present, compare the lines for equivalence */
-      *ismodified = strcmp(str, str_base) != 0;
-    } /* if */
-
-    if (maj_build)
-      *accum_build += build;            /* RCS / CVS */
-    else if (build > *max_build)
-      *max_build = build;               /* Subversion */
-    if (year > *max_year
-        || (year == *max_year && month > *max_month)
-        || (year == *max_year && month == *max_month && day > *max_day))
-    {
-        *max_year = year;
-        *max_month = month;
-        *max_day = day;
-    } /* if */
-    if (build > 0 && year > 0 && (fp_base == NULL || ismodified == NULL || *ismodified != 0))
-      break;      /* both build # and date found, not comparing or modification
-                   * already found => no need to search further */
-
-  } /* while */
-  fclose(fp);
-  if (fp_base != NULL)
-    fclose(fp_base);
-}
-
-int main(int argc, char *argv[])
-{
-  char *outname = NULL;
-  FILE *fp;
-  int index;
-  int process_self = 0;
-  int max_build, accum_build;
-  int max_year, max_month, max_day;
-  int ismodified;
-  int write_java = 0;   /* flag for Java output, 0=.h output, 1=.java output */
-  /* java package to put revision info in.
-   * REVIEW - I assume if you want Java output you will specify a package. */
-  char *java_package = NULL;
-
-  if (argc <= 1)
-    about();
-
-  /* phase 1: scan through all files and get the highest build number */
-
-  max_build = 0;
-  accum_build = 0;      /* for RCS / CVS */
-  max_year = max_month = max_day = 0;
-  ismodified = 0;
-  for (index = 1; index < argc; index++) {
-    /* check for options */
-    if (argv[index][0] == '-'
-#if defined __WIN32__ || defined _Win32 || defined _WIN32
-     || argv[index][0] == '/'
-#endif
-    )
-    {
-      switch (argv[index][1]) {
-      case 'o':
-        outname = &argv[index][2];
-        continue;
-      case 'i':
-        process_self = 1;
-        continue;
-      case 'j':
-        write_java=1;
-        java_package = &argv[index][2];
-        continue;
-      default:
-        fprintf(stderr, "Invalid option '%s'\n", argv[index]);
-        about();
-      } /* switch */
-    } /* if */
-
-    processfile(argv[index], 0, &max_build, &accum_build, &max_year, &max_month, &max_day, &ismodified);
-  } /* for */
-
-  if (outname == NULL)
-    outname = write_java ? "SvnRevision.java" : "svnrev.h";
-
-  /* also run over the existing header file, if any */
-  if (process_self && *outname != '\0')
-    processfile(outname, 1, &max_build, &accum_build, &max_year, &max_month, &max_day, NULL/*&ismodified*/);
-
-  if (accum_build > max_build)
-    max_build = accum_build;
-
-  /* phase 2: write a file with this highest build number */
-  if (*outname == '\0') {
-    fp = stdout;
-  } else if ((fp = fopen(outname, "w")) == NULL) {
-    fprintf(stderr, "Failed to create output file '%s'\n", outname);
-    return 2;
-  } /* if */
-  if (*outname != '\0') {
-    /* don't print the comments to stdout */
-    fprintf(fp, "/* This file was generated by the \"svnrev\" utility\n"
-                " * (http://www.compuphase.com/svnrev.htm).\n"
-                " * You should not modify it manually, as it may be re-generated.\n"
-                " *\n");
-    if (ismodified)
-      fprintf(fp, " * $Revision: %dM$\n", max_build);
-    else
-      fprintf(fp, " * $Revision: %d$\n", max_build);
-    fprintf(fp, " * $Date: %04d-%02d-%02d$\n"
-                " */\n\n", max_year, max_month, max_day);
-  } /* if */
-
-  if (write_java) {
-    if (java_package == NULL || *java_package == '\0')
-      java_package = "com.compuphase";
-    fprintf(fp, "package %s;\n\n", java_package);
-    fprintf(fp, "public interface SvnRevision\n");
-    fprintf(fp, "{\n");
-    fprintf(fp, "    public final static int SVN_REV = %d;\n", max_build);
-    if (ismodified)
-      fprintf(fp, "    public final static String SVN_REVSTR = \"%dM\";\n", max_build);
-    else
-      fprintf(fp, "    public final static String SVN_REVSTR = \"%d\";\n", max_build);
-    fprintf(fp, "    public final static String SVN_REVDATE = \"%04d-%02d-%02d\";\n", max_year, max_month, max_day);
-    fprintf(fp, "    public final static long SVN_REVSTAMP = %04d%02d%02dL;\n", max_year, max_month, max_day);
-    fprintf(fp, "    public final static int SVN_MODIFIED = %d;\n", ismodified);
-    fprintf(fp, "}\n\n");
-  } else {
-    fprintf(fp, "#ifndef SVNREH_H\n");
-    fprintf(fp, "#define SVNREV_H\n\n");
-    fprintf(fp, "#define SVN_REV\t\t%d\n", max_build);
-    if (ismodified)
-      fprintf(fp, "#define SVN_REVSTR\t\"%dM\"\n", max_build);
-    else
-      fprintf(fp, "#define SVN_REVSTR\t\"%d\"\n", max_build);
-    fprintf(fp, "#define SVN_REVDATE\t\"%04d-%02d-%02d\"\n", max_year, max_month, max_day);
-    fprintf(fp, "#define SVN_REVSTAMP\t%04d%02d%02dL\n", max_year, max_month, max_day);
-    fprintf(fp, "#define SVN_MODIFIED\t%d\n", ismodified);
-    fprintf(fp, "\n#endif /* SVNREV_H */\n");
-  } /* if */
-
-  if (*outname != '\0')
-    fclose(fp);
-
-  return 0;
-}

=== removed file 'svnrev.h'
--- svnrev.h	2010-02-04 13:30:21 +0000
+++ svnrev.h	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-/* This file was generated by the "svnrev" utility
- * (http://www.compuphase.com/svnrev.htm).
- * You should not modify it manually, as it may be re-generated.
- *
- * $Revision: 0$
- * $Date: 0000-00-00$
- */
-
-#ifndef SVNREH_H
-#define SVNREV_H
-
-#define SVN_REV		0
-#define SVN_REVSTR	"0"
-#define SVN_REVDATE	"0000-00-00"
-#define SVN_REVSTAMP	00000000L
-#define SVN_MODIFIED	0
-
-#endif /* SVNREV_H */

=== modified file 'version.cpp'
--- version.cpp	2008-12-23 11:05:27 +0000
+++ version.cpp	2010-03-17 22:36:38 +0000
@@ -1,13 +1,13 @@
-//$Id$
+
 #include "version.h"
 
-
 Version::Version()
 {
-
-revnb = SVN_REV;
-revstr = std::string(SVN_REVSTR);
-revdate = SVN_REVDATE;
+this->revnb = BZR_REV;
+this->revstr = BZR_REVSTR;
+this->revdate = BZR_REVDATE;
+this->revid = BZR_REVID;
+this->branchnick = BZR_BRANCHNICK;
 }
 
 

=== modified file 'version.h'
--- version.h	2008-11-25 12:26:40 +0000
+++ version.h	2010-03-17 22:36:38 +0000
@@ -1,22 +1,32 @@
-// $Id$
 #ifndef VERSION_H
 #define VERSION_H
 
 
-#include "svnrev.h"
+#include "bzrrev.h"
 #include <string>
 
-
+/*! \brief PTools version class
+*
+* This simple class is used to define unique
+* revision numbers, now relying on bazaar.
+* This unique number can be used to know exactly
+* which version of the library was used to perform
+* a simulation.
+*/
 struct Version
 {
 
-int revnb;
-std::string revstr;
-std::string revdate;
-std::string revstamp;
-
-
-Version(); //default constructor
+//public attributes
+public:
+    int revnb;
+    std::string revstr;
+    std::string revdate;
+    std::string revid;
+    std::string branchnick;
+
+//public methods
+public:
+    Version(); //default constructor
 
 };