Skip to content

Update libxml-security-c 2.0.1 #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 9, 2019
Merged

Update libxml-security-c 2.0.1 #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,35 +56,35 @@ foreach($platform in @("x86", "x64")) {
$xalanmsg_dll = 'Win32/VC10/Debug/XalanMessages_1_11D.dll'
$xalanc_lib = 'Win32/VC10/Debug/Xalan-C_1D.lib'
$xalanc_dll = 'Win32/VC10/Debug/Xalan-C_1_11D.dll'
$xmlsec_lib = 'Win32/VC12/Debug/xsec_1D.lib'
$xmlsec_dll = 'Win32/VC12/Debug/xsec_1_7D.dll'
$xmlsec_lib = 'Win32/VC15/Debug/xsec_2D.lib'
$xmlsec_dll = 'Win32/VC15/Debug/xsec_2_0D.dll'
$openssl = '/OpenSSL-Win32'
} 'x86RelWithDebInfo' {
$xerces_dll = 'xerces-c_3_2.dll'
$xalanmsg_lib = 'Win32/VC10/Release/XalanMsgLib.lib'
$xalanmsg_dll = 'Win32/VC10/Release/XalanMessages_1_11.dll'
$xalanc_lib = 'Win32/VC10/Release/Xalan-C_1.lib'
$xalanc_dll = 'Win32/VC10/Release/Xalan-C_1_11.dll'
$xmlsec_lib = 'Win32/VC12/Release/xsec_1.lib'
$xmlsec_dll = 'Win32/VC12/Release/xsec_1_7.dll'
$xmlsec_lib = 'Win32/VC15/Release/xsec_2.lib'
$xmlsec_dll = 'Win32/VC15/Release/xsec_2_0.dll'
$openssl = '/OpenSSL-Win32'
} 'x64Debug' {
$xerces_dll = 'xerces-c_3_2D.dll'
$xalanmsg_lib = 'Win64/VC10/Debug/XalanMsgLib.lib'
$xalanmsg_dll = 'Win64/VC10/Debug/XalanMessages_1_11D.dll'
$xalanc_lib = 'Win64/VC10/Debug/Xalan-C_1D.lib'
$xalanc_dll = 'Win64/VC10/Debug/Xalan-C_1_11D.dll'
$xmlsec_lib = 'X64/VC12/Debug/xsec_1D.lib'
$xmlsec_dll = 'X64/VC12/Debug/xsec_1_7D.dll'
$xmlsec_lib = 'X64/VC15/Debug/xsec_2D.lib'
$xmlsec_dll = 'X64/VC15/Debug/xsec_2_0D.dll'
$openssl = '/OpenSSL-Win64'
} 'x64RelWithDebInfo' {
$xerces_dll = 'xerces-c_3_2.dll'
$xalanmsg_lib = 'Win64/VC10/Release/XalanMsgLib.lib'
$xalanmsg_dll = 'Win64/VC10/Release/XalanMessages_1_11.dll'
$xalanc_lib = 'Win64/VC10/Release/Xalan-C_1.lib'
$xalanc_dll = 'Win64/VC10/Release/Xalan-C_1_11.dll'
$xmlsec_lib = 'X64/VC12/Release/xsec_1.lib'
$xmlsec_dll = 'X64/VC12/Release/xsec_1_7.dll'
$xmlsec_lib = 'X64/VC15/Release/xsec_2.lib'
$xmlsec_dll = 'X64/VC15/Release/xsec_2_0.dll'
$openssl = '/OpenSSL-Win64'
}}
if($libdigidoc) {
Expand Down
8 changes: 4 additions & 4 deletions libdigidocpp.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<File Source="$(var.PREFIX)\xerces\x86\bin\xerces-c_3_2.dll"/>
<File Source="$(var.PREFIX)\xalan\c\Build\Win32\VC10\Release\Xalan-C_1_11.dll"/>
<File Source="$(var.PREFIX)\xalan\c\Build\Win32\VC10\Release\XalanMessages_1_11.dll"/>
<File Source="$(var.PREFIX)\xmlsec\Build\Win32\VC12\Release\xsec_1_7.dll"/>
<File Source="$(var.PREFIX)\xmlsec\Build\Win32\VC15\Release\xsec_2_0.dll"/>
<File Source="$(var.libdigidocpp)\x86\bin\digidocpp.dll"/>
<?ifdef var.swig ?>
<File Source="$(var.libdigidocpp)\x86\bin\digidoc_csharp.dll"/>
Expand All @@ -61,7 +61,7 @@
<File Source="$(var.PREFIX)\xerces\x86\bin\xerces-c_3_2D.dll"/>
<File Source="$(var.PREFIX)\xalan\c\Build\Win32\VC10\Debug\Xalan-C_1_11D.dll"/>
<File Source="$(var.PREFIX)\xalan\c\Build\Win32\VC10\Debug\XalanMessages_1_11D.dll"/>
<File Source="$(var.PREFIX)\xmlsec\Build\Win32\VC12\Debug\xsec_1_7D.dll"/>
<File Source="$(var.PREFIX)\xmlsec\Build\Win32\VC15\Debug\xsec_2_0D.dll"/>
<File Source="$(var.libdigidocpp)\x86\bin\digidoc-tool.pdb"/>
<File Source="$(var.libdigidocpp)\x86\bin\digidocpp.lib"/>
<File Source="$(var.libdigidocpp)\x86\bin\digidocpp.pdb"/>
Expand Down Expand Up @@ -111,7 +111,7 @@
<File Source="$(var.PREFIX)\xerces\x64\bin\xerces-c_3_2.dll" Id="xerces_c_3_2.dll_64"/>
<File Source="$(var.PREFIX)\xalan\c\Build\Win64\VC10\Release\Xalan-C_1_11.dll" Id="Xalan_C_1_11.dll_64"/>
<File Source="$(var.PREFIX)\xalan\c\Build\Win64\VC10\Release\XalanMessages_1_11.dll" Id="XalanMessages_1_11.dll_64"/>
<File Source="$(var.PREFIX)\xmlsec\Build\X64\VC12\Release\xsec_1_7.dll" Id="xsec_1_7.dll_64"/>
<File Source="$(var.PREFIX)\xmlsec\Build\X64\VC15\Release\xsec_2_0.dll" Id="xsec_2_0.dll_64"/>
<File Source="$(var.libdigidocpp)\x64\bin\digidocpp.dll" Id="digidocpp.dll_64"/>
<?ifdef var.swig ?>
<File Source="$(var.libdigidocpp)\x64\bin\digidoc_csharp.dll" Id="digidoc_csharp.dll_64"/>
Expand All @@ -128,7 +128,7 @@
<File Source="$(var.PREFIX)\xerces\x64\bin\xerces-c_3_2D.dll" Id="xerces_c_3_2D.dll_64"/>
<File Source="$(var.PREFIX)\xalan\c\Build\Win64\VC10\Debug\Xalan-C_1_11D.dll" Id="Xalan_C_1_11D.dll_64"/>
<File Source="$(var.PREFIX)\xalan\c\Build\Win64\VC10\Debug\XalanMessages_1_11D.dll" Id="XalanMessages_1_11D.dll_64"/>
<File Source="$(var.PREFIX)\xmlsec\Build\X64\VC12\Debug\xsec_1_7D.dll" Id="xsec_1_7D.dll_64"/>
<File Source="$(var.PREFIX)\xmlsec\Build\X64\VC15\Debug\xsec_2_0D.dll" Id="xsec_2_0D.dll_64"/>
<File Source="$(var.libdigidocpp)\x64\bin\digidoc-tool.pdb" Id="digidoc_tool.pdb_64"/>
<File Source="$(var.libdigidocpp)\x64\bin\digidocpp.lib" Id="digidocpp.lib_64"/>
<File Source="$(var.libdigidocpp)\x64\bin\digidocpp.pdb" Id="digidocpp.pdb_64"/>
Expand Down
2 changes: 1 addition & 1 deletion patches/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* xalan-winproj.patch - Xalan-C Visual Studio project fixes
* xerces-char16_t.patch - Xalan-C build fixes with VS2015 and xerces-c 3.2.0
https://issues.apache.org/jira/browse/XALANC-773
* xml-security-c-1.7.3-VC12.patch - Updated VS project files
* xml-security-c-2.0.1-win.patch - Updated VS project files

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