Merge 10447c1 into be92b58

opencor · Dec 17, 2019 · 3cc6969 · 3cc6969
2 parents be92b58 + 10447c1
commit 3cc6969
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 48 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -59,13 +59,6 @@ if(ENABLE_TEST_PLUGINS)
     option(USE_PREBUILT_ZINC_PACKAGE "Use the pre-built version of the Zinc package" ON)
 endif()
 
-# Determine whether we are using the prebuilt version of our Python and QtWebKit
-# packages
-
-if(USE_PREBUILT_PYTHON_PACKAGE AND USE_PREBUILT_QTWEBKIT_PACKAGE)
-    set(USE_PREBUILT_PYTHON_AND_QTWEBKIT_PACKAGES ON)
-endif()
-
 # Make sure that we are using the compiler we support
 
 if(WIN32)
@@ -396,20 +389,16 @@ endif()
 #          don't have 'proper' OpenGL support (e.g. on a Linux virtual machine
 #          in VirtualBox)...
 
-if(USE_PREBUILT_PYTHON_AND_QTWEBKIT_PACKAGES)
-    if(WIN32)
-        set(ICU_VERSION 57)
-    elseif(NOT APPLE)
-        add_subdirectory(src/3rdparty/linux/icu)
-        add_subdirectory(src/3rdparty/linux/mesa)
-    endif()
+if(WIN32)
+    set(ICU_VERSION 57)
+elseif(NOT APPLE)
+    add_subdirectory(src/3rdparty/linux/icu)
+    add_subdirectory(src/3rdparty/linux/mesa)
 endif()
 
-# Retrieve or build our copy of QtWebKit, but only if we are not building Python
+# Retrieve or build our copy of QtWebKit
 
-if(USE_PREBUILT_PYTHON_PACKAGE)
-    add_subdirectory(src/3rdparty/QtWebKit)
-endif()
+add_subdirectory(src/3rdparty/QtWebKit)
 
 # Required Qt modules
 
@@ -423,7 +412,7 @@ set(REQUIRED_QT_MODULES
     Widgets
 )
 
-if(USE_PREBUILT_PYTHON_AND_QTWEBKIT_PACKAGES)
+if(USE_PREBUILT_QTWEBKIT_PACKAGE)
     set(WEBKIT WebKit)
     set(WEBKITWIDGETS WebKitWidgets)
 
@@ -448,7 +437,7 @@ if(APPLE)
         set(TEST Test)
     endif()
 
-    if(USE_PREBUILT_PYTHON_AND_QTWEBKIT_PACKAGES)
+    if(USE_PREBUILT_QTWEBKIT_PACKAGE)
         set(WEBKIT WebKit)
         set(WEBKITWIDGETS WebKitWidgets)
     endif()
@@ -1043,7 +1032,7 @@ endif()
 # Python nor QtWebKit
 # Note: we need Python because we rely on Sphinx to build our documentation...
 
-if(USE_PREBUILT_PYTHON_AND_QTWEBKIT_PACKAGES)
+if(USE_PREBUILT_PYTHON_PACKAGE)
     execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/doc
                                                                ${PROJECT_BUILD_DIR}/doc)
 
@@ -1336,7 +1325,7 @@ if(WIN32)
         windows_deploy_qt_library(Qt5${QT_LIBRARY})
     endforeach()
 
-    if(USE_PREBUILT_PYTHON_AND_QTWEBKIT_PACKAGES)
+    if(USE_PREBUILT_QTWEBKIT_PACKAGE)
         foreach(QT_LIBRARY icudt icuin icuuc)
             windows_deploy_qt_library(${QT_LIBRARY}${ICU_VERSION})
         endforeach()

