build: Use decimal notation for the version number.

roswell · Jun 24, 2017 · b5f07ea · b5f07ea
1 parent efa79ba
commit b5f07ea
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 25 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,17 @@
+2017-06-24  Bruno Haible  <[email protected]>
+
+	build: Use decimal notation for the version number.
+	* VERSION: Set to 1.13.
+	* configure.ac: Simplify AC_CONFIG_HEADERS invocations. Define
+	LIBFFCALL_VERSION as C macro, based on PACKAGE_VERSION.
+	* avcall/avcall.h.in (LIBFFCALL_VERSION): Use a plain #define, for
+	substitution by config.status.
+	* vacall/vacall.h.in: Likewise.
+	* trampoline/trampoline.h.in: Likewise.
+	* callback/callback.h.in: Likewise.
+	* callback/vacall_r/vacall_r.h.in: Likewise.
+	* callback/trampoline_r/trampoline_r.h.in: Likewise.
+
 2017-06-24  Bruno Haible  <[email protected]>
 
 	trampoline, callback: Make multithread-safe.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0x010D
+1.13
diff --git a/avcall/avcall.h.in b/avcall/avcall.h.in
@@ -25,7 +25,8 @@
  ----------------------------------------------------------------------*/
 
 #if !defined(LIBFFCALL_VERSION)
-# define LIBFFCALL_VERSION @LIBFFCALL_VERSION@
+/* Version number of libffcall: (major<<8) + minor. */
+# define LIBFFCALL_VERSION 0
 #endif
 
 /* These definitions are adjusted by ‘configure’ automatically. */

diff --git a/callback/callback.h.in b/callback/callback.h.in
@@ -19,7 +19,8 @@
  */
 
 #if !defined(LIBFFCALL_VERSION)
-# define LIBFFCALL_VERSION @LIBFFCALL_VERSION@
+/* Version number of libffcall: (major<<8) + minor. */
+# define LIBFFCALL_VERSION 0
 #endif
 
 #include "vacall_r.h"

diff --git a/callback/trampoline_r/trampoline_r.h.in b/callback/trampoline_r/trampoline_r.h.in
@@ -19,7 +19,8 @@
  */
 
 #if !defined(LIBFFCALL_VERSION)
-# define LIBFFCALL_VERSION @LIBFFCALL_VERSION@
+/* Version number of libffcall: (major<<8) + minor. */
+# define LIBFFCALL_VERSION 0
 #endif
 
 #ifdef __cplusplus

diff --git a/callback/vacall_r/vacall_r.h.in b/callback/vacall_r/vacall_r.h.in
@@ -19,7 +19,8 @@
  */
 
 #if !defined(LIBFFCALL_VERSION)
-# define LIBFFCALL_VERSION @LIBFFCALL_VERSION@
+/* Version number of libffcall: (major<<8) + minor. */
+# define LIBFFCALL_VERSION 0
 #endif
 
 /* These definitions are adjusted by ‘configure’ automatically. */

diff --git a/configure.ac b/configure.ac
@@ -23,24 +23,12 @@ AM_INIT_AUTOMAKE([])
 AC_CONFIG_SRCDIR([trampoline/trampoline.h.in])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_HEADERS([avcall/avcall.h],
-  [sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" avcall/avcall.h > tmp && mv -f tmp avcall/avcall.h],
-  [LIBFFCALL_VERSION=$PACKAGE_VERSION])
-AC_CONFIG_HEADERS([vacall/vacall.h],
-  [sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" vacall/vacall.h > tmp && mv -f tmp vacall/vacall.h],
-  [LIBFFCALL_VERSION=$PACKAGE_VERSION])
-AC_CONFIG_HEADERS([trampoline/trampoline.h],
-  [sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" trampoline/trampoline.h > tmp && mv -f tmp trampoline/trampoline.h],
-  [LIBFFCALL_VERSION=$PACKAGE_VERSION])
-AC_CONFIG_HEADERS([callback/callback.h],
-  [sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" callback/callback.h > tmp && mv -f tmp callback/callback.h],
-  [LIBFFCALL_VERSION=$PACKAGE_VERSION])
-AC_CONFIG_HEADERS([callback/vacall_r/vacall_r.h],
-  [sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" callback/vacall_r/vacall_r.h > tmp && mv -f tmp callback/vacall_r/vacall_r.h],
-  [LIBFFCALL_VERSION=$PACKAGE_VERSION])
-AC_CONFIG_HEADERS([callback/trampoline_r/trampoline_r.h],
-  [sed "s/@LIBFFCALL_VERSION@/${LIBFFCALL_VERSION}/" callback/trampoline_r/trampoline_r.h > tmp && mv -f tmp callback/trampoline_r/trampoline_r.h],
-  [LIBFFCALL_VERSION=$PACKAGE_VERSION])
+AC_CONFIG_HEADERS([avcall/avcall.h])
+AC_CONFIG_HEADERS([vacall/vacall.h])
+AC_CONFIG_HEADERS([trampoline/trampoline.h])
+AC_CONFIG_HEADERS([callback/callback.h])
+AC_CONFIG_HEADERS([callback/vacall_r/vacall_r.h])
+AC_CONFIG_HEADERS([callback/trampoline_r/trampoline_r.h])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([gnulib-lib/Makefile])
@@ -51,6 +39,24 @@ AC_CONFIG_FILES([callback/Makefile])
 AC_CONFIG_FILES([callback/vacall_r/Makefile])
 AC_CONFIG_FILES([callback/trampoline_r/Makefile])
 
+dnl Substitutable version number.
+changequote(,)
+sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+changequote([,])
+version_major=`echo "${PACKAGE_VERSION}" | sed -n -e "$sed_extract_major"`
+version_minor=`echo "${PACKAGE_VERSION}" | sed -n -e "$sed_extract_minor"`
+HEXVERSION=`printf '0x%02X%02X' $version_major $version_minor`
+AC_DEFINE_UNQUOTED([LIBFFCALL_VERSION], [$HEXVERSION], [Version number: (major<<8) + minor])
+
 AC_PROG_MAKE_SET
 
 AC_PROG_CC

diff --git a/trampoline/trampoline.h.in b/trampoline/trampoline.h.in
@@ -19,7 +19,8 @@
  */
 
 #if !defined(LIBFFCALL_VERSION)
-# define LIBFFCALL_VERSION @LIBFFCALL_VERSION@
+/* Version number of libffcall: (major<<8) + minor. */
+# define LIBFFCALL_VERSION 0
 #endif
 
 #ifdef __cplusplus

diff --git a/vacall/vacall.h.in b/vacall/vacall.h.in
@@ -19,7 +19,8 @@
  */
 
 #if !defined(LIBFFCALL_VERSION)
-# define LIBFFCALL_VERSION @LIBFFCALL_VERSION@
+/* Version number of libffcall: (major<<8) + minor. */
+# define LIBFFCALL_VERSION 0
 #endif
 
 /* These definitions are adjusted by ‘configure’ automatically. */