From 0b0e85b7a9b157c36ffa57b7397bd2063509c80a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 22 Jan 2020 16:39:35 +0100
Subject: [PATCH] COMP: reorganized paraview library names for more clarity

- OpenFOAM reader:
     (vtkPVFoam, PVFoamReader_SM)
  => (vtkPVFoamReader, ParaFoamReader)

- blockMesh reader:
     (vtkPVblockMesh, PVblockMeshReader_SM)
  => (vtkPVblockReader, ParaFoamBlockReader)

* provides better correspondence between library and module names
---
 src/paraview-plugins/Allwclean                            | 7 +++++--
 .../blockMeshReader/CMakeLists-Project.txt                | 8 ++++----
 src/paraview-plugins/blockMeshReader/library/Make/files   | 2 +-
 .../{PVblockMeshReader_SM.xml => ParaFoamBlockReader.xml} | 2 +-
 src/paraview-plugins/foamReader/CMakeLists-Project.txt    | 8 ++++----
 src/paraview-plugins/foamReader/library/Make/files        | 2 +-
 .../plugin/{PVFoamReader_SM.xml => ParaFoamReader.xml}    | 2 +-
 7 files changed, 17 insertions(+), 14 deletions(-)
 rename src/paraview-plugins/blockMeshReader/plugin/{PVblockMeshReader_SM.xml => ParaFoamBlockReader.xml} (99%)
 rename src/paraview-plugins/foamReader/plugin/{PVFoamReader_SM.xml => ParaFoamReader.xml} (99%)

diff --git a/src/paraview-plugins/Allwclean b/src/paraview-plugins/Allwclean
index 1644b25..0bc5fa0 100755
--- a/src/paraview-plugins/Allwclean
+++ b/src/paraview-plugins/Allwclean
@@ -12,8 +12,11 @@ wclean libso blockMeshReader/library
 wclean libso foamReader/library
 
 # Cleanup client-server and/or combined plugins
-rm -f $FOAM_LIBBIN/libPVblockMeshReader* 2>/dev/null
-rm -f $FOAM_LIBBIN/libPVFoamReader* 2>/dev/null
+if [ -d "$FOAM_PV_PLUGIN_LIBBIN" ]
+then
+    echo "Remaining plugins: $FOAM_PV_PLUGIN_LIBBIN"
+    # rm -rf "$FOAM_PV_PLUGIN_LIBBIN"
+fi
 
 # Cleanup generated files - remove entire top-level
 removeObjectDir "$PWD"
