From 2b83502e6b17a4f5db7af512bb17c7fd99d9e7ff Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 23 Feb 2018 10:44:01 +0200 Subject: [PATCH 1/4] Deploy both versions of OpenSSL --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b5df8497c..5b5c2cf01 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,12 +22,14 @@ build_script: - cd %SRCDIR% - copy /y .\bin\windows\release\rdm.exe .\build\windows\installer\resources\rdm.exe - copy /y .\bin\windows\release\rdm.pdb .\build\windows\installer\resources\rdm.pdb +- copy /y C:\Qt\5.9\Tools\QtCreator\bin\libeay32.dll .\build\windows\installer\resources\libeay32.dll +- copy /y C:\Qt\5.9\Tools\QtCreator\bin\ssleay32.dll .\build\windows\installer\resources\ssleay32.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libcrypto-1_1.dll .\build\windows\installer\resources\libcrypto-1_1.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libssl-1_1.dll .\build\windows\installer\resources\libssl-1_1.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\capi.dll .\build\windows\installer\resources\capi.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\padlock.dll .\build\windows\installer\resources\padlock.dll - cd build/windows/installer/resources/ -- windeployqt --no-translations --compiler-runtime --angle --release --force --qmldir %SRCDIR%/src/qml rdm.exe +- windeployqt --compiler-runtime --angle --release --force --qmldir %SRCDIR%/src/qml rdm.exe - cd %SRCDIR% - call "C:\\Program Files (x86)\\NSIS\\makensis.exe" /V1 /DVERSION=%APPVEYOR_BUILD_VERSION% ./build/windows/installer/installer.nsi test_script: From 85d9ce76f0ca0d03897721f37eee51e170ace84c Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 23 Feb 2018 10:47:47 +0200 Subject: [PATCH 2/4] Debug --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 5b5c2cf01..69cd56fbd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,6 +22,7 @@ build_script: - cd %SRCDIR% - copy /y .\bin\windows\release\rdm.exe .\build\windows\installer\resources\rdm.exe - copy /y .\bin\windows\release\rdm.pdb .\build\windows\installer\resources\rdm.pdb +- dir C:\Qt\5.9\ - copy /y C:\Qt\5.9\Tools\QtCreator\bin\libeay32.dll .\build\windows\installer\resources\libeay32.dll - copy /y C:\Qt\5.9\Tools\QtCreator\bin\ssleay32.dll .\build\windows\installer\resources\ssleay32.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libcrypto-1_1.dll .\build\windows\installer\resources\libcrypto-1_1.dll From 71e1bd28bc70f92f96870b9b6e025c8084859d69 Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 23 Feb 2018 10:54:15 +0200 Subject: [PATCH 3/4] Debug --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 69cd56fbd..da81e3e99 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ build_script: - cd %SRCDIR% - copy /y .\bin\windows\release\rdm.exe .\build\windows\installer\resources\rdm.exe - copy /y .\bin\windows\release\rdm.pdb .\build\windows\installer\resources\rdm.pdb -- dir C:\Qt\5.9\ +- dir C:\OpenSSL-Win32\bin - copy /y C:\Qt\5.9\Tools\QtCreator\bin\libeay32.dll .\build\windows\installer\resources\libeay32.dll - copy /y C:\Qt\5.9\Tools\QtCreator\bin\ssleay32.dll .\build\windows\installer\resources\ssleay32.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libcrypto-1_1.dll .\build\windows\installer\resources\libcrypto-1_1.dll From d94a3d96976be1efe714a3cbba90143049ff5c1d Mon Sep 17 00:00:00 2001 From: Igor Malinovskiy Date: Fri, 23 Feb 2018 10:59:40 +0200 Subject: [PATCH 4/4] Update appveyor.yml --- appveyor.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index da81e3e99..1f6a5cd13 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,9 +22,8 @@ build_script: - cd %SRCDIR% - copy /y .\bin\windows\release\rdm.exe .\build\windows\installer\resources\rdm.exe - copy /y .\bin\windows\release\rdm.pdb .\build\windows\installer\resources\rdm.pdb -- dir C:\OpenSSL-Win32\bin -- copy /y C:\Qt\5.9\Tools\QtCreator\bin\libeay32.dll .\build\windows\installer\resources\libeay32.dll -- copy /y C:\Qt\5.9\Tools\QtCreator\bin\ssleay32.dll .\build\windows\installer\resources\ssleay32.dll +- copy /y C:\OpenSSL-Win32\bin\libeay32.dll .\build\windows\installer\resources\libeay32.dll +- copy /y C:\OpenSSL-Win32\bin\ssleay32.dll .\build\windows\installer\resources\ssleay32.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libcrypto-1_1.dll .\build\windows\installer\resources\libcrypto-1_1.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libssl-1_1.dll .\build\windows\installer\resources\libssl-1_1.dll - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\capi.dll .\build\windows\installer\resources\capi.dll