Skip to content

Commit 1c243ef

Browse files
committed
expat -> 2.3.0 (step 1)
1 parent 3e9c14a commit 1c243ef

59 files changed

Lines changed: 5422 additions & 6492 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

HostSupport/expat-2.2.10/CMake.README

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual
44
Studio) and should work on all other platform cmake supports.
55

6-
Assuming ~/expat-2.2.10 is the source directory of expat, add a subdirectory
6+
Assuming ~/expat-2.3.0 is the source directory of expat, add a subdirectory
77
build and change into that directory:
8-
~/expat-2.2.10$ mkdir build && cd build
9-
~/expat-2.2.10/build$
8+
~/expat-2.3.0$ mkdir build && cd build
9+
~/expat-2.3.0/build$
1010

1111
From that directory, call cmake first, then call make, make test and
1212
make install in the usual way:
13-
~/expat-2.2.10/build$ cmake ..
13+
~/expat-2.3.0/build$ cmake ..
1414
-- The C compiler identification is GNU
1515
-- The CXX compiler identification is GNU
1616
....
1717
-- Configuring done
1818
-- Generating done
19-
-- Build files have been written to: /home/patrick/expat-2.2.10/build
19+
-- Build files have been written to: /home/patrick/expat-2.3.0/build
2020

2121
If you want to specify the install location for your files, append
2222
-DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.
2323

