Merge topic 'update-to-v5.7.0-RC1'

9618c2f0 Update example version number
e680e7fc Update the default version to 5.7.0-RC1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !609

CMakeLists.txt

@@ -5,12 +5,16 @@ project(paraview-superbuild)
 list(INSERT CMAKE_MODULE_PATH 0
   "${CMAKE_CURRENT_LIST_DIR}/cmake")
 
+# Force source selection setting here.
+set(paraview_SOURCE_SELECTION "5.7.0-RC1" CACHE STRING "Force version to 5.7.0-RC1" FORCE)
+set(paraview_FROM_SOURCE_DIR OFF CACHE BOOL "Force source dir off" FORCE)
+
 macro (superbuild_setup_variables)
   include(SuperbuildVersionMacros)
   if (paraview_SOURCE_SELECTION STREQUAL "git")
     # Assuming master; just use the latest version, but let the user set their
     # own version in case it is actually a branch from some other version.
-    set(PARAVIEW_VERSION_DEFAULT "5.6.0"
+    set(PARAVIEW_VERSION_DEFAULT "5.7.0"
       CACHE STRING "The default version of ParaView to use if it cannot be detected")
     mark_as_advanced(PARAVIEW_VERSION_DEFAULT)
     set(paraview_default_version "${PARAVIEW_VERSION_DEFAULT}")

README.md

@@ -31,7 +31,7 @@ generators (Xcode and Visual Studio) are not supported.
 
 The superbuild project uses the same versioning scheme as ParaView,
 and gets tagged for every release of ParaView.  For example, to build
-ParaView version 5.4.1, checkout the `v5.4.1` tag of ParaView and
+ParaView version 5.4.1, checkout the `v5.7.0` tag of ParaView and
 superbuild.
 
 Currently available tags are shown
@@ -41,13 +41,13 @@ To checkout a specific tag from the superbuild git repository:
 
     $ cd paraview-superbuild
     $ git fetch origin # ensure you have the latest state from the main repo
-    $ git checkout v5.4.1 # replace `v5.4.1` with tag name of your choice
+    $ git checkout v5.7.0 # replace `v5.7.0` with tag name of your choice
     $ git submodule update
 
 At this point, your superbuild has all of the *rules* that were used
 when building the selected version of ParaView. Also, note that it's
 possible to build a version of ParaView using a different superbuild
-version.  For example, you could use superbuild `v5.4.1`, to build the
+version.  For example, you could use superbuild `v5.7.0`, to build the
 latest master (i.e., development) version of ParaView, or a custom
 branch.  This is done by first checking out the superbuild for the
 appropriate version and then setting the CMake variables that affect
@@ -59,8 +59,8 @@ control how superbuild finds its source packages:
     pointing to the ParaView git repository you want to clone (by default it is
     set to the offical ParaView repository) and then set the `paraview_GIT_TAG`
     to be a specific tagname or branch available for the selected git
-    repository. Use `master` for latest development code, `v5.4.1` for the
-    5.4.1 release, `release` for latest stable release, or a specific ParaView
+    repository. Use `master` for latest development code, `v5.7.0` for the
+    5.7.0 release, `release` for latest stable release, or a specific ParaView
     commit SHA. In this setup, when building the superbuild, it will clone and
     checkout the appropriate revision from the ParaView git repository automatically.
  2. Instead of letting superbuild do the cloning and updating of the ParaView
@@ -69,7 +69,7 @@ control how superbuild finds its source packages:
     set `paraview_SOURCE_DIR` to point to a custom ParaView source tree. See 'offline
     builds' below for instructions to download needed dependency packages.
  3. Another option is to use a source tarball of a ParaView release. For that,
-    set `paraview_SOURCE_SELECTION` to the version to build such as `5.4.1`.
+    set `paraview_SOURCE_SELECTION` to the version to build such as `5.7.0`.
     The superbuild offers the lastest stable release as well as release
     candidate in preparation for the release. This is the best way to build a
     released version of ParaView.
@@ -255,7 +255,7 @@ time.
 
 The following flags affect ParaView directly:
 
-  * `paraview_SOURCE_SELECTION` (default `5.4.1`): The source to use for
+  * `paraview_SOURCE_SELECTION` (default `5.7.0`): The source to use for
     ParaView itself. The version numbers use the source tarballs from the
     website for the release. The `source` selection uses the
     `paraview_SOURCE_DIR` variable to look at a checked out ParaView source

Scripts/docker/ubuntu/Dockerfile

@@ -50,8 +50,8 @@ ARG BASE_IMAGE=nvidia/opengl:1.0-glvnd-devel-ubuntu18.04
 FROM ${BASE_IMAGE}
 
 ARG RENDERING=egl
-ARG PARAVIEW_TAG=v5.6.1
-ARG SUPERBUILD_TAG=v5.6.1
+ARG PARAVIEW_TAG=v5.7.0-RC1
+ARG SUPERBUILD_TAG=v5.7.0-RC1
 ARG SUPERBUILD_REPO=https://gitlab.kitware.com/paraview/paraview-superbuild.git
 ARG DEV_BUILD=false
 

versions.cmake

@@ -32,11 +32,11 @@ superbuild_set_revision(genericio
   URL     "https://www.paraview.org/files/dependencies/genericio-master-a15ffc76cfa9f9674f933e8cb5ffc97a97fd7b27.zip"
   URL_MD5 daea4ea2076fb6a1b8ccded8e861e1be)
 
-set(paraview_doc_ver_series "5.6")
-set(paraview_doc_ver "${paraview_doc_ver_series}.0")
+set(paraview_doc_ver_series "5.7")
+set(paraview_doc_ver "${paraview_doc_ver_series}.0-RC1")
 superbuild_set_revision(paraviewgettingstartedguide
   URL     "https://www.paraview.org/files/v${paraview_doc_ver_series}/ParaViewGettingStarted-${paraview_doc_ver}.pdf"
-  URL_MD5 1bdadd4b5a62ba9f2de8eb0219ca858c)
+  URL_MD5 392a29c111c5867b51e78bcb83e64198)
 superbuild_set_revision(paraviewtutorialdata
   URL     "https://www.paraview.org/files/data/ParaViewTutorialData.tar.gz"
   URL_MD5 ff7ceab8cfc674b227c0bba392d1ed3c)
@@ -47,9 +47,9 @@ superbuild_set_revision(paraviewtutorialdata
 # on this assumption.
 superbuild_set_selectable_source(paraview
   # NOTE: When updating this selection, also update `README.md` and CMakeLists.txt.
-  SELECT 5.6.0 DEFAULT
-    URL     "http://www.paraview.org/files/v5.6/ParaView-v5.6.0.tar.xz"
-    URL_MD5 eefb05c36ba2c3a6b25991b73f699981
+  SELECT 5.7.0-RC1 DEFAULT
+    URL     "http://www.paraview.org/files/v5.7/ParaView-v5.7.0-RC1.tar.xz"
+    URL_MD5 a82fa336a0cbbee48d01f25de15cf100
   SELECT git CUSTOMIZABLE
     GIT_REPOSITORY "https://gitlab.kitware.com/paraview/paraview.git"
     GIT_TAG        "origin/master"