summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/expat/win32
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/expat/win32')
-rw-r--r--3rdparty/expat/win32/MANIFEST.txt4
-rw-r--r--3rdparty/expat/win32/README.txt52
-rw-r--r--3rdparty/expat/win32/build_expat_iss.bat84
-rw-r--r--3rdparty/expat/win32/expat.iss34
4 files changed, 118 insertions, 56 deletions
diff --git a/3rdparty/expat/win32/MANIFEST.txt b/3rdparty/expat/win32/MANIFEST.txt
index b7cd3954385..58201fa1679 100644
--- a/3rdparty/expat/win32/MANIFEST.txt
+++ b/3rdparty/expat/win32/MANIFEST.txt
@@ -17,11 +17,9 @@ directory you specified to the installer.
The XML well-formedness checker xmlwf.
<top>\Source\ Source code, which may interest some developers,
- including a workspace for Microsft Visual C++.
+ including a workspace for Microsoft Visual C++.
The source code includes the parser, the well-
formedness checker, and a couple of small sample
applications.
- <top>\Source\bcb5\ Project files for Borland C++ Builder 5 and BCC 5.5.
-
diff --git a/3rdparty/expat/win32/README.txt b/3rdparty/expat/win32/README.txt
index e3702ae6217..d1069cdd2f0 100644
--- a/3rdparty/expat/win32/README.txt
+++ b/3rdparty/expat/win32/README.txt
@@ -1,26 +1,22 @@
-Expat can be built on Windows in three ways:
- using MS Visual C++ (6.0 or .NET), Borland C++ Builder 5 or Cygwin.
+Expat can be built on Windows in two ways:
+ using MS Visual Studio .NET or Cygwin.
* Cygwin:
This follows the Unix build procedures.
-* C++ Builder 5:
- Possible with make files in the BCB5 subdirectory.
- Details can be found in the ReadMe file located there.
+* MS Visual Studio 2008, 2010, 2013, 2015 and 2017:
+ Use CMake to generate a solution file for Visual Studio, then use msbuild
+ to compile. For example:
-* MS Visual C++ 6:
- Based on the workspace file expat.dsw. The related project
- files (.dsp) are located in the lib subdirectory.
-
-* MS Visual Studio .NET 2002, 2003, 2005, 2008, 2010:
- The VC++ 6 workspace file (expat.dsw) and project files (.dsp)
- can be opened and imported in VS.NET without problems.
+ md build
+ cd build
+ cmake -G"Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+ msbuild /m expat.sln
* All MS C/C++ compilers:
- The output for all projects will be generated in the win32\bin
- directory, intermediate files will be located in project-specific
- subdirectories of win32\tmp.
+ The output for all projects will be generated in the <CMAKE_BUILD_TYPE>\
+ and xmlwf\<CMAKE_BUILD_TYPE>\ directories.
* Creating MinGW dynamic libraries from MS VC++ DLLs:
@@ -42,39 +38,23 @@ Expat can be built on Windows in three ways:
Dynamic Linking:
- By default the Expat Dlls are built to link statically
+ By default the Expat Dlls are built to link dynamically
with the multi-threaded run-time library.
The libraries are named
- libexpat(w).dll
- libexpat(w).lib (import library)
The "w" indicates the UTF-16 version of the library.
- One rarely uses other versions of the Dll, but they can
- be built easily by specifying a different RTL linkage in
- the IDE on the C/C++ tab under the category Code Generation.
+ Versions that are statically linking with the multi-threaded run-time library
+ can be built with -DEXPAT_MSVC_STATIC_CRT=ON.
- Static Linking:
+ Static Linking: (through -DEXPAT_SHARED_LIBS=OFF)
The libraries should be named like this:
- Single-theaded: libexpat(w)ML.lib
Multi-threaded: libexpat(w)MT.lib
Multi-threaded Dll: libexpat(w)MD.lib
The suffixes conform to the compiler switch settings
- /ML, /MT and /MD for MS VC++.
-
- Note: In Visual Studio 2005 (Visual C++ 8.0) and later, the
- single-threaded runtime library is not supported anymore.
-
- By default, the expat-static and expatw-static projects are set up
- to link statically against the multithreaded run-time library,
- so they will build libexpatMT.lib or libexpatwMT.lib files.
-
- To build the other versions of the static library,
- go to Project - Settings:
- - specify a different RTL linkage on the C/C++ tab
- under the category Code Generation.
- - then, on the Library tab, change the output file name
- accordingly, as described above
+ /MT and /MD for MS VC++.
An application linking to the static libraries must
have the global macro XML_STATIC defined.
diff --git a/3rdparty/expat/win32/build_expat_iss.bat b/3rdparty/expat/win32/build_expat_iss.bat
new file mode 100644
index 00000000000..4e31c17dfc3
--- /dev/null
+++ b/3rdparty/expat/win32/build_expat_iss.bat
@@ -0,0 +1,84 @@
+REM Batch script to build Inno Setup installer for libexpat for Windows
+REM Call from parent directory, e.g.: cmd /c win32\build_expat_iss.bat
+REM __ __ _
+REM ___\ \/ /_ __ __ _| |_
+REM / _ \\ /| '_ \ / _` | __|
+REM | __// \| |_) | (_| | |_
+REM \___/_/\_\ .__/ \__,_|\__|
+REM |_| XML parser
+REM
+REM Copyright (C) 2019 Expat development team
+REM Licensed under the MIT license:
+REM
+REM Permission is hereby granted, free of charge, to any person obtaining
+REM a copy of this software and associated documentation files (the
+REM "Software"), to deal in the Software without restriction, including
+REM without limitation the rights to use, copy, modify, merge, publish,
+REM distribute, sublicense, and/or sell copies of the Software, and to permit
+REM persons to whom the Software is furnished to do so, subject to the
+REM following conditions:
+REM
+REM The above copyright notice and this permission notice shall be included
+REM in all copies or substantial portions of the Software.
+REM
+REM THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+REM EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+REM MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+REM NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+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
+
+REM Read by msbuild!
+SET CONFIGURATION=RelWithDebInfo
+
+REM Where Inno Setup expects build results
+SET BINDIR=win32\bin\Release
+
+
+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_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
+COPY build_shared_char\%CONFIGURATION%\libexpat.dll %BINDIR%\ || EXIT /b 1
+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_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
+COPY build_static_char\%CONFIGURATION%\libexpatMT.lib %BINDIR%\ || EXIT /b 1
+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_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
+COPY build_shared_wchar_t\%CONFIGURATION%\libexpatw.dll %BINDIR%\ || EXIT /b 1
+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_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
+COPY build_static_wchar_t\%CONFIGURATION%\libexpatwMT.lib %BINDIR%\ || EXIT /b 1
+
+
+DIR %BINDIR% || EXIT /b 1
+iscc win32\expat.iss || EXIT /b 1
diff --git a/3rdparty/expat/win32/expat.iss b/3rdparty/expat/win32/expat.iss
index 793887b6474..ef95f175857 100644
--- a/3rdparty/expat/win32/expat.iss
+++ b/3rdparty/expat/win32/expat.iss
@@ -4,20 +4,23 @@
; 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.10"
+
[Setup]
AppName=Expat
AppId=expat
-AppVersion=2.1.1
-AppVerName=Expat 2.1.1
-AppCopyright=Copyright © 1998-2012 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
+AppVersion={#expatVer}
+AppVerName=Expat {#expatVer}
+AppCopyright=Copyright © 1998-2017 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
AppPublisher=The Expat Developers
AppPublisherURL=http://www.libexpat.org/
AppSupportURL=http://www.libexpat.org/
AppUpdatesURL=http://www.libexpat.org/
-UninstallDisplayName=Expat XML Parser 2.1.1
-VersionInfoVersion=2.1.1
+UninstallDisplayName=Expat XML Parser {#expatVer}
+VersionInfoVersion={#expatVer}
+OutputBaseFilename=expat-win32bin-{#expatVer}
-DefaultDirName={pf}\Expat 2.1.1
+DefaultDirName={pf}\Expat {#expatVer}
UninstallFilesDir={app}\Uninstall
Compression=lzma
@@ -32,37 +35,34 @@ DisableReadyPage=yes
[Files]
Flags: ignoreversion; Source: win32\bin\Release\xmlwf.exe; DestDir: "{app}\Bin"
Flags: ignoreversion; Source: win32\MANIFEST.txt; DestDir: "{app}"
+Flags: ignoreversion; Source: AUTHORS; DestDir: "{app}"; DestName: AUTHORS.txt
Flags: ignoreversion; Source: Changes; DestDir: "{app}"; DestName: Changes.txt
Flags: ignoreversion; Source: COPYING; DestDir: "{app}"; DestName: COPYING.txt
-Flags: ignoreversion; Source: README; DestDir: "{app}"; DestName: README.txt
+Flags: ignoreversion; Source: README.md; DestDir: "{app}"; DestName: README.txt
Flags: ignoreversion; Source: doc\*.html; DestDir: "{app}\Doc"
Flags: ignoreversion; Source: doc\*.css; DestDir: "{app}\Doc"
Flags: ignoreversion; Source: doc\*.png; DestDir: "{app}\Doc"
Flags: ignoreversion; Source: win32\bin\Release\*.dll; DestDir: "{app}\Bin"
Flags: ignoreversion; Source: win32\bin\Release\*.lib; DestDir: "{app}\Bin"
-Flags: ignoreversion; Source: expat.dsw; DestDir: "{app}\Source"
Flags: ignoreversion; Source: win32\README.txt; DestDir: "{app}\Source"
-Flags: ignoreversion; Source: bcb5\*.bp*; DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: bcb5\*.mak; DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: bcb5\*.def; DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: bcb5\*.txt; DestDir: "{app}\Source\bcb5"
-Flags: ignoreversion; Source: bcb5\*.bat; DestDir: "{app}\Source\bcb5"
+Flags: ignoreversion; Source: Changes; DestDir: "{app}\Source"
+Flags: ignoreversion; Source: CMake.README; DestDir: "{app}\Source"
+Flags: ignoreversion; Source: CMakeLists.txt; DestDir: "{app}\Source"
+Flags: ignoreversion; Source: ConfigureChecks.cmake; DestDir: "{app}\Source"
+Flags: ignoreversion; Source: expat_config.h.cmake; DestDir: "{app}\Source"
+Flags: ignoreversion; Source: cmake\expat-config.cmake.in; DestDir: "{app}\Source\cmake"
Flags: ignoreversion; Source: lib\*.c; DestDir: "{app}\Source\lib"
Flags: ignoreversion; Source: lib\*.h; DestDir: "{app}\Source\lib"
Flags: ignoreversion; Source: lib\*.def; DestDir: "{app}\Source\lib"
-Flags: ignoreversion; Source: lib\*.dsp; DestDir: "{app}\Source\lib"
Flags: ignoreversion; Source: examples\*.c; DestDir: "{app}\Source\examples"
-Flags: ignoreversion; Source: examples\*.dsp; DestDir: "{app}\Source\examples"
Flags: ignoreversion; Source: tests\*.c; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\*.cpp; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\*.h; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\README.txt; DestDir: "{app}\Source\tests"
Flags: ignoreversion; Source: tests\benchmark\*.c; DestDir: "{app}\Source\tests\benchmark"
-Flags: ignoreversion; Source: tests\benchmark\*.ds*; DestDir: "{app}\Source\tests\benchmark"
Flags: ignoreversion; Source: tests\benchmark\README.txt; DestDir: "{app}\Source\tests\benchmark"
Flags: ignoreversion; Source: xmlwf\*.c*; DestDir: "{app}\Source\xmlwf"
Flags: ignoreversion; Source: xmlwf\*.h; DestDir: "{app}\Source\xmlwf"
-Flags: ignoreversion; Source: xmlwf\*.dsp; DestDir: "{app}\Source\xmlwf"
[Messages]
WelcomeLabel1=Welcome to the Expat XML Parser Setup Wizard