[App/U] Unify command line version info output.

Applications/Utils/FileConverter/ConvertSHPToGLI.cpp

@@ -22,10 +22,10 @@
 #include <shapefil.h>
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
-
+#include "BaseLib/BuildInfo.h"
+#include "GeoLib/GEOObjects.h"
 #include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
 #include "GeoLib/IO/XmlIO/Qt/XmlStnInterface.h"
-#include "GeoLib/GEOObjects.h"
 #include "GeoLib/Point.h"
 #include "GeoLib/Station.h"
 
@@ -134,7 +134,14 @@ int main (int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Converts points contained in shape file", ' ', "0.1");
+    TCLAP::CmdLine cmd(
+        "Converts points contained in shape file\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> shapefile_arg("s",
                                                "shape-file",
                                                "the name of the shape file ",

Applications/Utils/FileConverter/FEFLOW2OGS.cpp

@@ -16,6 +16,7 @@
 #include "Applications/ApplicationsLib/LogogSetup.h"
 
 // BaseLib
+#include "BaseLib/BuildInfo.h"
 #include "BaseLib/FileTools.h"
 #include "BaseLib/RunTime.h"
 #ifndef WIN32
@@ -34,7 +35,16 @@ int main (int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Converting a mesh in FEFLOW file format (ASCII, version 5.4) to a vtk unstructured grid file (new OGS file format) or to the old OGS file format - see options.", ' ', "0.1");
+    TCLAP::CmdLine cmd(
+        "Converting a mesh in FEFLOW file format (ASCII, version 5.4) to a vtk "
+        "unstructured grid file (new OGS file format) or to the old OGS file "
+        "format - see options.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
 
     TCLAP::ValueArg<std::string> ogs_mesh_arg(
         "o",

Applications/Utils/FileConverter/GMSH2OGS.cpp

@@ -22,6 +22,7 @@
 #include "Applications/ApplicationsLib/LogogSetup.h"
 
 // BaseLib
+#include "BaseLib/BuildInfo.h"
 #include "BaseLib/FileTools.h"
 #include "BaseLib/RunTime.h"
 #ifndef WIN32
@@ -39,7 +40,16 @@ int main (int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Converting meshes in gmsh file format (ASCII, version 2.2) to a vtk unstructured grid file (new OGS file format) or to the old OGS file format - see options.", ' ', "0.1");
+    TCLAP::CmdLine cmd(
+        "Converting meshes in gmsh file format (ASCII, version 2.2) to a vtk "
+        "unstructured grid file (new OGS file format) or to the old OGS file "
+        "format - see options.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
 
     TCLAP::ValueArg<std::string> ogs_mesh_arg(
         "o",

Applications/Utils/FileConverter/OGS2VTK.cpp

@@ -17,7 +17,7 @@
 #include <tclap/CmdLine.h>
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
-
+#include "BaseLib/BuildInfo.h"
 #include "MeshLib/IO/VtkIO/VtuInterface.h"
 #include "MeshLib/IO/readMeshFromFile.h"
 #include "MeshLib/Mesh.h"
@@ -26,7 +26,14 @@ int main (int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Converts OGS mesh into VTK mesh.", ' ', "0.1");
+    TCLAP::CmdLine cmd(
+        "Converts OGS mesh into VTK mesh.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> mesh_in("i", "mesh-input-file",
                                          "the name of the file containing the input mesh", true,
                                          "", "file name of input mesh");

Applications/Utils/FileConverter/TIN2VTK.cpp

@@ -36,7 +36,14 @@ int main (int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Converts TIN file into VTU file.", ' ', BaseLib::BuildInfo::git_describe);
+    TCLAP::CmdLine cmd(
+        "Converts TIN file into VTU file.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> inArg("i", "input-tin-file",
                                          "the name of the file containing the input TIN", true,
                                          "", "string");

Applications/Utils/FileConverter/TecPlotTools.cpp

@@ -381,7 +381,14 @@ int main(int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("TecPlot Parser", ' ', BaseLib::BuildInfo::git_describe);
+    TCLAP::CmdLine cmd(
+        "TecPlot Parser\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> input_arg("i", "input-file", "TecPlot input file", true, "", "string");
     cmd.add(input_arg);
     TCLAP::ValueArg<std::string> output_arg("o", "output-file", "output mesh file", false, "", "string");

Applications/Utils/FileConverter/VTK2OGS.cpp

@@ -17,17 +17,23 @@
 #include <tclap/CmdLine.h>
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
-
+#include "BaseLib/BuildInfo.h"
+#include "MeshLib/IO/Legacy/MeshIO.h"
 #include "MeshLib/IO/VtkIO/VtuInterface.h"
-
 #include "MeshLib/Mesh.h"
-#include "MeshLib/IO/Legacy/MeshIO.h"
 
 int main (int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Converts VTK mesh into OGS mesh.", ' ', "0.1");
+    TCLAP::CmdLine cmd(
+        "Converts VTK mesh into OGS mesh.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> mesh_in("i", "mesh-input-file",
                                          "the name of the file containing the input mesh", true,
                                          "", "file name of input mesh");

Applications/Utils/FileConverter/VTK2TIN.cpp

@@ -37,7 +37,14 @@ int main (int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Converts VTK mesh into TIN file.", ' ', BaseLib::BuildInfo::git_describe);
+    TCLAP::CmdLine cmd(
+        "Converts VTK mesh into TIN file.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> mesh_in("i", "mesh-input-file",
                                          "the name of the file containing the input mesh", true,
                                          "", "file name of input mesh");

Applications/Utils/FileConverter/convertGEO.cpp

@@ -24,9 +24,16 @@ int main (int argc, char* argv[])
 {
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Converts OGS geometry file into another file format. "
-                       "Currently *.gml (OGS6 XML-based format) and *.gli (OGS5 format) formats are supported.",
-                       ' ', BaseLib::BuildInfo::git_describe);
+    TCLAP::CmdLine cmd(
+        "Converts OGS geometry file into another file format. "
+        "Currently *.gml (OGS6 XML-based format) and *.gli (OGS5 format) "
+        "formats are supported.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> argInputFileName("i", "input-file",
                                          "the name of the geometry file to be converted", true,
                                          "", "file name");

Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp

@@ -18,6 +18,7 @@
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
 
+#include "BaseLib/BuildInfo.h"
 #include "BaseLib/FileTools.h"
 
 #include "MeshLib/IO/readMeshFromFile.h"
@@ -31,9 +32,14 @@ int main (int argc, char* argv[])
     ApplicationsLib::LogogSetup logog_setup;
 
     TCLAP::CmdLine cmd(
-            "Creates a new file for material properties and sets the material ids in the msh-file to 0",
-            ' ',
-            "0.1");
+        "Creates a new file for material properties and sets the material ids "
+        "in the msh-file to 0\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
 
     TCLAP::ValueArg<std::string> mesh_arg("m",
                                               "mesh",

Applications/Utils/GeoTools/MoveGeometry.cpp

@@ -15,10 +15,9 @@
 #include <tclap/CmdLine.h>
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
-
-#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
+#include "BaseLib/BuildInfo.h"
 #include "GeoLib/GEOObjects.h"
-
+#include "GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h"
 #include "MathLib/Vector3.h"
 
 #include <QCoreApplication>
@@ -29,8 +28,14 @@ int main(int argc, char *argv[])
 
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd
-        ("Moves the points of a geometry by a given displacement vector.", ' ', "0.1");
+    TCLAP::CmdLine cmd(
+        "Moves the points of a geometry by a given displacement vector\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<double> z_arg
         ("z", "z", "displacement in z direction", false, 0.0, "z-displacement");
     cmd.add(z_arg);

Applications/Utils/GeoTools/TriangulatePolyline.cpp

@@ -42,7 +42,14 @@ int main(int argc, char *argv[])
 
     ApplicationsLib::LogogSetup logog_setup;
 
-    TCLAP::CmdLine cmd("Triangulates the specified polyline in the given geometry file.", ' ', BaseLib::BuildInfo::git_describe);
+    TCLAP::CmdLine cmd(
+        "Triangulates the specified polyline in the given geometry file.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string>  input_arg("i", "input",  "GML input file (*.gml)", true, "", "string");
     TCLAP::ValueArg<std::string> output_arg("o", "output", "GML output file (*.gml)", true, "", "string");
     TCLAP::ValueArg<std::string>   name_arg("n", "name",   "Name of polyline in given file", true, "", "string");

Applications/Utils/MeshEdit/AddTopLayer.cpp

@@ -14,12 +14,10 @@
 #include <tclap/CmdLine.h>
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
-
+#include "BaseLib/BuildInfo.h"
 #include "BaseLib/FileTools.h"
-
 #include "MeshLib/IO/readMeshFromFile.h"
 #include "MeshLib/IO/writeMeshToFile.h"
-
 #include "MeshLib/Mesh.h"
 #include "MeshLib/MeshEditing/AddLayerToMesh.h"
 
@@ -29,10 +27,14 @@ int main (int argc, char* argv[])
 
     TCLAP::CmdLine cmd(
         "Adds a top layer to an existing mesh"
-        "The documentation is available at https://docs.opengeosys.org/docs/tools/meshing/addtoplayer ",
-        ' ',
-        "0.1");
-
+        "The documentation is available at "
+        "https://docs.opengeosys.org/docs/tools/meshing/addtoplayer.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> mesh_arg("i", "input-mesh-file",
         "the name of the file containing the mesh", true,
         "", "file name");

Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp

@@ -20,6 +20,7 @@
 #include "Applications/FileIO/readGeometryFromFile.h"
 #include "Applications/FileIO/writeGeometryToFile.h"
 
+#include "BaseLib/BuildInfo.h"
 #include "BaseLib/FileTools.h"
 
 #include "MeshLib/IO/readMeshFromFile.h"
@@ -121,9 +122,15 @@ int main (int argc, char* argv[])
 
     TCLAP::CmdLine cmd(
         "Creates boundary conditions for mesh nodes along polylines."
-        "The documentation is available at https://docs.opengeosys.org/docs/tools/model-preparation/create-boundary-conditions-along-a-polyline",
-        ' ',
-        "0.1");
+        "The documentation is available at "
+        "https://docs.opengeosys.org/docs/tools/model-preparation/"
+        "create-boundary-conditions-along-a-polyline.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<bool> gml_arg("", "gml",
         "if switched on write found nodes to file in gml format", false, false, "bool");
     cmd.add(gml_arg);

Applications/Utils/MeshEdit/ExtractSurface.cpp

@@ -17,8 +17,9 @@
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
 
-#include "BaseLib/StringTools.h"
+#include "BaseLib/BuildInfo.h"
 #include "BaseLib/FileTools.h"
+#include "BaseLib/StringTools.h"
 
 #include "MeshLib/IO/readMeshFromFile.h"
 #include "MeshLib/IO/writeMeshToFile.h"
@@ -35,8 +36,13 @@ int main (int argc, char* argv[])
     TCLAP::CmdLine cmd(
         "Tool extracts the surface of the given mesh. The documentation is "
         "available at "
-        "https://docs.opengeosys.org/docs/tools/meshing/extract-surface",
-        ' ', "0.1");
+        "https://docs.opengeosys.org/docs/tools/meshing/extract-surface.\n\n"
+        "OpenGeoSys-6 software, version " +
+            BaseLib::BuildInfo::git_describe +
+            ".\n"
+            "Copyright (c) 2012-2018, OpenGeoSys Community "
+            "(http://www.opengeosys.org)",
+        ' ', BaseLib::BuildInfo::git_describe);
     TCLAP::ValueArg<std::string> mesh_in(
         "i", "mesh-input-file",
         "the name of the file containing the input mesh", true, "",