[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    [PATCH] Re: Move KDE_VERSION* to a header by themselves.
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2002-02-28 22:07:47
[Download RAW message or body]

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

On Sunday 24 February 2002 20:58, Rob Kaper wrote:
> On Saturday 23 February 2002 21:19, Marc Mutz wrote:
> > - - kdeversion.h is preferable if we only put the version stuff
> > there, since in this case the name carries the exact semantics of
> > the contents
>
> Makes sense. If we grow bigger we can always include kdeversion.h
> from kdeglobal.h and perhaps even kde.h.
<snip>

So, here it is. This trivial patch just #includes kdeversion.h at the 
same place that held the #defines and adds kdeversion.h to 
include_HEADERS.

The release coordinators might use some script to update the version 
number, so those need adjusting, as well, obviously...

Marc

- -- 
Marc Mutz <mutz@kde.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: For info see http://www.gnupg.org

iD8DBQE8fqoz3oWD+L2/6DgRAspXAJoCw5bcagkTMOP1W48s4wwV7DlMUACcDDGs
d2g1JAApTMV3bmckuqGQlKk=
=VmCO
-----END PGP SIGNATURE-----

["kdeversion.h" (text/x-chdr)]

/* This file is part of the KDE libraries
    Copyright (c) 2002 KDE Team

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.

    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
*/

// $Id: kapplication.h,v 1.263 2002/02/27 20:30:08 faure Exp $

#ifndef _KDE_VERSION_H_
#define _KDE_VERSION_H_

#define KDE_VERSION 293
#define KDE_VERSION_STRING "2.93 (CVS >= 20020213)"
#define KDE_VERSION_MAJOR 2
#define KDE_VERSION_MINOR 9
#define KDE_VERSION_RELEASE 3

#endif // _KDE_VERSION_H_

["kdeversion.diff" (text/x-diff)]

? kdecore/kdeversion.h
Index: kdecore/Makefile.am
===================================================================
RCS file: /home/kde/kdelibs/kdecore/Makefile.am,v
retrieving revision 1.279
diff -u -3 -p -r1.279 Makefile.am
--- kdecore/Makefile.am	2002/02/21 22:39:18	1.279
+++ kdecore/Makefile.am	2002/02/28 22:06:30
@@ -29,7 +29,7 @@ lib_LTLIBRARIES = libkdefakes.la libkdec
 include_HEADERS = kconfig.h kconfigdata.h ksimpleconfig.h kconfigbase.h \
 	kdesktopfile.h kurl.h ksock.h kaboutdata.h kcmdlineargs.h \
 	kconfigbackend.h kapp.h kapplication.h kuniqueapp.h kuniqueapplication.h \
-	kcharsets.h \
+	kcharsets.h kdeversion.h \
 	kprocess.h kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
 	kwinmodule.h kwin.h krootprop.h \
 	kshortcut.h kkeynative.h kaccel.h kglobalaccel.h \
Index: kdecore/kapplication.h
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kapplication.h,v
retrieving revision 1.263
diff -u -3 -p -r1.263 kapplication.h
--- kdecore/kapplication.h	2002/02/27 20:30:08	1.263
+++ kdecore/kapplication.h	2002/02/28 22:06:31
@@ -24,11 +24,7 @@
 #define _KAPP_H
 
 // Version macros. Never put this further down.
-#define KDE_VERSION 293
-#define KDE_VERSION_STRING "2.93 (CVS >= 20020213)"
-#define KDE_VERSION_MAJOR 2
-#define KDE_VERSION_MINOR 9
-#define KDE_VERSION_RELEASE 3
+#include "kdeversion.h"
 
 class KConfig;
 class KCharsets;


[prev in list] [next in list] [prev in thread] [next in thread]