Merge 540cb79 into dba4ef2

opencor · Aug 17, 2018 · 61377cd · 61377cd
2 parents dba4ef2 + 540cb79
commit 61377cd
Show file tree

Hide file tree

Showing 3 changed files with 55 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>). 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>)." }
+                       { "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.0.2p (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,23 +3,19 @@ project(OpenSSLPlugin)
 # Name and version of our package
 
 set(PACKAGE_NAME OpenSSL)
-set(PACKAGE_VERSION 1.1.0i)
+set(PACKAGE_VERSION 1.0.2p)
 
 # Version of our library
 
-if(WIN32)
-    set(LIBRARY_VERSION 1_1)
-else()
-    set(LIBRARY_VERSION 1.1)
-endif()
+set(LIBRARY_VERSION 1.0.0)
 
 # Git tag for our library
 
-set(GIT_TAG OpenSSL_1_1_0i)
+set(GIT_TAG OpenSSL_1_0_2p)
 
 # Release tag
 
-set(RELEASE_TAG OpenSSL_1_1_0i)
+set(RELEASE_TAG OpenSSL_1_0_2p)
 
 # Specify where our local package will be installed
 
@@ -28,14 +24,11 @@ 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 libcrypto-${LIBRARY_VERSION}-x64${CMAKE_SHARED_LIBRARY_SUFFIX})
-    set(CRYPTO_IMPORT_LIBRARY libcrypto-${LIBRARY_VERSION}-x64${CMAKE_IMPORT_LIBRARY_SUFFIX})
+    set(CRYPTO_SHARED_LIBRARY libeay32${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(CRYPTO_IMPORT_LIBRARY libeay32${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})
+    set(SSL_SHARED_LIBRARY ssleay32${CMAKE_SHARED_LIBRARY_SUFFIX})
+    set(SSL_IMPORT_LIBRARY ssleay32${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})
@@ -78,55 +71,56 @@ if(USE_PREBUILT_OPENSSL_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 1d4bc9a859e0ea17c24adb5490742ecda6a1ca4c
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} fba9fda0727c803efe0df4a376fff0644264399c
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 1cf33672e5be0e7a1c2652159bd00ff299300071
-                                              c1d6cbf779f1326a007a244da83242b1fca1c2db
-                                              d38f812ed543811ea0a227ac34ff1c794de87a49
-                                              210f680fd7087cd587ced535edd7d6173cb536df)
+                                  SHA1_VALUES 85c5aa8ce1eda4d2618311237284a963ff86225b
+                                              f6cdcffb9c4ab0bd333dadca271b379a1eb14a7d
+                                              4ad542700d87ec983676ebf841f4b182da5b3017
+                                              1e2d6bba3b40d163835194e70f4806dd388b8828)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 0f2e500437ec698e37632a3c7c029f5b120056a0
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 86fa98b18b6ec10e98309a92cdecd8a7cfa8fbfb
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 91191d36ca09df13d198bf1cf8a19dfa49ed6848
-                                              b014ceeb6a0c161b1e80118434d8d81d76f4b9d5
-                                              b7ef43215abd56a432b8e4f6e8ac328a26ac0b94
-                                              c4850b1636abb30ccfd0ecb8d2ba57ba52c63ad8)
+                                  SHA1_VALUES 4762bd22ad7a82650b55c98e29fe5bed4d596f02
+                                              5501820a30ce36c8434ed4f76e91e9048f2b8b2c
+                                              5345acc21eb20d7cdc2c2a3b0b4e608017c18418
+                                              e23e8edd7b3586749bf455b92882c077b1b6e12a)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} 2d8f3dd42cca6d3794ecb9358cf1a39b4e322365
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 7fbbe21b5d497e85218cbe4efd606141b93af6c2
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES a57d74a680dd87a43b13b0393eac3ca73cbbcc7a
-                                          3405b68f6bfc8d92e3177ec404c2aae595a0e75a)
+                              SHA1_VALUES e4b667fe9c5eade1c55fc9ec2dca07a1a9708f46
+                                          8eee654b73b65f50bf8429e853ac4e3da0109510)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} e1c53b7904170463c209c726ef9a4ea3658ffcfe
+                              ${RELATIVE_PROJECT_SOURCE_DIR} c718cf481591ef541f8da0a8853585fc4170a518
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES beeb006c846ab315faa8f6e4ccd9e199a3752ba3
-                                          3d3581f21b601a643e53e7ba3285c051a32e013b)
+                              SHA1_VALUES 2e29c351ffff64f61c43c6faf938156d3552efb4
+                                          84ce502947a0838996bd99b648bea0b850f348f4)
     endif()
 else()
     # We require Perl to build OpenSSL
 
     find_package(Perl REQUIRED QUIET)
 
