Merge ea256f9 into 3e6a65b

opencor · Aug 14, 2018 · 6583b28 · 6583b28
2 parents 3e6a65b + ea256f9
commit 6583b28
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 52 deletions.
diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -39,7 +39,7 @@ var jsonData = { "versions": [
                      "changes": [
                        { "change": "<strong>General:</strong> Clang code model related cleaning up (see issue <a href=\"https://github.com/opencor/opencor/issues/1747\">#1747</a>). Allow the use of another Qt style (see issue <a href=\"https://github.com/opencor/opencor/issues/1761\">#1761</a>). Improved HiDPI support (see issue <a href=\"https://github.com/opencor/opencor/issues/1763\">#1763</a>)." },
                        { "change": "<strong>Core plugin:</strong> fixed a problem with the menu items for recently opened files potentially appearing as disabled on macOS (see issue <a href=\"https://github.com/opencor/opencor/issues/1633\">#1633</a>)." },
-                       { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 3.1.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/1743\">#1743</a>). Upgraded <a href=\"https://www.openssl.org/\">OpenSSL</a> to version 1.1.0h (see issue <a href=\"https://github.com/opencor/opencor/issues/1751\">#1751</a>). Renamed our BioSignalML plugin to libBioSignalML (see issue <a href=\"https://github.com/opencor/opencor/issues/1754\">#1754</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"http://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 3.1.2 (see issue <a href=\"https://github.com/opencor/opencor/issues/1743\">#1743</a>). Renamed our BioSignalML plugin to libBioSignalML (see issue <a href=\"https://github.com/opencor/opencor/issues/1754\">#1754</a>). Upgraded <a href=\"https://www.openssl.org/\">OpenSSL</a> to version 1.1.0i (see issue <a href=\"https://github.com/opencor/opencor/issues/1767\">#1767</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 4, "patch": 1, "day": 20, "month": 5, "year": 2015, "type": 0,

diff --git a/src/plugins/thirdParty/OpenSSL/CMakeLists.txt b/src/plugins/thirdParty/OpenSSL/CMakeLists.txt
@@ -3,19 +3,23 @@ project(OpenSSLPlugin)
 # Name and version of our package
 
 set(PACKAGE_NAME OpenSSL)
-set(PACKAGE_VERSION 1.1.0h)
+set(PACKAGE_VERSION 1.1.0i)
 
 # Version of our library
 
-set(LIBRARY_VERSION 1.0.0)
+if(WIN32)
+    set(LIBRARY_VERSION 1_1)
+else()
+    set(LIBRARY_VERSION 1.1)
+endif()
 
 # Git tag for our library
 
-set(GIT_TAG opencor)
+set(GIT_TAG OpenSSL_1_1_0i)
 
 # Release tag
 
-set(RELEASE_TAG OpenSSL_1_1_0h)
+set(RELEASE_TAG OpenSSL_1_1_0i)
 
 # Specify where our local package will be installed
 
@@ -24,11 +28,14 @@ set(FULL_LOCAL_EXTERNAL_PACKAGE_DIR ${PROJECT_SOURCE_DIR}/${LOCAL_EXTERNAL_PACKA
 # Name of our package's shared libraries (and of their import libraries, if any)
 
 if(WIN32)
-    set(CRYPTO_SHARED_LIBRARY libeay32${CMAKE_SHARED_LIBRARY_SUFFIX})
-    set(CRYPTO_IMPORT_LIBRARY libeay32${CMAKE_IMPORT_LIBRARY_SUFFIX})
+    set(CRYPTO_SHARED_LIBRARY libcrypto-${LIBRARY_VERSION}-x64${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(CRYPTO_IMPORT_LIBRARY libcrypto-${LIBRARY_VERSION}-x64${CMAKE_IMPORT_LIBRARY_SUFFIX})
 
-    set(SSL_SHARED_LIBRARY ssleay32${CMAKE_SHARED_LIBRARY_SUFFIX})
-    set(SSL_IMPORT_LIBRARY ssleay32${CMAKE_IMPORT_LIBRARY_SUFFIX})
+    set(SSL_SHARED_LIBRARY libssl-${LIBRARY_VERSION}-x64${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(SSL_IMPORT_LIBRARY libssl-${LIBRARY_VERSION}-x64${CMAKE_IMPORT_LIBRARY_SUFFIX})
+
+    set(REAL_CRYPTO_IMPORT_LIBRARY libcrypto${CMAKE_IMPORT_LIBRARY_SUFFIX})
+    set(REAL_SSL_IMPORT_LIBRARY libssl${CMAKE_IMPORT_LIBRARY_SUFFIX})
 else()
     set(CRYPTO_SHARED_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}crypto${CMAKE_SHARED_LIBRARY_SUFFIX_PRE}.${LIBRARY_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX_POST})
     set(CRYPTO_IMPORT_LIBRARY ${CRYPTO_SHARED_LIBRARY})
@@ -71,37 +78,37 @@ if(USE_PREBUILT_OPENSSL_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 25bcee0a629f4195114262d964e640f2e9fb6667
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 1d4bc9a859e0ea17c24adb5490742ecda6a1ca4c
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 2db691e14fc5aad940c5a7a88165a756e14eb7b2
-                                              91bd0c116c6d5c42e2ac05b04903c86a5accbe82
-                                              aa0ec4cf292ccdfea01396829bee98b20a54b41a
-                                              251d5dd8b45d2b54101ed48f33a922e3c32cb73b)
+                                  SHA1_VALUES 1cf33672e5be0e7a1c2652159bd00ff299300071
+                                              c1d6cbf779f1326a007a244da83242b1fca1c2db
+                                              d38f812ed543811ea0a227ac34ff1c794de87a49
+                                              210f680fd7087cd587ced535edd7d6173cb536df)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 7ced79377e2bb4f6accd1d7e9601342a2c9da2fb
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 0f2e500437ec698e37632a3c7c029f5b120056a0
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES a121230d16f198a1a2bce4673235054fa6a602e9
-                                              10913b5d4895051e97b14e0e563080c827269adc
-                                              ef819da87657c13f197f3186cc80cb4063c06a55
-                                              3ab9bb6b42e56d10f80404855e99eaa305ba0a8c)
+                                  SHA1_VALUES 91191d36ca09df13d198bf1cf8a19dfa49ed6848
+                                              b014ceeb6a0c161b1e80118434d8d81d76f4b9d5
+                                              b7ef43215abd56a432b8e4f6e8ac328a26ac0b94
+                                              c4850b1636abb30ccfd0ecb8d2ba57ba52c63ad8)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} a380ca2fd32d38ac3bf27bce5329b332c76152b6
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 2d8f3dd42cca6d3794ecb9358cf1a39b4e322365
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 6e5c212f7851d2c2ac47cda39ee23131dd25facf
-                                          5a1f579d9baf6541ff2478b170cdd125130f3b3a)
+                              SHA1_VALUES a57d74a680dd87a43b13b0393eac3ca73cbbcc7a
+                                          3405b68f6bfc8d92e3177ec404c2aae595a0e75a)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 61dabb78530fd926ec2b41112368ad2d2788976e
+                              ${RELATIVE_PROJECT_SOURCE_DIR} e1c53b7904170463c209c726ef9a4ea3658ffcfe
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES aacfd3b8e1a9baa08cf482d86e4fc83ce9085fe4
-                                          67c58e48c28cd02cf9e3c7030283c61f1b7487db)
+                              SHA1_VALUES beeb006c846ab315faa8f6e4ccd9e199a3752ba3
+                                          3d3581f21b601a643e53e7ba3285c051a32e013b)
     endif()
 else()
     # We require Perl to build OpenSSL
@@ -113,14 +120,13 @@ else()
     set(CONFIG_OPTIONS "--prefix=${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}")
 
     if(WIN32)
+        list(APPEND CONFIG_OPTIONS no-asm)
+
         if(RELEASE_MODE)
             set(PLATFORM VC-WIN64A)
         else()
             set(PLATFORM debug-VC-WIN64A)
         endif()
-
-        set(MAKEFILE /f ms/ntdll.mak)
-        set(INSTALL_TARGET install)
     else()
         list(APPEND CONFIG_OPTIONS shared)
 
@@ -131,9 +137,6 @@ else()
 
             list(APPEND CONFIG_OPTIONS "-Wa,--noexecstack")
         endif()
-
-        set(MAKEFILE -f Makefile)
-        set(INSTALL_TARGET install_sw)
     endif()
 
     # Build OpenSSL as an external project
@@ -157,9 +160,9 @@ else()
         CONFIGURE_COMMAND
             ${PERL_EXECUTABLE} ./Configure ${PLATFORM} ${CONFIG_OPTIONS}
         BUILD_COMMAND
-            ${MAKE_NMAKE_COMMAND} ${MAKEFILE}
+            ${MAKE_NMAKE_COMMAND}
         INSTALL_COMMAND
-            ${MAKE_NMAKE_COMMAND} ${MAKEFILE} ${INSTALL_TARGET}
+            ${MAKE_NMAKE_COMMAND} install_sw
         BUILD_BYPRODUCTS
             <INSTALL_DIR>/lib/${CRYPTO_IMPORT_LIBRARY}
             <INSTALL_DIR>/lib/${SSL_IMPORT_LIBRARY}
@@ -168,19 +171,13 @@ else()
     # Do some post-processing that is specific to each platform
 
     if(WIN32)
-        # Windows requires an additional configuration step
-
-        ExternalProject_Add_Step(${PACKAGE_BUILD} postConfigure
-                                 COMMAND "ms/do_win64a"
-                                 WORKING_DIRECTORY ${PACKAGE_BUILD_DIR}
-                                 DEPENDEES configure
-                                 DEPENDERS build)
-
         # We want both our shared and import libraries to be in the same place
 
-        ExternalProject_Add_Step(${PACKAGE_BUILD} copyDlls
+        ExternalProject_Add_Step(${PACKAGE_BUILD} copyDllsAndRenameLibs
                                  COMMAND ${CMAKE_COMMAND} -E copy bin/${CRYPTO_SHARED_LIBRARY} lib
                                  COMMAND ${CMAKE_COMMAND} -E copy bin/${SSL_SHARED_LIBRARY} lib
+                                 COMMAND ${CMAKE_COMMAND} -E copy lib/${REAL_CRYPTO_IMPORT_LIBRARY} lib/${CRYPTO_IMPORT_LIBRARY}
+                                 COMMAND ${CMAKE_COMMAND} -E copy lib/${REAL_SSL_IMPORT_LIBRARY} lib/${SSL_IMPORT_LIBRARY}
                                  WORKING_DIRECTORY ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}
                                  DEPENDEES install)
     else()

diff --git a/src/plugins/thirdParty/libgit2/CMakeLists.txt b/src/plugins/thirdParty/libgit2/CMakeLists.txt
@@ -67,31 +67,31 @@ if(USE_PREBUILT_LIBGIT2_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 060b6d98f593bab7eadcefbe715d82f7992795ac
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 164555d18c142a29fa6449ab7f164b34bc6019f5
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES a5c5923fb8c256e7f6572d8033b278972dcdefae
-                                              e1c7502f6dc068eedd2522e978ccd01d5739a768)
+                                  SHA1_VALUES b9274b33006d11ce3469e8d2afb248f6667cd3b7
+                                              4ed9fe42f4708f4de563b6d25954f26465e6c5c3)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 073feb9a250844b38572d588dff560af0043531f
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 31a995556d5d55d4aebe26bcb30dc72e7d5bd7e7
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES c0fe7e30f2983f9dd2f32b69a6910947c40f1b9c
-                                              581609e9d40ff61a548f31db731559affb5dbc3d)
+                                  SHA1_VALUES 85f31327ceb19646c179dcb5ade81ec18c2ad82d
+                                              1b3e0402747828d3f911f46ddc991c9983349bd0)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} e6c29171a7404549ffc36bd79010a0ad27a34645
+                              ${RELATIVE_PROJECT_SOURCE_DIR} ad264a0485cdb3693ebcc1b4bd5c9a5c52a43593
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 72600305d7fbc7a00ee316516886a14f1fd8036c)
+                              SHA1_VALUES 3a762e29621d390420cdf36a6a7b86d81870e560)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 7ff4ea1def559ef838f6161ef9a4491b67134cf7
+                              ${RELATIVE_PROJECT_SOURCE_DIR} f9bffbccee0b2642b58b92ac9cfc475c1ef9229c
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 848bc303d3c809b0731e0c7fdd10d5cf2cdbc39c)
+                              SHA1_VALUES 5d101d259d57ad2c6dd2b0bf783912eedbbba425)
     endif()
 else()
     # Ignore some warnings