diff --git a/src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt b/src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt
index cc78eac..5e12e6d 100644
--- a/src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt
+++ b/src/paraview-plugins/blockMeshReader/CMakeLists-Project.txt
@@ -39,9 +39,9 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS
 )
 
 add_paraview_plugin(
-    PVblockMeshReader_SM "${foam_api}"
+    ParaFoamBlockReader "${foam_api}"
     SERVER_MANAGER_XML
-        plugin/PVblockMeshReader_SM.xml
+        plugin/ParaFoamBlockReader.xml
     SERVER_MANAGER_SOURCES
         plugin/reader/vtkPVblockMeshReader.cxx
     GUI_INTERFACES
@@ -53,10 +53,10 @@ add_paraview_plugin(
 )
 
 target_link_libraries(
-    PVblockMeshReader_SM
+    ParaFoamBlockReader
     LINK_PUBLIC
     vtkPVFoamCommon${foamPvLibQualifier}
-    vtkPVblockMesh${foamPvLibQualifier}
+    vtkPVblockReader${foamPvLibQualifier}
     ${OPENFOAM_LIBNAMES}
 )
 
diff --git a/src/paraview-plugins/blockMeshReader/library/Make/files b/src/paraview-plugins/blockMeshReader/library/Make/files
index 12405a2..a9e5db5 100644
--- a/src/paraview-plugins/blockMeshReader/library/Make/files
+++ b/src/paraview-plugins/blockMeshReader/library/Make/files
@@ -1,4 +1,4 @@
 vtkPVblockMesh.C
 vtkPVblockMeshConvert.C
 
-LIB = $(FOAM_LIBBIN)/libvtkPVblockMesh-pv${PARAVIEW_API}
+LIB = $(FOAM_LIBBIN)/libvtkPVblockReader-pv${PARAVIEW_API}
diff --git a/src/paraview-plugins/blockMeshReader/plugin/PVblockMeshReader_SM.xml b/src/paraview-plugins/blockMeshReader/plugin/ParaFoamBlockReader.xml
similarity index 99%
rename from src/paraview-plugins/blockMeshReader/plugin/PVblockMeshReader_SM.xml
rename to src/paraview-plugins/blockMeshReader/plugin/ParaFoamBlockReader.xml
index e011055..3b6c88f 100644
--- a/src/paraview-plugins/blockMeshReader/plugin/PVblockMeshReader_SM.xml
+++ b/src/paraview-plugins/blockMeshReader/plugin/ParaFoamBlockReader.xml
@@ -1,7 +1,7 @@
 <ServerManagerConfiguration>
   <ProxyGroup name="sources">
   <SourceProxy
-    name="PVblockMeshReader"
+    name="ParaFoamBlockReader"
     class="vtkPVblockMeshReader">
 
     <!-- File name - compulsory -->
diff --git a/src/paraview-plugins/foamReader/CMakeLists-Project.txt b/src/paraview-plugins/foamReader/CMakeLists-Project.txt
index 8d08198..7ac1831 100644
--- a/src/paraview-plugins/foamReader/CMakeLists-Project.txt
+++ b/src/paraview-plugins/foamReader/CMakeLists-Project.txt
@@ -45,9 +45,9 @@ add_paraview_property_group_widget(IFACES0 IFACES0_SRCS
 )
 
 add_paraview_plugin(
-    PVFoamReader_SM "${foam_api}"
+    ParaFoamReader "${foam_api}"
     SERVER_MANAGER_XML
-        plugin/PVFoamReader_SM.xml
+        plugin/ParaFoamReader.xml
     SERVER_MANAGER_SOURCES
         plugin/reader/vtkPVFoamReader.cxx
     GUI_INTERFACES
@@ -59,10 +59,10 @@ add_paraview_plugin(
 )
 
 target_link_libraries(
-    PVFoamReader_SM
+    ParaFoamReader
     LINK_PUBLIC
     vtkPVFoamCommon${foamPvLibQualifier}
-    vtkPVFoam${foamPvLibQualifier}
+    vtkPVFoamReader${foamPvLibQualifier}
     ${OPENFOAM_LIBNAMES}
 )
 
diff --git a/src/paraview-plugins/foamReader/library/Make/files b/src/paraview-plugins/foamReader/library/Make/files
index 0799918..821ca83 100644
--- a/src/paraview-plugins/foamReader/library/Make/files
+++ b/src/paraview-plugins/foamReader/library/Make/files
@@ -5,4 +5,4 @@ vtkPVFoamMeshLagrangian.C
 vtkPVFoamMeshVolume.C
 vtkPVFoamUpdateInfo.C
 
-LIB = $(FOAM_LIBBIN)/libvtkPVFoam-pv${PARAVIEW_API}
+LIB = $(FOAM_LIBBIN)/libvtkPVFoamReader-pv${PARAVIEW_API}
diff --git a/src/paraview-plugins/foamReader/plugin/PVFoamReader_SM.xml b/src/paraview-plugins/foamReader/plugin/ParaFoamReader.xml
similarity index 99%
rename from src/paraview-plugins/foamReader/plugin/PVFoamReader_SM.xml
rename to src/paraview-plugins/foamReader/plugin/ParaFoamReader.xml
index 7daa151..295d4db 100644
--- a/src/paraview-plugins/foamReader/plugin/PVFoamReader_SM.xml
+++ b/src/paraview-plugins/foamReader/plugin/ParaFoamReader.xml
@@ -1,7 +1,7 @@
 <ServerManagerConfiguration>
   <ProxyGroup name="sources">
   <SourceProxy
-    name="PVFoamReader"
+    name="ParaFoamReader"
     class="vtkPVFoamReader">
 
     <!-- File name - compulsory -->
-- 
GitLab