-    # Set platform specific configuration options and tool names
+    # Set platform specific configuration options
 
-    set(CONFIG_OPTIONS "--prefix=${FULL_LOCAL_EXTERNAL_PACKAGE_DIR}")
+    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)
 
@@ -137,6 +131,9 @@ else()
 
             list(APPEND CONFIG_OPTIONS "-Wa,--noexecstack")
         endif()
+
+        set(MAKEFILE -f Makefile)
+        set(INSTALL_TARGET install_sw)
     endif()
 
     # Build OpenSSL as an external project
@@ -158,11 +155,11 @@ else()
         GIT_TAG
             ${GIT_TAG}
         CONFIGURE_COMMAND
-            ${PERL_EXECUTABLE} ./Configure ${PLATFORM} ${CONFIG_OPTIONS}
+            ${PERL_EXECUTABLE} Configure ${PLATFORM} ${CONFIG_OPTIONS}
         BUILD_COMMAND
-            ${MAKE_NMAKE_COMMAND}
+            ${MAKE_NMAKE_COMMAND} ${MAKEFILE}
         INSTALL_COMMAND
-            ${MAKE_NMAKE_COMMAND} install_sw
+            ${MAKE_NMAKE_COMMAND} ${MAKEFILE} ${INSTALL_TARGET}
         BUILD_BYPRODUCTS
             <INSTALL_DIR>/lib/${CRYPTO_IMPORT_LIBRARY}
             <INSTALL_DIR>/lib/${SSL_IMPORT_LIBRARY}
@@ -171,13 +168,19 @@ 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} copyDllsAndRenameLibs
+        ExternalProject_Add_Step(${PACKAGE_BUILD} copyDlls
                                  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} 164555d18c142a29fa6449ab7f164b34bc6019f5
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} de02a5e64043864b3eb85efa6ef3ab67ba7b1ed3
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES b9274b33006d11ce3469e8d2afb248f6667cd3b7
-                                              4ed9fe42f4708f4de563b6d25954f26465e6c5c3)
+                                  SHA1_VALUES d11da3fb03ebac190ec84f195cead410aae58889
+                                              bf0b55e84f06913e7ef70f2a87921da63172dfb5)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${RELATIVE_PROJECT_SOURCE_DIR} 31a995556d5d55d4aebe26bcb30dc72e7d5bd7e7
+                                  ${RELATIVE_PROJECT_SOURCE_DIR} 2af14381830bc550249829fbe150abc66d8915ef
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 85f31327ceb19646c179dcb5ade81ec18c2ad82d
-                                              1b3e0402747828d3f911f46ddc991c9983349bd0)
+                                  SHA1_VALUES c897b66269bca8d1f5181955cceb7fc427a5b021
+                                              16e9e40954261b4f0172cdf78795b08be60aac6f)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} ad264a0485cdb3693ebcc1b4bd5c9a5c52a43593
+                              ${RELATIVE_PROJECT_SOURCE_DIR} 40335cc68e0e0b213de883f04089d8993371f85e
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 3a762e29621d390420cdf36a6a7b86d81870e560)
+                              SHA1_VALUES 9d7a89b3ce8611828c4ca5704a8c795e90843f43)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${RELATIVE_PROJECT_SOURCE_DIR} f9bffbccee0b2642b58b92ac9cfc475c1ef9229c
+                              ${RELATIVE_PROJECT_SOURCE_DIR} c612e2b577ec7b588bb11cc2758846aecb2afed9
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 5d101d259d57ad2c6dd2b0bf783912eedbbba425)
+                              SHA1_VALUES 848bc303d3c809b0731e0c7fdd10d5cf2cdbc39c)
     endif()
 else()
     # Ignore some warnings