24-
~/expat-2.2.10/build$ make && make test && make install
24+
~/expat-2.3.0/build$ make && make test && make install
2525
Scanning dependencies of target expat
2626
[ 5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o
2727
[ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o

HostSupport/expat-2.2.10/CMakeLists.txt

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ endif()
3333

3434
project(expat
3535
VERSION
36-
2.2.10
36+
2.3.0
3737
LANGUAGES
3838
C
3939
)
@@ -47,11 +47,6 @@ set(PACKAGE_TARNAME "${PACKAGE_NAME}")
4747
include(CMakePackageConfigHelpers)
4848
include(GNUInstallDirs)
4949

50-
#
51-
# Detect use by means of add_subdirectory
52-
#
53-
get_directory_property(_EXPAT_PARENT_DIRECTORY PARENT_DIRECTORY)
54-
5550
#
5651
# Configuration defaults
5752
#
@@ -117,6 +112,11 @@ if(MSVC OR _EXPAT_HELP)
117112
set(EXPAT_MSVC_STATIC_CRT OFF CACHE BOOL "Use /MT flag (static CRT) when compiling in MSVC")
118113
endif()
119114

115+
if(EXPAT_BUILD_TESTS)
116+
# We have to call enable_language() before modifying any CMAKE_CXX_* variables
117+
enable_language(CXX)
118+
endif()
119+
120120
#
121121
# Environment checks
122122
#
@@ -129,6 +129,14 @@ if(EXPAT_WITH_LIBBSD)
129129
endif()
130130
endif()
131131

132+
if(MSVC)
133+
# Minimum supported MSVC version is 1910 = Visual Studio 15.0/2017
134+
# See also https://cmake.org/cmake/help/latest/variable/MSVC_VERSION.html
135+
if(MSVC_VERSION VERSION_LESS 1910)
136+
message(SEND_ERROR "MSVC_VERSION ${MSVC_VERSION} is not a supported Visual Studio compiler version. Please use Visual Studio 15.0/2017 or any later version.")
137+
endif()
138+
endif()
139+
132140
macro(_expat_copy_bool_int source_ref dest_ref)
133141
if(${source_ref})
134142
set(${dest_ref} 1)
@@ -327,9 +335,9 @@ if(EXPAT_WITH_LIBBSD)
327335
target_link_libraries(expat ${LIB_BSD})
328336
endif()
329337

330-
set(LIBCURRENT 7) # sync
331-
set(LIBREVISION 12) # with
332-
set(LIBAGE 6) # configure.ac!
338+
set(LIBCURRENT 8) # sync
339+
set(LIBREVISION 0) # with
340+
set(LIBAGE 7) # configure.ac!
333341
math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")
334342

335343
set_property(TARGET expat PROPERTY OUTPUT_NAME "${_EXPAT_OUTPUT_NAME}")
@@ -423,7 +431,6 @@ endif()
423431
#
424432
if(EXPAT_BUILD_TESTS)
425433
## these are unittests that can be run on any platform
426-
enable_language(CXX)
427434
enable_testing()
428435

429436
set(test_SRCS

HostSupport/expat-2.2.10/Changes

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,55 @@ NOTE: We are looking for help with a few things:
22
https://github.com/libexpat/libexpat/labels/help%20wanted
33
If you can help, please get in touch. Thanks!
44

5+
Release 2.3.0 Thu March 25 2021
6+
Bug fixes:
7+
#438 When calling XML_ParseBuffer without a prior successful call to
8+
XML_GetBuffer as a user, no longer trigger undefined behavior
9+
(by adding an integer to a NULL pointer) but rather return
10+
XML_STATUS_ERROR and set the error code to (new) code
11+
XML_ERROR_NO_BUFFER. Found by UBSan (UndefinedBehaviorSanitizer)
12+
of Clang 11 (but not Clang 9).
13+
#444 xmlwf: Exit status 2 was used for both:
14+
- malformed input files (documented) and
15+
- invalid command-line arguments (undocumented).
16+
The case of invalid command-line arguments now
17+
has its own exit status 4, resolving the ambiguity.
18+
19+
Other changes:
20+
#439 xmlwf: Add argument -k to allow continuing after
21+
non-fatal errors
22+
#439 xmlwf: Add section about exit status to the -h help output
23+
#422 #426 #447 Windows: Drop support for Visual Studio <=14.0/2015
24+
#434 Windows: CMake: Detect unsupported Visual Studio at
25+
configure time (rather than at compile time)
26+
#382 #428 testrunner: Make verbose mode (argument "-v") report
27+
about passed tests, and make default mode report about
28+
failures, as well.
29+
#442 CMake: Call "enable_language(CXX)" prior to tinkering
30+
with CMAKE_CXX_* variables
31+
#448 Document use of libexpat from a CMake-based project
32+
#451 Autotools: Install CMake files as generated by CMake 3.19.6
33+
so that users with "find_package(expat [..] CONFIG [..])"
34+
are served on distributions that are *not* using the CMake
35+
build system inside for libexpat packaging
36+
#436 #437 Autotools: Drop obsolescent macro AC_HEADER_STDC
37+
#450 #452 Autotools: Resolve use of obsolete macro AC_CONFIG_HEADER
38+
#441 Address compiler warnings
39+
#443 Version info bumped from 7:12:6 to 8:0:7
40+
due to addition of error code XML_ERROR_NO_BUFFER
41+
(see https://verbump.de/ for what these numbers do)
42+
43+
Infrastructure:
44+
#435 #446 Replace Travis CI by GitHub Actions
45+
46+
Special thanks to:
47+
Alexander Richardson
48+
Oleksandr Popovych
49+
Thomas Beutlich
50+
Tim Bray
51+
and
52+
Clang LeakSan, Clang 11 UBSan and the Clang team
53+
554
Release 2.2.10 Sat October 3 2020
655
Bug fixes:
756
#390 #395 #398 Fix undefined behavior during parsing caused by
@@ -46,7 +95,7 @@ Release 2.2.10 Sat October 3 2020
4695
#354 #355 ..
4796
#356 #412 Address compiler warnings
4897
#368 #369 Address pngcheck warnings with doc/*.png images
49-
Version info bumped from 7:11:6 to 7:12:6
98+
#425 Version info bumped from 7:11:6 to 7:12:6
5099

51100
Special thanks to:
52101
asavah

HostSupport/expat-2.2.10/Makefile.am

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,19 @@ pkgconfig_DATA = expat.pc
5353
pkgconfigdir = $(libdir)/pkgconfig
5454

5555

56+
dist_cmake_DATA = \
57+
cmake/autotools/expat.cmake
58+
59+
nodist_cmake_DATA = \
60+
cmake/autotools/expat-config-version.cmake \
61+
cmake/autotools/expat-noconfig.cmake \
62+
cmake/expat-config.cmake
63+
64+
cmakedir = $(libdir)/cmake/expat-@PACKAGE_VERSION@
65+
66+
5667
_EXTRA_DIST_CMAKE = \
57-
cmake/expat-config.cmake.in \
68+
cmake/autotools/expat-package-init.cmake \
5869
cmake/mingw-toolchain.cmake \
5970
\
6071
CMakeLists.txt \

0 commit comments

Comments
 (0)