Skip to content

Commit 246f1a5

Browse files
metsmametsma
committed
Update libxml-security-c 2.0.1
IB-5389 Signed-off-by: Raul Metsma <[email protected]>
1 parent a9af887 commit 246f1a5

6 files changed

+367
-5312
lines changed

‎build.ps1

+8-8
Original file line numberDiff line numberDiff line change
@@ -56,35 +56,35 @@ foreach($platform in @("x86", "x64")) {
5656
$xalanmsg_dll = 'Win32/VC10/Debug/XalanMessages_1_11D.dll'
5757
$xalanc_lib = 'Win32/VC10/Debug/Xalan-C_1D.lib'
5858
$xalanc_dll = 'Win32/VC10/Debug/Xalan-C_1_11D.dll'
59-
$xmlsec_lib = 'Win32/VC12/Debug/xsec_1D.lib'
60-
$xmlsec_dll = 'Win32/VC12/Debug/xsec_1_7D.dll'
59+
$xmlsec_lib = 'Win32/VC15/Debug/xsec_2D.lib'
60+
$xmlsec_dll = 'Win32/VC15/Debug/xsec_2_0D.dll'
6161
$openssl = '/OpenSSL-Win32'
6262
} 'x86RelWithDebInfo' {
6363
$xerces_dll = 'xerces-c_3_2.dll'
6464
$xalanmsg_lib = 'Win32/VC10/Release/XalanMsgLib.lib'
6565
$xalanmsg_dll = 'Win32/VC10/Release/XalanMessages_1_11.dll'
6666
$xalanc_lib = 'Win32/VC10/Release/Xalan-C_1.lib'
6767
$xalanc_dll = 'Win32/VC10/Release/Xalan-C_1_11.dll'
68-
$xmlsec_lib = 'Win32/VC12/Release/xsec_1.lib'
69-
$xmlsec_dll = 'Win32/VC12/Release/xsec_1_7.dll'
68+
$xmlsec_lib = 'Win32/VC15/Release/xsec_2.lib'
69+
$xmlsec_dll = 'Win32/VC15/Release/xsec_2_0.dll'
7070
$openssl = '/OpenSSL-Win32'
7171
} 'x64Debug' {
7272
$xerces_dll = 'xerces-c_3_2D.dll'
7373
$xalanmsg_lib = 'Win64/VC10/Debug/XalanMsgLib.lib'
7474
$xalanmsg_dll = 'Win64/VC10/Debug/XalanMessages_1_11D.dll'
7575
$xalanc_lib = 'Win64/VC10/Debug/Xalan-C_1D.lib'
7676
$xalanc_dll = 'Win64/VC10/Debug/Xalan-C_1_11D.dll'
77-
$xmlsec_lib = 'X64/VC12/Debug/xsec_1D.lib'
78-
$xmlsec_dll = 'X64/VC12/Debug/xsec_1_7D.dll'
77+
$xmlsec_lib = 'X64/VC15/Debug/xsec_2D.lib'
78+
$xmlsec_dll = 'X64/VC15/Debug/xsec_2_0D.dll'
7979
$openssl = '/OpenSSL-Win64'
8080
} 'x64RelWithDebInfo' {
8181
$xerces_dll = 'xerces-c_3_2.dll'
8282
$xalanmsg_lib = 'Win64/VC10/Release/XalanMsgLib.lib'
8383
$xalanmsg_dll = 'Win64/VC10/Release/XalanMessages_1_11.dll'
8484
$xalanc_lib = 'Win64/VC10/Release/Xalan-C_1.lib'
8585
$xalanc_dll = 'Win64/VC10/Release/Xalan-C_1_11.dll'
86-
$xmlsec_lib = 'X64/VC12/Release/xsec_1.lib'
87-
$xmlsec_dll = 'X64/VC12/Release/xsec_1_7.dll'
86+
$xmlsec_lib = 'X64/VC15/Release/xsec_2.lib'
87+
$xmlsec_dll = 'X64/VC15/Release/xsec_2_0.dll'
8888
$openssl = '/OpenSSL-Win64'
8989
}}
9090
if($libdigidoc) {

‎libdigidocpp.wxs

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<File Source="$(var.PREFIX)\xerces\x86\bin\xerces-c_3_2.dll"/>
4545
<File Source="$(var.PREFIX)\xalan\c\Build\Win32\VC10\Release\Xalan-C_1_11.dll"/>
4646
<File Source="$(var.PREFIX)\xalan\c\Build\Win32\VC10\Release\XalanMessages_1_11.dll"/>
47-
<File Source="$(var.PREFIX)\xmlsec\Build\Win32\VC12\Release\xsec_1_7.dll"/>
47+
<File Source="$(var.PREFIX)\xmlsec\Build\Win32\VC15\Release\xsec_2_0.dll"/>
4848
<File Source="$(var.libdigidocpp)\x86\bin\digidocpp.dll"/>
4949
<?ifdef var.swig ?>
5050
<File Source="$(var.libdigidocpp)\x86\bin\digidoc_csharp.dll"/>
@@ -61,7 +61,7 @@
6161
<File Source="$(var.PREFIX)\xerces\x86\bin\xerces-c_3_2D.dll"/>
6262
<File Source="$(var.PREFIX)\xalan\c\Build\Win32\VC10\Debug\Xalan-C_1_11D.dll"/>
6363
<File Source="$(var.PREFIX)\xalan\c\Build\Win32\VC10\Debug\XalanMessages_1_11D.dll"/>
64-
<File Source="$(var.PREFIX)\xmlsec\Build\Win32\VC12\Debug\xsec_1_7D.dll"/>
64+
<File Source="$(var.PREFIX)\xmlsec\Build\Win32\VC15\Debug\xsec_2_0D.dll"/>
6565
<File Source="$(var.libdigidocpp)\x86\bin\digidoc-tool.pdb"/>
6666
<File Source="$(var.libdigidocpp)\x86\bin\digidocpp.lib"/>
6767
<File Source="$(var.libdigidocpp)\x86\bin\digidocpp.pdb"/>
@@ -111,7 +111,7 @@
111111
<File Source="$(var.PREFIX)\xerces\x64\bin\xerces-c_3_2.dll" Id="xerces_c_3_2.dll_64"/>
112112
<File Source="$(var.PREFIX)\xalan\c\Build\Win64\VC10\Release\Xalan-C_1_11.dll" Id="Xalan_C_1_11.dll_64"/>
113113
<File Source="$(var.PREFIX)\xalan\c\Build\Win64\VC10\Release\XalanMessages_1_11.dll" Id="XalanMessages_1_11.dll_64"/>
114-
<File Source="$(var.PREFIX)\xmlsec\Build\X64\VC12\Release\xsec_1_7.dll" Id="xsec_1_7.dll_64"/>
114+
<File Source="$(var.PREFIX)\xmlsec\Build\X64\VC15\Release\xsec_2_0.dll" Id="xsec_2_0.dll_64"/>
115115
<File Source="$(var.libdigidocpp)\x64\bin\digidocpp.dll" Id="digidocpp.dll_64"/>
116116
<?ifdef var.swig ?>
117117
<File Source="$(var.libdigidocpp)\x64\bin\digidoc_csharp.dll" Id="digidoc_csharp.dll_64"/>
@@ -128,7 +128,7 @@
128128
<File Source="$(var.PREFIX)\xerces\x64\bin\xerces-c_3_2D.dll" Id="xerces_c_3_2D.dll_64"/>
129129
<File Source="$(var.PREFIX)\xalan\c\Build\Win64\VC10\Debug\Xalan-C_1_11D.dll" Id="Xalan_C_1_11D.dll_64"/>
130130
<File Source="$(var.PREFIX)\xalan\c\Build\Win64\VC10\Debug\XalanMessages_1_11D.dll" Id="XalanMessages_1_11D.dll_64"/>
131-
<File Source="$(var.PREFIX)\xmlsec\Build\X64\VC12\Debug\xsec_1_7D.dll" Id="xsec_1_7D.dll_64"/>
131+
<File Source="$(var.PREFIX)\xmlsec\Build\X64\VC15\Debug\xsec_2_0D.dll" Id="xsec_2_0D.dll_64"/>
132132
<File Source="$(var.libdigidocpp)\x64\bin\digidoc-tool.pdb" Id="digidoc_tool.pdb_64"/>
133133
<File Source="$(var.libdigidocpp)\x64\bin\digidocpp.lib" Id="digidocpp.lib_64"/>
134134
<File Source="$(var.libdigidocpp)\x64\bin\digidocpp.pdb" Id="digidocpp.pdb_64"/>

‎patches/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* xalan-winproj.patch - Xalan-C Visual Studio project fixes
1111
* xerces-char16_t.patch - Xalan-C build fixes with VS2015 and xerces-c 3.2.0
1212
https://issues.apache.org/jira/browse/XALANC-773
13-
* xml-security-c-1.7.3-VC12.patch - Updated VS project files
13+
* xml-security-c-2.0.1-win.patch - Updated VS project files
1414

1515
# Experimental patches to build library on WinRT platform
1616
* build openssl from Microsoft fork https://github.com/microsoft/openssl

0 commit comments

Comments
 (0)