diff --git a/.gitignore b/.gitignore index f63f6891..5195c3ec 100644 --- a/.gitignore +++ b/.gitignore @@ -103,6 +103,7 @@ frob-* /p11-kit/pkcs11.conf.example /p11-kit/p11-kit-server.service /p11-kit/proxy-generated.h +/p11-kit/version.h /p11-kit/virtual-*-generated.h /p11-kit/virtual-fixed-wrappers.h /p11-kit/virtual-fixed-closures.h diff --git a/configure.ac b/configure.ac index 33f52713..93fd7165 100644 --- a/configure.ac +++ b/configure.ac @@ -711,6 +711,7 @@ AC_CONFIG_FILES([Makefile po/Makefile.in p11-kit/p11-kit-1.pc p11-kit/pkcs11.conf.example + p11-kit/version.h ]) AC_OUTPUT diff --git a/meson.build b/meson.build index 7072765c..b04da994 100644 --- a/meson.build +++ b/meson.build @@ -29,6 +29,7 @@ conf = configuration_data() conf.set_quoted('PACKAGE_NAME', meson.project_name()) conf.set('PACKAGE_MAJOR', major_version) conf.set('PACKAGE_MINOR', minor_version) +conf.set('PACKAGE_MICRO', micro_version) host_system = host_machine.system() if host_system == 'windows' diff --git a/p11-kit/meson.build b/p11-kit/meson.build index d3e151b7..4afa6cfb 100644 --- a/p11-kit/meson.build +++ b/p11-kit/meson.build @@ -1,9 +1,16 @@ +version_h = configure_file( + input: 'version.h.in', + output: '@BASENAME@.h', + configuration: conf, +) + install_headers('deprecated.h', 'iter.h', 'p11-kit.h', 'pin.h', 'remote.h', 'uri.h', + version_h, subdir: 'p11-kit-1/p11-kit') libp11_kit_internal_sources = [ diff --git a/p11-kit/version.h.in b/p11-kit/version.h.in new file mode 100644 index 00000000..d7736f71 --- /dev/null +++ b/p11-kit/version.h.in @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2024 Red Hat, Inc. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * * Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions and + * the following disclaimer in the documentation and/or + * other materials provided with the distribution. + * * The names of contributors to this software may not be + * used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * Author: Daiki Ueno + */ + +#ifndef P11_KIT_VERSION_H +#define P11_KIT_VERSION_H + +#ifdef __cplusplus +extern "C" { +#endif + +#define P11_KIT_VERSION_MAJOR (@PACKAGE_MAJOR@) +#define P11_KIT_VERSION_MINOR (@PACKAGE_MINOR@) +#define P11_KIT_VERSION_MICRO (@PACKAGE_MICRO@) + +#define P11_KIT_CHECK_VERSION(major, minor, micro) \ + (P11_KIT_VERSION_MAJOR > (major) || \ + (P11_KIT_VERSION_MAJOR == (major) && \ + P11_KIT_VERSION_MINOR > (minor)) || \ + (P11_KIT_VERSION_MAJOR == (major) && \ + P11_KIT_VERSION_MINOR == (minor) && \ + P11_KIT_VERSION_MINOR >= (micro))) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* P11_KIT_VERSION_H */