Skip to content

Commit

Permalink
Merge branch 'release/1.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
sjaeckel committed Mar 27, 2024
2 parents a1baa97 + 204acba commit 36131ff
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 22 deletions.
12 changes: 2 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 1.2.1-{build}
version: 1.3.0-{build}
branches:
only:
- master
Expand Down
6 changes: 6 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Mar 27th, 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
Expand Down
2 changes: 1 addition & 1 deletion doc/bn.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions libtommath.pc.in
Original file line number Diff line number Diff line change
@@ -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}
3 changes: 2 additions & 1 deletion makefile.shared
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion makefile.unix
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RANLIB = ranlib
CFLAGS = -O2
LDFLAGS =

VERSION = 1.2.1
VERSION = 1.3.0

#Compilation flags
LTM_CFLAGS = -I. $(CFLAGS)
Expand Down
6 changes: 3 additions & 3 deletions makefile_include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#

#version of library
VERSION=1.2.1
VERSION_PC=1.2.1
VERSION_SO=3:1:2
VERSION=1.3.0
VERSION_PC=1.3.0
VERSION_SO=4:0:3

PLATFORM := $(shell uname | sed -e 's/_.*//')

Expand Down

0 comments on commit 36131ff

Please sign in to comment.