Prepare release version 2.2.6 (#209)

This commit is contained in:
Sebastian Pipping 2018-08-12 21:04:35 +02:00
parent 62f92a5e1c
commit 39e487da35
9 changed files with 18 additions and 14 deletions

View file

@ -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.2.5 is the source directory of expat, add a subdirectory
Assuming ~/expat-2.2.6 is the source directory of expat, add a subdirectory
build and change into that directory:
~/expat-2.2.5$ mkdir build && cd build
~/expat-2.2.5/build$
~/expat-2.2.6$ mkdir build && cd build
~/expat-2.2.6/build$
From that directory, call cmake first, then call make, make test and
make install in the usual way:
~/expat-2.2.5/build$ cmake ..
~/expat-2.2.6/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.2.5/build
-- Build files have been written to: /home/patrick/expat-2.2.6/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.2.5/build$ make && make test && make install
~/expat-2.2.6/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

View file

@ -6,7 +6,7 @@ project(expat)
cmake_minimum_required(VERSION 2.8.10)
set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")
set(PACKAGE_NAME "expat")
set(PACKAGE_VERSION "2.2.5")
set(PACKAGE_VERSION "2.2.6")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}")

View file

@ -2,7 +2,7 @@ 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.2.? ???????????????????
Release 2.2.6 Sun August 12 2018
Bug fixes:
#170 #206 Avoid doing arithmetic with NULL pointers in XML_GetBuffer
#204 #205 Fix 2.2.5 regression with suspend-resume while parsing

View file

@ -2,7 +2,7 @@
[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/libexpat/libexpat?svg=true)](https://ci.appveyor.com/project/libexpat/libexpat)
# Expat, Release 2.2.5
# Expat, Release 2.2.6
This is Expat, a C library for parsing XML, started by
[James Clark](https://en.wikipedia.org/wiki/James_Clark_(programmer)) in 1997.

View file

@ -1,4 +1,4 @@
%define version 2.2.5
%define version 2.2.6
%define release 1
Summary: Expat is an XML 1.0 parser written in C.
@ -42,6 +42,10 @@ install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf
/usr/share/man/man1/xmlwf.1.gz
%changelog
* Sun Aug 12 2018 Sebastian Pipping <sebastian@pipping.org>
[Release 2.2.6-1]
- Update for the 2.2.6 release.
* Tue Oct 31 2017 Sebastian Pipping <sebastian@pipping.org>
[Release 2.2.5-1]
- Update for the 2.2.5 release.

View file

@ -1076,7 +1076,7 @@ XML_GetFeatureList(void);
*/
#define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 2
#define XML_MICRO_VERSION 5
#define XML_MICRO_VERSION 6
#ifdef __cplusplus
}

View file

@ -1,4 +1,4 @@
/* 4b74aa710b4ed5ce464b0ce544852cb47bf905c85a49c7bae2749f5885cb966d (2.2.5+)
/* 19ac4776051591216f1874e34ee99b6a43a3784c8bd7d70efeb9258dd22b906a (2.2.6+)
__ __ _
___\ \/ /_ __ __ _| |_
/ _ \\ /| '_ \ / _` | __|

View file

@ -8062,7 +8062,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.2.5"))) /* needs bump on releases */
if (xcstrcmp(version_text, XCS("expat_2.2.6"))) /* 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

View file

@ -4,7 +4,7 @@
; This script was contributed by Tim Peters.
; It was designed for Inno Setup 2.0.19 but works with later versions as well.
#define expatVer "2.2.5"
#define expatVer "2.2.6"
[Setup]
AppName=Expat