[sword-devel] Re: [sword-cvs] sword/include config.h,1.1,1.2 swversion.h,1.16,1.17

[Joachim Ansorg]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Daniel,
I did that commit.
I think it's a good idea to change the version in CVS.

BTW, I changed the swversion class to use the version in config.h which is 
from the auto-tools.
The only place where the version is defined is configure.ac, so we won't 
forget to change other places if the version changes,

I also enhanced the Makefile.am stuff a bit to include more files in make 
dist, e.g. the  Kylix and BCPP project files for the lib, the utils and 
tools. 

Joachim

> Let's discuss this. The API has changed in cvs since 1.5.7 IMHO this
> makes it a bad idea to compile and build cvs as 1.5.7 since 1.5.7 is
> what it isn't.
>
> Personally I think it is reasonable to label cvs as the next version,
> but it's not a big deal imho as long as it is labelled as something
> newer than the released version.
>
> Alternative possible names 1.5.8pre or 1.5.8cvs or 1.5.7+cvs or ... er,
> there must be something that works better than these.
>
> However I don't know what these will do for the version check macros
> and other things like that.
>
> Oops, it's too late now. I'll try and be more coherent later today.
>
> Regards,
> Daniel
>
> P.S. Please identify yourself in cvs commit messages as cvs doesn't to
> the mailing list
>
> On 10 Feb 2004, at 18:15, sword@www.crosswire.org wrote:
> > Update of /cvs/core/sword/include
> > In directory www:/tmp/cvs-serv25215/include
> >
> > Modified Files:
> > 	config.h swversion.h
> > Log Message:
> > fix
> >
> > Index: config.h
> > ===================================================================
> > RCS file: /cvs/core/sword/include/config.h,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -d -r1.1 -r1.2
> > --- config.h	10 Feb 2004 17:59:46 -0000	1.1
> > +++ config.h	10 Feb 2004 18:15:54 -0000	1.2
> > @@ -44,19 +44,19 @@
> >  #define PACKAGE_NAME "sword"
> >
> >  /* Define to the full name and version of this package. */
> > -#define PACKAGE_STRING "sword 1.5.8"
> > +#define PACKAGE_STRING "sword 1.5.7"
> >
> >  /* Define to the one symbol short name of this package. */
> >  #define PACKAGE_TARNAME "sword"
> >
> >  /* Define to the version of this package. */
> > -#define PACKAGE_VERSION "1.5.8"
> > +#define PACKAGE_VERSION "1.5.7"
> >
> >  /* Define to 1 if you have the ANSI C header files. */
> >  #define STDC_HEADERS 1
> >
> >  /* Version number of package */
> > -#define VERSION "1.5.8"
> > +#define VERSION "1.5.7"
> >
> >  /* Define to 1 if your processor stores words with the most
> > significant byte
> >     first (like Motorola and SPARC, unlike Intel and VAX). */
> >
> > Index: swversion.h
> > ===================================================================
> > RCS file: /cvs/core/sword/include/swversion.h,v
> > retrieving revision 1.16
> > retrieving revision 1.17
> > diff -u -d -r1.16 -r1.17
> > --- swversion.h	10 Feb 2004 16:35:59 -0000	1.16
> > +++ swversion.h	10 Feb 2004 18:15:54 -0000	1.17
> > @@ -19,8 +19,6 @@
> >   *
> >   */
> >
> > -#include "config.h"
> > -
> >  #ifndef SWVERSION_H
> >  #define SWVERSION_H
> >
> >
> >
> > _______________________________________________
> > sword-cvs mailing list
> > sword-cvs@crosswire.org
> > http://www.crosswire.org/mailman/listinfo/sword-cvs
>
> _______________________________________________
> sword-devel mailing list
> sword-devel@crosswire.org
> http://www.crosswire.org/mailman/listinfo/sword-devel

- -- 
<>< Re: deemed!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)

iD8DBQFAKixmEyRIb2AZBB0RAo1aAJ40e4+9TQEh2Km2TX3sMXJwqUz2nQCgraMn
fqRPlpfGuWsHMYrXg13fa4Q=
=1MUm
-----END PGP SIGNATURE-----