Merge topic 'swap-lightviz-out-for-flow'

b7c0c0cd Replace the lightviz application with paraview-flow
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastien Jourdain <sebastien.jourdain@kitware.com>
Merge-request: !596

CMakeLists.txt

@@ -59,6 +59,7 @@ function (superbuild_find_projects var)
     paraviewwebglance
     paraviewweblite
     paraviewwebdivvy
+    paraviewwebflow
     paraviewwebvisualizer
     png
     pythonautobahn

Scripts/singularity/Singularity.egl

@@ -180,21 +180,21 @@ From: nvidia/opengl:1.0-glvnd-devel-ubuntu18.04
             pv-release-egl.sif --data /data/disk_out.exo --port 9091
 
 
-%apprun lightviz
+%apprun flow
     exec /opt/paraview/bin/pvpython \
-        /opt/paraview/share/paraview-5.6/web/lightviz/server/pvw-light-viz.py \
-        --content /opt/paraview/share/paraview-5.6/web/lightviz/www "$@"
+        /opt/paraview/share/paraview-5.6/web/flow/server/pvw-flow.py \
+        --content /opt/paraview/share/paraview-5.6/web/flow/www "$@"
 
-%apphelp lightviz
-    Run the ParaViewWeb LightViz server.  The server python script (`pvw-light-viz.py`)
+%apphelp flow
+    Run the ParaView Flow server.  The server python script (`pvw-flow.py`)
     as well as the `--content` arguments are already provided for you, but you may still
-    want to provide other arguments such as `--data <path-to-data-dir>` (note that you
-    must bind-mount that path when running singularity for the image to see it), or
-    `--port <port-number>`.
+    want to provide other arguments such as `--data <path-to-parflow-metadata-file>`
+    (note that you must either bind-mount that path when running singularity, or else be
+    in the directory where it lives for the image to see it), or `--port <port-number>`.
 
     Example:
 
         $ singularity run --nv \
             --bind /<path-to-data-dir>:/data \
-            --app lightviz \
-            pv-release-egl.sif --data /data --port 9091
+            --app flow \
+            pv-release-egl.sif --data /data/pvmetadata --port 9091

Scripts/singularity/Singularity.osmesa

@@ -180,21 +180,21 @@ From: ubuntu:18.04
             pv-release-osmesa.sif --data /data/disk_out.exo --port 9091
 
 
-%apprun lightviz
+%apprun flow
     exec /opt/paraview/bin/pvpython --mesa-swr \
-        /opt/paraview/share/paraview-5.6/web/lightviz/server/pvw-light-viz.py \
-        --content /opt/paraview/share/paraview-5.6/web/lightviz/www "$@"
+        /opt/paraview/share/paraview-5.6/web/flow/server/pvw-flow.py \
+        --content /opt/paraview/share/paraview-5.6/web/flow/www "$@"
 
-%apphelp lightviz
-    Run the ParaViewWeb LightViz server.  The server python script (`pvw-light-viz.py`)
+%apphelp flow
+    Run the ParaView Flow server.  The server python script (`pvw-flow.py`)
     as well as the `--content` arguments are already provided for you, but you may still
-    want to provide other arguments such as `--data <path-to-data-dir>` (note that you
-    must bind-mount that path when running singularity for the image to see it), or
-    `--port <port-number>`.
+    want to provide other arguments such as `--data <path-to-parflow-metadata-file>`
+    (note that you must either bind-mount that path when running singularity, or else be
+    in the directory where it lives for the image to see it), or `--port <port-number>`.
 
     Example:
 
         $ singularity run \
             --bind /<path-to-data-dir>:/data \
-            --app lightviz \
-            pv-release-osmesa.sif --data /data --port 9091
+            --app flow \
+            pv-release-osmesa.sif --data /data/pfmetadata --port 9091

projects/paraviewweb.cmake

@@ -10,6 +10,7 @@ superbuild_add_dummy_project(paraviewweb
     paraviewwebglance
     paraviewweblite
     paraviewwebvisualizer
+    paraviewwebflow
     paraviewwebdivvy
     pythonwslink
     pythonautobahn

projects/paraviewwebflow.cmake

+superbuild_add_project(paraviewwebflow
+  CONFIGURE_COMMAND
+    ""
+  BUILD_COMMAND
+    ""
+  INSTALL_COMMAND
+    "${CMAKE_COMMAND}"
+    -Dsource_location:PATH=<SOURCE_DIR>
+    -Dinstall_location:PATH=<INSTALL_DIR>
+    -P "${CMAKE_CURRENT_LIST_DIR}/scripts/paraviewwebflow.install.cmake")

projects/scripts/paraviewweblightviz.install.cmake → projects/scripts/paraviewwebflow.install.cmake

 file(INSTALL
   ${source_location}/dist/
-  DESTINATION "${install_location}/share/paraview/web/lightviz/www")
+  DESTINATION "${install_location}/share/paraview/web/flow/www")
 file(INSTALL
   ${source_location}/server/
-  DESTINATION "${install_location}/share/paraview/web/lightviz/server")
+  DESTINATION "${install_location}/share/paraview/web/flow/server")

versions.cmake

@@ -134,6 +134,10 @@ superbuild_set_revision(paraviewwebglance
   URL     "https://registry.npmjs.org/paraview-glance/-/paraview-glance-3.0.3.tgz"
   URL_MD5 4eacd4ef01f86dcb53d84ef1fb75938f)
 
+superbuild_set_revision(paraviewwebflow
+  URL     "https://registry.npmjs.org/paraview-flow/-/paraview-flow-1.0.5.tgz"
+  URL_MD5 b4f04d98226720b3a554f8f09d5e48b0)
+
 superbuild_set_revision(paraviewwebdivvy
   URL     "https://www.paraview.org/files/dependencies/divvy-1.3.14.tar.gz"
   URL_MD5 e9a0453a057588791e00efede43cfb91)