diff --git a/expat/CMake.README b/expat/CMake.README index 37f7c539..df40089e 100644 --- a/expat/CMake.README +++ b/expat/CMake.README @@ -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.6 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.4.7 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.4.6$ mkdir build && cd build -~/expat-2.4.6/build$ +~/expat-2.4.7$ mkdir build && cd build +~/expat-2.4.7/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.4.6/build$ cmake .. +~/expat-2.4.7/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.6/build +-- Build files have been written to: /home/patrick/expat-2.4.7/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.6/build$ make && make test && make install +~/expat-2.4.7/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 diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index 9945e42c..9e059488 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -64,7 +64,7 @@ endif() project(expat VERSION - 2.4.6 + 2.4.7 LANGUAGES C ) diff --git a/expat/README.md b/expat/README.md index 959c4a6e..6bfbf130 100644 --- a/expat/README.md +++ b/expat/README.md @@ -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.6 +# Expat, Release 2.4.7 This is Expat, a C library for parsing XML, started by [James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997. diff --git a/expat/doc/reference.html b/expat/doc/reference.html index 20ece4d0..884b2708 100644 --- a/expat/doc/reference.html +++ b/expat/doc/reference.html @@ -49,7 +49,7 @@

The Expat XML Parser - Release 2.4.6 + Release 2.4.7

diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 181fc960..5e096db9 100644 --- a/expat/lib/expat.h +++ b/expat/lib/expat.h @@ -1054,7 +1054,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold( */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 4 -#define XML_MICRO_VERSION 6 +#define XML_MICRO_VERSION 7 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 6fe2cf1e..129349ed 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* a30d2613dcfdef81475a9d1a349134d2d42722172fdaa7d5bb12ed2aa74b9596 (2.4.6+) +/* fcb1a62fefa945567301146eb98e3ad3413e823a41c4378e84e8b6b6f308d824 (2.4.7+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 712706c4..3309bbaa 100644 --- a/expat/tests/runtests.c +++ b/expat/tests/runtests.c @@ -7589,7 +7589,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.6"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.4.7"))) /* 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 diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss index e4d82745..d74203bd 100644 --- a/expat/win32/expat.iss +++ b/expat/win32/expat.iss @@ -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.6" +#define expatVer "2.4.7" [Setup] AppName=Expat