Better Version Information about openexr HOT 2 CLOSED

From 60cdff8a6f5c4e25a374e5f366d6e9b4efd869b3 Mon Sep 17 00:00:00 2001
From: Piotr Stanczyk <pstanczyk@ilm.com>
Date: Wed, 15 Aug 2012 15:07:14 -0700
Subject: [PATCH] Adding major, minor, patch version information to the
 *Config.h files.

---
 IlmBase/config/IlmBaseConfig.h.in |   13 ++++++++++++-
 IlmBase/configure.ac              |   14 ++++++++++++--
 OpenEXR/config/OpenEXRConfig.h.in |   10 ++++++++++
 OpenEXR/configure.ac              |   13 +++++++++++--
 4 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/IlmBase/config/IlmBaseConfig.h.in b/IlmBase/config/IlmBaseConfig.h.in
index ae3d4c2..ac6f336 100644
--- a/IlmBase/config/IlmBaseConfig.h.in
+++ b/IlmBase/config/IlmBaseConfig.h.in
@@ -47,7 +47,18 @@


 //
-// Version string for runtime access
+// Version information
 //
 #undef ILMBASE_VERSION_STRING
 #undef ILMBASE_PACKAGE_STRING
+
+#undef ILMBASE_VERSION_MAJOR
+#undef ILMBASE_VERSION_MINOR
+#undef ILMBASE_VERSION_PATCH
+
+// Version as a single hex number, e.g. 0x01000300 == 1.0.3
+#define ILMBASE_VERSION_HEX ((ILMBASE_VERSION_MAJOR << 24) | \
+                             (ILMBASE_VERSION_MINOR << 16) | \
+                             (ILMBASE_VERSION_PATCH <<  8))
+
+
diff --git a/IlmBase/configure.ac b/IlmBase/configure.ac
index 1c10161..1ff39f1 100644
--- a/IlmBase/configure.ac
+++ b/IlmBase/configure.ac
@@ -1,7 +1,13 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(IlmBase, 2.0.0)
-AC_SUBST(ILMBASE_VERSION, 2.0.0)
-AC_SUBST(ILMBASE_VERSION_SAFE, 2_0_0)
+
+AC_SUBST(ILMBASE_VERSION_MAJOR, 2)
+AC_SUBST(ILMBASE_VERSION_MINOR, 0)
+AC_SUBST(ILMBASE_VERSION_PATCH, 0)
+
+AC_SUBST(ILMBASE_VERSION, ${ILMBASE_VERSION_MAJOR}.${ILMBASE_VERSION_MINOR}.${ILMBASE_VERSION_PATCH})
+AC_SUBST(ILMBASE_VERSION_SAFE, ${ILMBASE_VERSION_MAJOR}_${ILMBASE_VERSION_MINOR}_${ILMBASE_VERSION_PATCH})
+
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(ImathTest/main.cpp)
 AM_CONFIG_HEADER(config/IlmBaseConfig.h)
@@ -111,6 +117,10 @@ fi
 dnl Define the version string
 AC_DEFINE_UNQUOTED(ILMBASE_VERSION_STRING, "${VERSION}")
 AC_DEFINE_UNQUOTED(ILMBASE_PACKAGE_STRING, "${PACKAGE_STRING}")
+AC_DEFINE_UNQUOTED(ILMBASE_VERSION_MAJOR, ${ILMBASE_VERSION_MAJOR})
+AC_DEFINE_UNQUOTED(ILMBASE_VERSION_MINOR, ${ILMBASE_VERSION_MINOR})
+AC_DEFINE_UNQUOTED(ILMBASE_VERSION_PATCH, ${ILMBASE_VERSION_PATCH})
+


 AC_MSG_CHECKING(for gcc optimization flags)
diff --git a/OpenEXR/config/OpenEXRConfig.h.in b/OpenEXR/config/OpenEXRConfig.h.in
index 6f1675e..199f4a9 100644
--- a/OpenEXR/config/OpenEXRConfig.h.in
+++ b/OpenEXR/config/OpenEXRConfig.h.in
@@ -48,3 +48,13 @@

 #undef OPENEXR_VERSION_STRING
 #undef OPENEXR_PACKAGE_STRING
+
+#undef OPENEXR_VERSION_MAJOR
+#undef OPENEXR_VERSION_MINOR
+#undef OPENEXR_VERSION_PATCH
+
+// Version as a single hex number, e.g. 0x01000300 == 1.0.3
+#define OPENEXR_VERSION_HEX ((OPENEXR_VERSION_MAJOR << 24) | \
+                             (OPENEXR_VERSION_MINOR << 16) | \
+                             (OPENEXR_VERSION_PATCH <<  8))
+
diff --git a/OpenEXR/configure.ac b/OpenEXR/configure.ac
index a3f706e..858f186 100644
--- a/OpenEXR/configure.ac
+++ b/OpenEXR/configure.ac
@@ -1,8 +1,14 @@
 dnl Process this file with autoconf to produce a configure script.

 AC_INIT(OpenEXR, 2.0.0)
-AC_SUBST(OPENEXR_VERSION, 2.0.0)
-AC_SUBST(OPENEXR_VERSION_SAFE, 2_0_0)
+
+AC_SUBST(OPENEXR_VERSION_MAJOR, 2)
+AC_SUBST(OPENEXR_VERSION_MINOR, 0)
+AC_SUBST(OPENEXR_VERSION_PATCH, 0)
+
+AC_SUBST(OPENEXR_VERSION, ${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH})
+AC_SUBST(OPENEXR_VERSION_SAFE, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}_${OPENEXR_VERSION_PATCH})
+
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
 AM_CONFIG_HEADER(config/OpenEXRConfig.h)
@@ -58,6 +64,9 @@ AM_PATH_PKGCONFIG(
 dnl Define the version string
 AC_DEFINE_UNQUOTED(OPENEXR_VERSION_STRING, "${VERSION}")
 AC_DEFINE_UNQUOTED(OPENEXR_PACKAGE_STRING, "${PACKAGE_STRING}")
+AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MAJOR, ${OPENEXR_VERSION_MAJOR})
+AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MINOR, ${OPENEXR_VERSION_MINOR})
+AC_DEFINE_UNQUOTED(OPENEXR_VERSION_PATCH, ${OPENEXR_VERSION_PATCH})


 dnl --enable-threading
-- 
1.7.6.4