From c73362d21ffba2f24288f85cb3057728df389a3b Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Tue, 5 Sep 2023 16:32:29 +0200 Subject: [PATCH 1/5] Update version Signed-off-by: Steffen Jaeckel (cherry picked from commit 8314bde5e5c8e5d9331460130a9d1066e324f091) --- makefile_include.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile_include.mk b/makefile_include.mk index 71f04dd2..43d5858a 100644 --- a/makefile_include.mk +++ b/makefile_include.mk @@ -3,7 +3,7 @@ # #version of library -VERSION=1.2.1 +VERSION=1.2.1-develop VERSION_PC=1.2.1 VERSION_SO=3:1:2 From 832dd08aa89c93f238c6f232d9fffcee7e8356c2 Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Thu, 14 Mar 2024 09:17:32 +0100 Subject: [PATCH 2/5] Update version & changelog Signed-off-by: Steffen Jaeckel --- CMakeLists.txt | 2 +- appveyor.yml | 2 +- changes.txt | 6 ++++++ doc/bn.tex | 2 +- makefile.unix | 2 +- makefile_include.mk | 6 +++--- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90b07a83..d6063277 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.10) project(libtommath - VERSION 1.2.1 + VERSION 1.3.0 DESCRIPTION "A free open source portable number theoretic multiple-precision integer (MPI) library written entirely in C." HOMEPAGE_URL "https://www.libtom.net/LibTomMath" LANGUAGES C) diff --git a/appveyor.yml b/appveyor.yml index 36077a1f..e2354910 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.2.1-{build} +version: 1.3.0-{build} branches: only: - master diff --git a/changes.txt b/changes.txt index d7dc0f56..3f021e50 100644 --- a/changes.txt +++ b/changes.txt @@ -1,3 +1,9 @@ +Mar 14th, 2024 +v1.3.0 + -- Deprecate more APIs which are replaced in develop (PR #572) + -- Add support for CMake (PR #573) + -- Add support for GitHub Actions (PR #573) + Sep 04th, 2023 v1.2.1 -- Bugfix release because of potential integer overflow diff --git a/doc/bn.tex b/doc/bn.tex index 61cd9676..23e8a333 100644 --- a/doc/bn.tex +++ b/doc/bn.tex @@ -50,7 +50,7 @@ \begin{document} \frontmatter \pagestyle{empty} -\title{LibTomMath User Manual \\ v1.2.1} +\title{LibTomMath User Manual \\ v1.3.0} \author{LibTom Projects \\ www.libtom.net} \maketitle This text, the library and the accompanying textbook are all hereby placed in the public domain. This book has been diff --git a/makefile.unix b/makefile.unix index 1cd77525..fdc3fa7b 100644 --- a/makefile.unix +++ b/makefile.unix @@ -21,7 +21,7 @@ RANLIB = ranlib CFLAGS = -O2 LDFLAGS = -VERSION = 1.2.1 +VERSION = 1.3.0 #Compilation flags LTM_CFLAGS = -I. $(CFLAGS) diff --git a/makefile_include.mk b/makefile_include.mk index 43d5858a..ea134da3 100644 --- a/makefile_include.mk +++ b/makefile_include.mk @@ -3,9 +3,9 @@ # #version of library -VERSION=1.2.1-develop -VERSION_PC=1.2.1 -VERSION_SO=3:1:2 +VERSION=1.3.0-rc1 +VERSION_PC=1.3.0 +VERSION_SO=4:0:3 PLATFORM := $(shell uname | sed -e 's/_.*//') From 70cdc724a771c2c3868e3c246f2972c2082856ed Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Wed, 27 Mar 2024 09:01:45 +0100 Subject: [PATCH 3/5] Bump version Signed-off-by: Steffen Jaeckel --- changes.txt | 2 +- makefile_include.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes.txt b/changes.txt index 3f021e50..80ff7dd5 100644 --- a/changes.txt +++ b/changes.txt @@ -1,4 +1,4 @@ -Mar 14th, 2024 +Mar 27th, 2024 v1.3.0 -- Deprecate more APIs which are replaced in develop (PR #572) -- Add support for CMake (PR #573) diff --git a/makefile_include.mk b/makefile_include.mk index ea134da3..df51a123 100644 --- a/makefile_include.mk +++ b/makefile_include.mk @@ -3,7 +3,7 @@ # #version of library -VERSION=1.3.0-rc1 +VERSION=1.3.0 VERSION_PC=1.3.0 VERSION_SO=4:0:3 From 8c40dcd4fd4d57056c97ccb65726e68e55cbbcf7 Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Wed, 27 Mar 2024 09:27:30 +0100 Subject: [PATCH 4/5] Don't try to install the manpage when using CMake ... there's no manpage on master Fixup of aeebd863b4e49affdb874480fb240a0a914828c9 Signed-off-by: Steffen Jaeckel --- CMakeLists.txt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6063277..233c875d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,14 +190,6 @@ write_basic_package_version_file( COMPATIBILITY SameMajorVersion ) -# Windows uses a different help sytem. -if((NOT WIN32) AND (NOT CMAKE_HOST_WIN32)) -# install manpage (not gzipped, some BSD's do not want it compressed?) -install(FILES ${CMAKE_SOURCE_DIR}/doc/tommath.3 - DESTINATION ${CMAKE_INSTALL_MANDIR}/man3/ -) -endif() - # install version file install(FILES ${PROJECT_VERSION_FILE} DESTINATION ${CONFIG_INSTALL_DIR} From 204acbaff0157f9fba5a672e286d3884797e980d Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Wed, 27 Mar 2024 11:19:11 +0100 Subject: [PATCH 5/5] Align header install path For this release we will still dump our header to `/include`. Signed-off-by: Steffen Jaeckel --- CMakeLists.txt | 2 +- libtommath.pc.in | 9 ++++----- makefile.shared | 3 ++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 233c875d..0b84e795 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,7 @@ install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) # Install libtommath.pc for pkg-config if we build a shared library diff --git a/libtommath.pc.in b/libtommath.pc.in index 099b1cd7..7ce50fd1 100644 --- a/libtommath.pc.in +++ b/libtommath.pc.in @@ -1,10 +1,9 @@ -prefix=@to-be-replaced@ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include +prefix=@CMAKE_INSTALL_PREFIX@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ Name: LibTomMath Description: public domain library for manipulating large integer numbers -Version: @to-be-replaced@ +Version: @PROJECT_VERSION@ Libs: -L${libdir} -ltommath Cflags: -I${includedir} diff --git a/makefile.shared b/makefile.shared index 3398f753..bf0ee43c 100644 --- a/makefile.shared +++ b/makefile.shared @@ -70,7 +70,8 @@ install: $(LIBNAME) install -d $(DESTDIR)$(INCPATH) $(LIBTOOL) --mode=install install -m 644 $(LIBNAME) $(DESTDIR)$(LIBPATH)/$(LIBNAME) install -m 644 $(HEADERS_PUB) $(DESTDIR)$(INCPATH) - sed -e 's,^prefix=.*,prefix=$(PREFIX),' -e 's,^Version:.*,Version: $(VERSION_PC),' libtommath.pc.in > libtommath.pc + sed -e 's,^prefix=.*,prefix=$(PREFIX),' -e 's,^Version:.*,Version: $(VERSION_PC),' -e 's,@CMAKE_INSTALL_LIBDIR@,lib,' \ + -e 's,@CMAKE_INSTALL_INCLUDEDIR@,include,' libtommath.pc.in > libtommath.pc install -d $(DESTDIR)$(LIBPATH)/pkgconfig install -m 644 libtommath.pc $(DESTDIR)$(LIBPATH)/pkgconfig/