[maemo-commits] [maemo-commits] r12828 - in projects/haf/trunk/hildon-1: . src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-07-25 11:07:38 +0300 (Wed, 25 Jul 2007)
New Revision: 12828

Added:
   projects/haf/trunk/hildon-1/src/hildon-version.h.in
Modified:
   projects/haf/trunk/hildon-1/ChangeLog
   projects/haf/trunk/hildon-1/configure.ac
   projects/haf/trunk/hildon-1/src/Makefile.am
   projects/haf/trunk/hildon-1/src/hildon.h
Log:
Adding the HILDON_CHECK_VERSION macro. Fixes: NB#62061.



Modified: projects/haf/trunk/hildon-1/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-1/ChangeLog	2007-07-25 07:35:22 UTC (rev 12827)
+++ projects/haf/trunk/hildon-1/ChangeLog	2007-07-25 08:07:38 UTC (rev 12828)
@@ -1,5 +1,12 @@
 2007-07-25  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* configure.ac:
+	* src/Makefile.am:
+	* src/hildon-version.h.in:
+	* src/hildon.h: Adding the HILDON_CHECK_VERSION macro. Fixes: NB#62061.
+
+2007-07-25  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
 	* src/hildon-volumebar.c: Updating the docs.
 
 2007-07-25  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 

Modified: projects/haf/trunk/hildon-1/configure.ac
===================================================================
--- projects/haf/trunk/hildon-1/configure.ac	2007-07-25 07:35:22 UTC (rev 12827)
+++ projects/haf/trunk/hildon-1/configure.ac	2007-07-25 08:07:38 UTC (rev 12828)
@@ -173,7 +173,9 @@
 AC_SUBST(HILDON_OBJ_CFLAGS)
 AC_SUBST(HILDON_OBJ_LIBS)
 
-AC_CONFIG_FILES([Makefile src/Makefile  \
+AC_CONFIG_FILES([Makefile               \
+                 src/Makefile           \
+                 src/hildon-version.h   \
                  pkgconfig/Makefile     \
                  examples/Makefile      \
                  pkgconfig/hildon.pc    \

Modified: projects/haf/trunk/hildon-1/src/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-1/src/Makefile.am	2007-07-25 07:35:22 UTC (rev 12827)
+++ projects/haf/trunk/hildon-1/src/Makefile.am	2007-07-25 08:07:38 UTC (rev 12828)
@@ -104,7 +104,8 @@
 							  hildon-wizard-dialog.h			\
 							  hildon-calendar.h				\
 							  hildon-bread-crumb-trail.h			\
-							  hildon-bread-crumb.h
+							  hildon-bread-crumb.h				\
+							  hildon-version.h
 
 libhildon_ at PACKAGE_VERSION_MAJOR@_include_HEADERS 	= $(libhildon_ at PACKAGE_VERSION_MAJOR@_public_headers)			\
 							  $(libhildon_ at PACKAGE_VERSION_MAJOR@_built_public_headers)

Added: projects/haf/trunk/hildon-1/src/hildon-version.h.in
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon-version.h.in	2007-07-25 07:35:22 UTC (rev 12827)
+++ projects/haf/trunk/hildon-1/src/hildon-version.h.in	2007-07-25 08:07:38 UTC (rev 12828)
@@ -0,0 +1,39 @@
+/*
+ * This file is a part of hildon
+ *
+ * Copyright (C) 2005, 2006, 2007 Nokia Corporation, all rights reserved.
+ *
+ * Contact: Michael Dominic Kostrzewa <michael.kostrzewa at nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; version 2.1 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef                                         __HILDON_VERSION_H__
+#define                                         __HILDON_VERSION_H__
+
+#define HILDON_MAJOR_VERSION				    (@PACKAGE_VERSION_MAJOR@)
+#define HILDON_MINOR_VERSION				    (@PACKAGE_VERSION_MINOR@)
+#define HILDON_MICRO_VERSION				    (@PACKAGE_VERSION_MICRO@)
+
+#define	HILDON_CHECK_VERSION(major,minor,micro)	\
+    (HILDON_MAJOR_VERSION > (major) || \
+     (HILDON_MAJOR_VERSION == (major) && HILDON_MINOR_VERSION > (minor)) || \
+     (HILDON_MAJOR_VERSION == (major) && HILDON_MINOR_VERSION == (minor) && \
+      HILDON_MICRO_VERSION >= (micro)))
+
+#endif                                          /* __HILDON_VERSION_H__ */
+

Modified: projects/haf/trunk/hildon-1/src/hildon.h
===================================================================
--- projects/haf/trunk/hildon-1/src/hildon.h	2007-07-25 07:35:22 UTC (rev 12827)
+++ projects/haf/trunk/hildon-1/src/hildon.h	2007-07-25 08:07:38 UTC (rev 12828)
@@ -25,6 +25,7 @@
 #ifndef                                         __HILDON_H__
 #define                                         __HILDON_H__
 
+#include                                        "hildon-version.h"
 #include                                        "hildon-banner.h"
 #include                                        "hildon-calendar-popup.h"
 #include                                        "hildon-caption.h"