diff --git a/doc/downloads/index.js b/doc/downloads/index.js
@@ -37,13 +37,7 @@ var jsonData = { "versions": [
                        }
                      ],
                      "changes": [
-                       { "change": "<strong>General:</strong> Replaced our use of <a href=\"https://developer.apple.com/library/archive/documentation/DeveloperTools/Conceptual/PackageMakerUserGuide/Introduction/Introduction.html\">PackageMaker</a> with that of productbuild on <a href=\"https://en.wikipedia.org/wiki/MacOS\">macOS</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/2210\">#2210</a>). A selectable plugin cannot be needed by another plugin (see issue <a href=\"https://github.com/opencor/opencor/issues/2247\">#2247</a>)." },
-                       { "change": "<strong>Python support:</strong> added (initial) support for <a href=\"https://python.org/\">Python</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/1255\">#1255</a>). Added some <a href=\"https://python.org/\">Python</a>-based tests (see issue <a href=\"https://github.com/opencor/opencor/issues/2178\">#2178</a>). Now update the environment variable <code>PATH</code> using <code>\\</code> rather than <code>/</code> on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/2219\">#2219</a>). Merged our duplicated code (see issue <a href=\"https://github.com/opencor/opencor/issues/2225\">#2225</a>). Don't make our JupyterKernel and PythonShell plugins selectable (see issue <a href=\"https://github.com/opencor/opencor/issues/2245\">#2245</a>). Make sure that \"implementation\" and \"implementation_version\" are properly set in the JupyterKernel plugin (see issue <a href=\"https://github.com/opencor/opencor/issues/2250\">#2250</a>)." },
-                       { "change": "<strong>CellML support:</strong> fixed an issue with the CellML API wrongly allowing code generation for non-runnable models (see issue <a href=\"https://github.com/opencor/opencor/issues/2240\">#2240</a>)." },
-                       { "change": "<strong>SED-ML support:</strong> added support left and right triangle symbols (see issue <a href=\"https://github.com/opencor/opencor/issues/2173\">#2173</a>)." },
-                       { "change": "<strong>Simulation support:</strong> don't require all our solvers to be installed anymore (see issue <a href=\"https://github.com/opencor/opencor/issues/2234\">#2234</a>)." },
-                       { "change": "<strong>Simulation Experiment view:</strong> properly handle the Graph Panel properties (see issue <a href=\"https://github.com/opencor/opencor/issues/2171\">#2171</a>). Make sure that curves are plotted with all of their original settings when reloading a SED-ML file (see issue <a href=\"https://github.com/opencor/opencor/issues/2176\">#2176</a>). Make sure that all of a solver's properties get saved to a SED-ML file (see issue <a href=\"https://github.com/opencor/opencor/issues/2185\">#2185</a>). Don't access our central widget directly anymore (see issue <a href=\"https://github.com/opencor/opencor/issues/2218\">#2218</a>)." },
-                       { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1d (see issue <a href=\"https://github.com/opencor/opencor/issues/2157\">#2157</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 9.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2161\">#2161</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2198\">#2198</a>). Upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.3 (see issue <a href=\"https://github.com/opencor/opencor/issues/2208\">#2208</a>). Upgraded <a href=\"https://mesa3d.org/\">Mesa</a> to version 19.2.6 (see issue <a href=\"https://github.com/opencor/opencor/issues/2230\">#2230</a>)." }
+                       { "change": "<strong>Third-party libraries:</strong> upgraded <a href=\"https://github.com/qtwebkit/qtwebkit/wiki\">QtWebKit</a> to v5.212.0-alpha3 (see issue <a href=\"https://github.com/opencor/opencor/issues/2252\">#2252</a>)." }
                      ]
                    },
                    { "major": 0, "minor": 5, "patch": 0, "day": 15, "month": 10, "year": 2016, "type": 0, "license": 1,

diff --git a/doc/downloads/previousSnapshots.js b/doc/downloads/previousSnapshots.js
@@ -1,4 +1,32 @@
 var jsonData = { "versions": [
+                   { "major": 0, "minor": 0, "patch": 0, "day": 13, "month": 12, "year": 2019, "type": 2, "license": 2,
+                     "platforms": [
+                       { "name": "Windows", "supported": "Windows 7 and later",
+                         "files": [
+                           { "extension": ".exe" }, { "extension": ".zip" }
+                         ]
+                       },
+                       { "name": "Linux", "supported": "Ubuntu 18.04 LTS (Bionic Beaver) and later",
+                         "files": [
+                           { "extension": ".tar.gz" }
+                         ]
+                       },
+                       { "name": "macOS", "supported": "macOS 10.12 (Sierra) and later",
+                         "files": [
+                           { "extension": ".dmg" }, { "extension": ".zip" }
+                         ]
+                       }
+                     ],
+                     "changes": [
+                       { "change": "<strong>General:</strong> Replaced our use of <a href=\"https://developer.apple.com/library/archive/documentation/DeveloperTools/Conceptual/PackageMakerUserGuide/Introduction/Introduction.html\">PackageMaker</a> with that of productbuild on <a href=\"https://en.wikipedia.org/wiki/MacOS\">macOS</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/2210\">#2210</a>). A selectable plugin cannot be needed by another plugin (see issue <a href=\"https://github.com/opencor/opencor/issues/2247\">#2247</a>)." },
+                       { "change": "<strong>Python support:</strong> added (initial) support for <a href=\"https://python.org/\">Python</a> (see issue <a href=\"https://github.com/opencor/opencor/issues/1255\">#1255</a>). Added some <a href=\"https://python.org/\">Python</a>-based tests (see issue <a href=\"https://github.com/opencor/opencor/issues/2178\">#2178</a>). Now update the environment variable <code>PATH</code> using <code>\\</code> rather than <code>/</code> on Windows (see issue <a href=\"https://github.com/opencor/opencor/issues/2219\">#2219</a>). Merged our duplicated code (see issue <a href=\"https://github.com/opencor/opencor/issues/2225\">#2225</a>). Don't make our JupyterKernel and PythonShell plugins selectable (see issue <a href=\"https://github.com/opencor/opencor/issues/2245\">#2245</a>). Make sure that \"implementation\" and \"implementation_version\" are properly set in the JupyterKernel plugin (see issue <a href=\"https://github.com/opencor/opencor/issues/2250\">#2250</a>)." },
+                       { "change": "<strong>CellML support:</strong> fixed an issue with the CellML API wrongly allowing code generation for non-runnable models (see issue <a href=\"https://github.com/opencor/opencor/issues/2240\">#2240</a>)." },
+                       { "change": "<strong>SED-ML support:</strong> added support left and right triangle symbols (see issue <a href=\"https://github.com/opencor/opencor/issues/2173\">#2173</a>)." },
+                       { "change": "<strong>Simulation support:</strong> don't require all our solvers to be installed anymore (see issue <a href=\"https://github.com/opencor/opencor/issues/2234\">#2234</a>)." },
+                       { "change": "<strong>Simulation Experiment view:</strong> properly handle the Graph Panel properties (see issue <a href=\"https://github.com/opencor/opencor/issues/2171\">#2171</a>). Make sure that curves are plotted with all of their original settings when reloading a SED-ML file (see issue <a href=\"https://github.com/opencor/opencor/issues/2176\">#2176</a>). Make sure that all of a solver's properties get saved to a SED-ML file (see issue <a href=\"https://github.com/opencor/opencor/issues/2185\">#2185</a>). Don't access our central widget directly anymore (see issue <a href=\"https://github.com/opencor/opencor/issues/2218\">#2218</a>)." },
+                       { "change": "<strong>Third-party libraries:</strong> upgraded the <a href=\"https://openssl.org/\">OpenSSL</a> library to version 1.1.1d (see issue <a href=\"https://github.com/opencor/opencor/issues/2157\">#2157</a>). Upgraded <a href=\"https://llvm.org/\">LLVM</a>+<a href=\"https://clang.llvm.org/\">Clang</a> to version 9.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2161\">#2161</a>). Upgraded the <a href=\"https://computation.llnl.gov/projects/sundials\">SUNDIALS</a> library to version 5.0.0 (see issue <a href=\"https://github.com/opencor/opencor/issues/2198\">#2198</a>). Upgraded <a href=\"https://riverbankcomputing.com/software/qscintilla/intro\">QScintilla</a> to version 2.11.3 (see issue <a href=\"https://github.com/opencor/opencor/issues/2208\">#2208</a>). Upgraded <a href=\"https://mesa3d.org/\">Mesa</a> to version 19.2.6 (see issue <a href=\"https://github.com/opencor/opencor/issues/2230\">#2230</a>)." }
+                     ]
+                   },
                    { "major": 0, "minor": 0, "patch": 0, "day": 9, "month": 9, "year": 2019, "type": 2, "license": 2,
                      "platforms": [
                        { "name": "Windows", "supported": "Windows 7 and later",

diff --git a/src/3rdparty/QtWebKit/CMakeLists.txt b/src/3rdparty/QtWebKit/CMakeLists.txt
@@ -13,14 +13,14 @@ set(LIBRARY_VERSION ${MAJOR_LIBRARY_VERSION}.${MINOR_LIBRARY_VERSION}.0)
 
 # Git tags for our libraries
 
-set(GIT_TAG v5.12.0)
+set(GIT_TAG v5.212.0-alpha3-opencor)
 set(GIT_TAG_LIBJPEG 1.5.90)
 set(GIT_TAG_LIBPNG v1.6.34)
 set(GIT_TAG_ZLIB v1.2.11)
 
 # Release tag
 
-set(RELEASE_TAG v5.12.0)
+set(RELEASE_TAG v5.212.0-alpha3-opencor)
 
 # Specify where our local package will be installed
 
@@ -98,43 +98,43 @@ if(USE_PREBUILT_QTWEBKIT_PACKAGE)
     if(WIN32)
         if(RELEASE_MODE)
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 88c2375d8f90c3c6e731a52002bcb4695163c489
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 4f2b929bc80a3d23ecb2e1e558cd358542242444
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES 6eeb3b514038fba691bdcf94183c35bc04b1029a
-                                              154194a3dfe1723716da77a2938b0757ec1bb326
+                                  SHA1_VALUES 49094bb6f4060ee51ef3add6e46fbe4b138dc252
+                                              a61f75c32f9ec0802d79b437bca0a062e0e2bc07
                                               874175a6db51afe0902882f0b00f7855ab498c79
                                               47cb72ba7c899ca218be75dd89a0c0f900b968b8
                                               a386658900a742f31f1f08d55c0915d577af2d7e
-                                              9ec4fe53b4189db4d2b3791a4f994384ab910641
-                                              0753c0147fc75d617612088e745f17b3107d1ada)
+                                              a7bde32bfba64fb037927b6e0355516cb4508ccc
+                                              172fba699a361cc93597c4968cacd2cf44985095)
         else()
             retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 56b08867163478535787e0014b65c93b4487873c
+                                  ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 1ccbb8d582ee72789dcbc4e39c6988380baf1022
                                   RELEASE_TAG ${RELEASE_TAG}
                                   SHA1_FILES ${SHA1_FILES}
-                                  SHA1_VALUES f89689041007123e2f87f425c153ad236d490f2c
-                                              6bfec618a49e104b1dde9547f48b5ded382ec39b
+                                  SHA1_VALUES 8ddccd77d7dda04197233e8e3ec98e1ae0e884f8
+                                              2c07c561b44dbb7db1c046dcc849db3558ec1f22
                                               43497bf1a89173badccc0b945b43473cf5d5f12a
                                               2ef114df767c6fe4184ef458545ff8d71f4f4917
                                               5eeaf7c066cca05413a35bba5efc71526c46f478
-                                              c1f07535c93d5d51cc211813f48d0ca827cda1f5
-                                              a89cf300bea576d849ee66a2b33832a65c0db9ff)
+                                              c4b431401965c2fb2f139ffd462fe0a52213a615
+                                              7ddf6870922fc2eb7db94d3f037a5c9ba8dd450d)
         endif()
     elseif(APPLE)
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 907aa8f0572de663a1d10386c71a79afb7acbba6
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} e4c32b340516792d4d16807b1cac28bd5181abbe
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 024104337ec2a92f2ae63bdd592cb9ac7c426b35
-                                          cbace54abac7c6df21d1c0f8a2e00fc9a0c9a696)
+                              SHA1_VALUES 818ce4e16892876260559494c6ae56f16935fd38
+                                          06e5a1a883d52481d636a7fa790c745738bf20aa)
     else()
         retrieve_package_file(${PACKAGE_NAME} ${PACKAGE_VERSION}
-                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} bba1e82441095e952716b247ce280dd51721bb22
+                              ${FULL_LOCAL_EXTERNAL_PACKAGE_DIR} 2a8472a8894842cf515cac601705e4e8a4e80970
                               RELEASE_TAG ${RELEASE_TAG}
                               SHA1_FILES ${SHA1_FILES}
-                              SHA1_VALUES 687d5b9d508ed450315cc8b93dfb269696921ebe
-                                          91fd09d27e4e80cf6ac6e60a6263abb09e690989)
+                              SHA1_VALUES 360c9d2b13f651e3544fe994618178421fc04b8e
+                                          b7ec82ddcbb42f13783ef1c0ce3c67e97a1f980f)
     endif()
 else()
     # Build JPEG, PNG and ZLIB as external projects, if on Linux or macOS
@@ -312,7 +312,7 @@ else()
 
     # Package our external project
 
-    if(NOT WIN AND NOT APPLE)
+    if(NOT WIN32 AND NOT APPLE)
         set(SYMBOLIC_LINKS
             ${SHARED_LIBRARIES_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Qt${QT_VERSION_MAJOR}WebKit${CMAKE_SHARED_LIBRARY_SUFFIX}
             ${SHARED_LIBRARIES_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}Qt${QT_VERSION_MAJOR}WebKit${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJOR_LIBRARY_VERSION}