From 3f47a0c5499cef41c448173300954200e0f4e009 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Mon, 24 Nov 2014 12:49:00 +0100 Subject: [PATCH] lib: Add new header to versioning info Exposes the package version as string and the library versioning as numeric macro. OVS_LIB_VERSION may be used to check for a particular version of the interface. OVS_LIB_REVISION and OVS_LIB_AGE exist to map a set of installed headers to a particular shared library instance. Signed-off-by: Thomas Graf Signed-off-by: Ben Pfaff --- configure.ac | 1 + include/openvswitch/.gitignore | 1 + include/openvswitch/automake.mk | 3 ++- include/openvswitch/version.h.in | 28 ++++++++++++++++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 include/openvswitch/.gitignore create mode 100644 include/openvswitch/version.h.in diff --git a/configure.ac b/configure.ac index 80198463d..ebb8b02c9 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,7 @@ AC_CONFIG_FILES(lib/libopenvswitch.pc) AC_CONFIG_FILES(lib/libsflow.pc) AC_CONFIG_FILES(ofproto/libofproto.pc) AC_CONFIG_FILES(ovsdb/libovsdb.pc) +AC_CONFIG_FILES(include/openvswitch/version.h) dnl This makes sure that include/openflow gets created in the build directory. AC_CONFIG_COMMANDS([include/openflow/openflow.h.stamp]) diff --git a/include/openvswitch/.gitignore b/include/openvswitch/.gitignore new file mode 100644 index 000000000..a948ed453 --- /dev/null +++ b/include/openvswitch/.gitignore @@ -0,0 +1 @@ +/version.h diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk index a86775917..5253e62dc 100644 --- a/include/openvswitch/automake.mk +++ b/include/openvswitch/automake.mk @@ -1,4 +1,5 @@ openvswitchincludedir = $(includedir)/openvswitch openvswitchinclude_HEADERS = \ - include/openvswitch/types.h + include/openvswitch/types.h \ + include/openvswitch/version.h diff --git a/include/openvswitch/version.h.in b/include/openvswitch/version.h.in new file mode 100644 index 000000000..23d8fde4f --- /dev/null +++ b/include/openvswitch/version.h.in @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2014 Nicira, Inc. + * Copyright (c) 2014 Cisco Systems, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OPENVSWITCH_VERSION_H +#define OPENVSWITCH_VERSION_H 1 + +#define OVS_PACKAGE_STRING "@PACKAGE_STRING@" +#define OVS_PACKAGE_VERSION "@PACKAGE_VERSION@" + +#define OVS_LIB_VERSION @LT_CURRENT@ +#define OVS_LIB_REVISION @LT_REVISION@ +#define OVS_LIB_AGE @LT_AGE@ + +#endif /* openvswitch/version.h */ -- 2.20.1