Merge pull request #492 from libexpat/issue-491-prepare-release-2-4-1
Prepare release 2.4.1 (part of #491)
This commit is contained in:
commit
a28238bdee
@ -3,25 +3,25 @@
|
||||
The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual
|
||||
Studio) and should work on all other platform cmake supports.
|
||||
|
||||
Assuming ~/expat-2.4.0 is the source directory of expat, add a subdirectory
|
||||
Assuming ~/expat-2.4.1 is the source directory of expat, add a subdirectory
|
||||
build and change into that directory:
|
||||
~/expat-2.4.0$ mkdir build && cd build
|
||||
~/expat-2.4.0/build$
|
||||
~/expat-2.4.1$ mkdir build && cd build
|
||||
~/expat-2.4.1/build$
|
||||
|
||||
From that directory, call cmake first, then call make, make test and
|
||||
make install in the usual way:
|
||||
~/expat-2.4.0/build$ cmake ..
|
||||
~/expat-2.4.1/build$ cmake ..
|
||||
-- The C compiler identification is GNU
|
||||
-- The CXX compiler identification is GNU
|
||||
....
|
||||
-- Configuring done
|
||||
-- Generating done
|
||||
-- Build files have been written to: /home/patrick/expat-2.4.0/build
|
||||
-- Build files have been written to: /home/patrick/expat-2.4.1/build
|
||||
|
||||
If you want to specify the install location for your files, append
|
||||
-DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.
|
||||
|
||||
~/expat-2.4.0/build$ make && make test && make install
|
||||
~/expat-2.4.1/build$ make && make test && make install
|
||||
Scanning dependencies of target expat
|
||||
[ 5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o
|
||||
[ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o
|
||||
|
@ -64,7 +64,7 @@ endif()
|
||||
|
||||
project(expat
|
||||
VERSION
|
||||
2.4.0
|
||||
2.4.1
|
||||
LANGUAGES
|
||||
C
|
||||
)
|
||||
@ -387,7 +387,7 @@ if(EXPAT_WITH_LIBBSD)
|
||||
endif()
|
||||
|
||||
set(LIBCURRENT 9) # sync
|
||||
set(LIBREVISION 0) # with
|
||||
set(LIBREVISION 1) # with
|
||||
set(LIBAGE 8) # configure.ac!
|
||||
math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")
|
||||
|
||||
|
@ -2,11 +2,15 @@ NOTE: We are looking for help with a few things:
|
||||
https://github.com/libexpat/libexpat/labels/help%20wanted
|
||||
If you can help, please get in touch. Thanks!
|
||||
|
||||
Release 2.4.1 xxx xxx xx xxxx
|
||||
Release 2.4.1 Sun May 23 2021
|
||||
Bug fixes:
|
||||
#488 #490 Autotools: Fix installed header expat_config.h for multilib
|
||||
systems; regression introduced in 2.4.0 by pull request #486
|
||||
|
||||
Other changes:
|
||||
#491 #492 Version info bumped from 9:0:8 to 9:1:8;
|
||||
see https://verbump.de/ for what these numbers do
|
||||
|
||||
Special thanks to:
|
||||
Gentoo's QA check "multilib_check_headers"
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
[![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases)
|
||||
|
||||
|
||||
# Expat, Release 2.4.0
|
||||
# Expat, Release 2.4.1
|
||||
|
||||
This is Expat, a C library for parsing XML, started by
|
||||
[James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997.
|
||||
|
@ -82,7 +82,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0
|
||||
dnl
|
||||
|
||||
LIBCURRENT=9 # sync
|
||||
LIBREVISION=0 # with
|
||||
LIBREVISION=1 # with
|
||||
LIBAGE=8 # CMakeLists.txt!
|
||||
|
||||
AC_CONFIG_HEADERS([expat_config.h])
|
||||
|
@ -48,7 +48,7 @@
|
||||
<div>
|
||||
<h1>
|
||||
The Expat XML Parser
|
||||
<small>Release 2.4.0</small>
|
||||
<small>Release 2.4.1</small>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="content">
|
||||
|
@ -1041,7 +1041,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold(
|
||||
*/
|
||||
#define XML_MAJOR_VERSION 2
|
||||
#define XML_MINOR_VERSION 4
|
||||
#define XML_MICRO_VERSION 0
|
||||
#define XML_MICRO_VERSION 1
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* 40f0f9c2be99a31dd0c833cd7d5a1bbd825a95e241f6e6c689b69ce275aba9a9 (2.4.0+)
|
||||
/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+)
|
||||
__ __ _
|
||||
___\ \/ /_ __ __ _| |_
|
||||
/ _ \\ /| '_ \ / _` | __|
|
||||
|
@ -7351,7 +7351,7 @@ START_TEST(test_misc_version) {
|
||||
fail("Version mismatch");
|
||||
|
||||
#if ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T)
|
||||
if (xcstrcmp(version_text, XCS("expat_2.4.0"))) /* needs bump on releases */
|
||||
if (xcstrcmp(version_text, XCS("expat_2.4.1"))) /* needs bump on releases */
|
||||
fail("XML_*_VERSION in expat.h out of sync?\n");
|
||||
#else
|
||||
/* If we have XML_UNICODE defined but not XML_UNICODE_WCHAR_T
|
||||
|
@ -36,7 +36,7 @@
|
||||
; OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
; USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#define expatVer "2.4.0"
|
||||
#define expatVer "2.4.1"
|
||||
|
||||
[Setup]
|
||||
AppName=Expat
|
||||
|
Loading…
Reference in New Issue
Block a user