Skip to content

Fix version.h changes after builds #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ColtonWilley merged 5 commits into from
Apr 28, 2025
Merged

Fix version.h changes after builds #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0dae05
Fix version.h HEX_VERSION replacement to prevent changes after builds
devin-ai-integration[bot] Apr 22, 2025
4db0642
Fix version.h HEX_VERSION replacement to prevent changes after builds
devin-ai-integration[bot] Apr 22, 2025
b153814
Update version string in version.h to match configure.ac
devin-ai-integration[bot] Apr 22, 2025
db33241
Fix version.h to include hex version directly to prevent changes afte…
devin-ai-integration[bot] Apr 22, 2025
c53faa9
Fix duplicate lines in configure.ac
devin-ai-integration[bot] Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ AC_CONFIG_MACRO_DIR([m4])

dnl m4_include([m4/ax_check_openssl.m4])
dnl m4_include([m4/ax_check_wolfssl.m4])
m4_include([m4/hexversion.m4])

AM_INIT_AUTOMAKE([1.11 -Wall -Werror -Wno-portability foreign tar-ustar subdir-objects no-define color-tests])
LT_INIT([disable-static pic-only])
Expand Down Expand Up @@ -130,6 +131,7 @@ CFLAGS="$CFLAGS $USER_C_EXTRA_FLAGS"
AC_SUBST([AM_CPPFLAGS])
AC_SUBST([AM_CFLAGS])
AC_SUBST([AM_LDFLAGS])
CREATE_HEX_VERSION

AC_CONFIG_FILES([Makefile
include/wolfprovider/version.h
Expand Down
4 changes: 2 additions & 2 deletions include/wolfprovider/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
extern "C" {
#endif

#define LIBWOLFPROV_VERSION_STRING "1.1.0-RC"
#define LIBWOLFPROV_VERSION_HEX @HEX_VERSION@
#define LIBWOLFPROV_VERSION_STRING "1.0.2"
#define LIBWOLFPROV_VERSION_HEX 0x01000002

#ifdef __cplusplus
}
Expand Down
6 changes: 6 additions & 0 deletions m4/hexversion.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
AC_DEFUN([CREATE_HEX_VERSION],[

HEX_VERSION=`echo $VERSION | sed 's|[\-a-z0-9]*$||' | \
awk -F. '{printf "0x%0.2d%0.3d%0.3d", $[]1, $[]2, $[]3}'`
AC_SUBST([HEX_VERSION])
])