mirror of
https://github.com/libexpat/libexpat.git
synced 2025-04-05 13:14:59 +00:00
Merge pull request #741 from libexpat/drop-support-msvc-2017
[>=2024-04-02] Drop support for Visual Studio 15 2017
This commit is contained in:
Sebastian Pipping
GitHub
commit
d450c1b439
7 changed files with 12 additions and 38 deletions
26
appveyor.yml
26
appveyor.yml
|
|
@ -52,32 +52,6 @@ configuration: Debug
|
|||
# https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html#visual-studio-generators
|
||||
environment:
|
||||
matrix:
|
||||
# Visual Studio 2017 Win32
|
||||
- GENERATOR: Visual Studio 15 2017
|
||||
PLATFORM: Win32
|
||||
EXPAT_DLL: libexpatd.dll
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
|
||||
# Visual Studio 2017 Win32 XML_UNICODE_WCHAR_T
|
||||
- GENERATOR: Visual Studio 15 2017
|
||||
PLATFORM: Win32
|
||||
CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
|
||||
EXPAT_DLL: libexpatwd.dll
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
|
||||
# Visual Studio 2017 x64
|
||||
- GENERATOR: Visual Studio 15 2017 Win64
|
||||
PLATFORM: x64
|
||||
EXPAT_DLL: libexpatd.dll
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
|
||||
# Visual Studio 2017 x64 XML_UNICODE_WCHAR_T
|
||||
- GENERATOR: Visual Studio 15 2017 Win64
|
||||
PLATFORM: x64
|
||||
CMAKE_ARGS: -DEXPAT_CHAR_TYPE=wchar_t
|
||||
EXPAT_DLL: libexpatwd.dll
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
|
||||
# Visual Studio 2019 Win32
|
||||
- GENERATOR: Visual Studio 16 2019
|
||||
PLATFORM: Win32
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ Visual Studio Command Prompt or when using mingw, you must open a cmd.exe and
|
|||
make sure that gcc can be called. On Windows, you also might want to specify a
|
||||
special Generator for CMake:
|
||||
for Visual Studio builds do:
|
||||
cmake .. -G "Visual Studio 15 2017" && msbuild /m expat.sln
|
||||
cmake .. -G "Visual Studio 16 2019" && msbuild /m expat.sln
|
||||
for mingw builds do:
|
||||
cmake .. -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=D:\expat-install
|
||||
&& gmake && gmake install
|
||||
|
|
|
|||
|
|
@ -201,8 +201,8 @@ if(MSVC)
|
|||
# - https://sourceforge.net/p/predef/wiki/Compilers/
|
||||
# - https://en.wikipedia.org/wiki/Microsoft_Visual_Studio#History
|
||||
set(_EXPAT_MSVC_REQUIRED_INT 1800) # i.e. 12.0/2013/1800; see PR #426
|
||||
set(_EXPAT_MSVC_SUPPORTED_INT 1910)
|
||||
set(_EXPAT_MSVC_SUPPORTED_DISPLAY "Visual Studio 15.0/2017/${_EXPAT_MSVC_SUPPORTED_INT}")
|
||||
set(_EXPAT_MSVC_SUPPORTED_INT 1920)
|
||||
set(_EXPAT_MSVC_SUPPORTED_DISPLAY "Visual Studio 16.0/2019/${_EXPAT_MSVC_SUPPORTED_INT}")
|
||||
|
||||
if(MSVC_VERSION VERSION_LESS ${_EXPAT_MSVC_SUPPORTED_INT})
|
||||
if(MSVC_VERSION VERSION_LESS ${_EXPAT_MSVC_REQUIRED_INT})
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ Expat supports the following compilers:
|
|||
|
||||
- GNU GCC >=4.5
|
||||
- LLVM Clang >=3.5
|
||||
- Microsoft Visual Studio >=15.0/2017 (rolling `${today} minus 5 years`)
|
||||
- Microsoft Visual Studio >=16.0/2019 (rolling `${today} minus 5 years`)
|
||||
|
||||
Windows users can use the
|
||||
[`expat-win32bin-*.*.*.{exe,zip}` download](https://github.com/libexpat/libexpat/releases),
|
||||
|
|
|
|||
|
|
@ -319,7 +319,7 @@ directions in the next section. Otherwise if you have Microsoft's
|
|||
Developer Studio installed,
|
||||
you can use CMake to generate a <code>.sln</code> file, e.g.
|
||||
<code>
|
||||
cmake -G"Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=RelWithDebInfo .
|
||||
cmake -G"Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=RelWithDebInfo .
|
||||
</code>, and build Expat using <code>msbuild /m expat.sln</code> after.</p>
|
||||
|
||||
<p>Alternatively, you may download the Win32 binary package that
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@ Expat can be built on Windows in two ways:
|
|||
* Cygwin:
|
||||
This follows the Unix build procedures.
|
||||
|
||||
* MS Visual Studio 2013, 2015 and 2017:
|
||||
* MS Visual Studio 2019 and 2022:
|
||||
Use CMake to generate a solution file for Visual Studio, then use msbuild
|
||||
to compile. For example:
|
||||
|
||||
md build
|
||||
cd build
|
||||
cmake -G"Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
|
||||
cmake -G"Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
|
||||
msbuild /m expat.sln
|
||||
|
||||
* All MS C/C++ compilers:
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ REM DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|||
REM OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
REM USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
SET GENERATOR=Visual Studio 15 2017
|
||||
SET GENERATOR=Visual Studio 16 2019
|
||||
|
||||
REM Read by msbuild!
|
||||
SET CONFIGURATION=RelWithDebInfo
|
||||
|
|
@ -43,7 +43,7 @@ MD %BINDIR% || EXIT /b 1
|
|||
|
||||
MD build_shared_char || EXIT /b 1
|
||||
CD build_shared_char || EXIT /b 1
|
||||
cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF .. || EXIT /b 1
|
||||
cmake -A Win32 -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF .. || EXIT /b 1
|
||||
msbuild /m expat.sln || EXIT /b 1
|
||||
DIR %CONFIGURATION% || EXIT /b 1
|
||||
CD .. || EXIT /b 1
|
||||
|
|
@ -53,7 +53,7 @@ COPY build_shared_char\%CONFIGURATION%\libexpat.lib %BINDIR%\ || EXIT /b 1
|
|||
|
||||
MD build_static_char || EXIT /b 1
|
||||
CD build_static_char || EXIT /b 1
|
||||
cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_SHARED_LIBS=OFF .. || EXIT /b 1
|
||||
cmake -A Win32 -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_SHARED_LIBS=OFF .. || EXIT /b 1
|
||||
msbuild /m expat.sln || EXIT /b 1
|
||||
DIR %CONFIGURATION% || EXIT /b 1
|
||||
CD .. || EXIT /b 1
|
||||
|
|
@ -63,7 +63,7 @@ COPY build_static_char\xmlwf\%CONFIGURATION%\xmlwf.exe %BINDIR%\ || EXIT /b 1
|
|||
|
||||
MD build_shared_wchar_t || EXIT /b 1
|
||||
CD build_shared_wchar_t || EXIT /b 1
|
||||
cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_CHAR_TYPE=wchar_t .. || EXIT /b 1
|
||||
cmake -A Win32 -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_CHAR_TYPE=wchar_t .. || EXIT /b 1
|
||||
msbuild /m expat.sln || EXIT /b 1
|
||||
DIR %CONFIGURATION% || EXIT /b 1
|
||||
CD .. || EXIT /b 1
|
||||
|
|
@ -73,7 +73,7 @@ COPY build_shared_wchar_t\%CONFIGURATION%\libexpatw.lib %BINDIR%\ || EXIT /b 1
|
|||
|
||||
MD build_static_wchar_t || EXIT /b 1
|
||||
CD build_static_wchar_t || EXIT /b 1
|
||||
cmake -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DEXPAT_CHAR_TYPE=wchar_t .. || EXIT /b 1
|
||||
cmake -A Win32 -G"%GENERATOR%" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DEXPAT_WARNINGS_AS_ERRORS=ON -DEXPAT_MSVC_STATIC_CRT=ON -DEXPAT_BUILD_EXAMPLES=OFF -DEXPAT_BUILD_TESTS=OFF -DEXPAT_BUILD_TOOLS=OFF -DEXPAT_SHARED_LIBS=OFF -DEXPAT_CHAR_TYPE=wchar_t .. || EXIT /b 1
|
||||
msbuild /m expat.sln || EXIT /b 1
|
||||
DIR %CONFIGURATION% || EXIT /b 1
|
||||
CD .. || EXIT /b 1
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue