From: YOANN AUDOUIN <B61570@dsp0919998.atlas.edf.fr>
Date: Thu, 14 Jan 2021 14:02:15 +0000 (+0100)
Subject: [fix] Corrections for version value
X-Git-Tag: SH_V2_2_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2FSH_V2_2_1;p=modules%2Fhydro.git

[fix] Corrections for version value
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24415905..608d2d68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ INCLUDE(CMakeDependentOption)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 2)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
@@ -103,7 +103,7 @@ IF(SALOME_BUILD_GUI)
   IF(EXISTS ${GUI_ROOT_DIR})
     FIND_PACKAGE(SalomeGUI)
     SALOME_GUI_WITH_CORBA() #check whether GUI built with CORBA
-    SALOME_GUI_MODE(SALOME_USE_VTKVIEWER SALOME_USE_SALOMEOBJECT 
+    SALOME_GUI_MODE(SALOME_USE_VTKVIEWER SALOME_USE_SALOMEOBJECT
                     OPTIONAL SALOME_USE_PLOT2DVIEWER SALOME_USE_PYCONSOLE)
     ##
     ## Prerequisites From GUI:
@@ -143,7 +143,7 @@ ENDIF(EXISTS ${GEOM_ROOT_DIR})
 ## From GUI:
 ##
 
-FIND_PACKAGE(SalomeOpenCASCADE REQUIRED) 
+FIND_PACKAGE(SalomeOpenCASCADE REQUIRED)
 FIND_PACKAGE(SalomeVTK     REQUIRED)
 FIND_PACKAGE(SalomeSIP REQUIRED)  # should come after Python and before PyQt4
 
@@ -184,9 +184,9 @@ SET(SALOME_HYDRO_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/hydro" CACHE PATH
   "Install path: SALOME HYDRO scripts")
 SET(SALOME_HYDRO_INSTALL_SAMPLES share/salome/hydrosamples CACHE PATH
   "Install path: SALOME HYDRO samples")
-SET(SALOME_HYDRO_INSTALL_PLUGINS share/salome/plugins/hydro CACHE PATH 
+SET(SALOME_HYDRO_INSTALL_PLUGINS share/salome/plugins/hydro CACHE PATH
     "Install path: SALOME HYDRO plugins")
-  
+
 MARK_AS_ADVANCED(
   SALOME_HYDRO_INSTALL_RES_DATA
   SALOME_HYDRO_INSTALL_RES_SCRIPTS
diff --git a/HYDRO_version.h.in b/HYDRO_version.h.in
index 80e20801..1bdb6ff6 100644
--- a/HYDRO_version.h.in
+++ b/HYDRO_version.h.in
@@ -16,7 +16,7 @@
 #define HYDRO_VERSION_MINOR       @SALOMEHYDRO_MINOR_VERSION@
 #define HYDRO_VERSION_MAINTENANCE @SALOMEHYDRO_PATCH_VERSION@
 #define HYDRO_VERSION_STR         "@SALOMEHYDRO_VERSION@"
-#define HYDRO_VERSION             @SALOMEHYDRO_XVERSION@
+#define HYDRO_VERSION             @SALOMEHYDRO_VERSION@
 #define HYDRO_DEVELOPMENT         @SALOMEHYDRO_VERSION_DEV@
 
 #endif // __HYDRO_VERSION_H__
diff --git a/doc/salome/tutorial/local/conf.py b/doc/salome/tutorial/local/conf.py
index 4a01399a..6f4afa84 100644
--- a/doc/salome/tutorial/local/conf.py
+++ b/doc/salome/tutorial/local/conf.py
@@ -41,16 +41,16 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'module HYDRO'
-copyright = '2015-2017, EDF'
+copyright = '2015-2021, EDF'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '8.2'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '8.2-2017.04.14'
+release = '2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/src/HYDROGUI/resources/LightApp.xml b/src/HYDROGUI/resources/LightApp.xml
index c23856fe..aacfd223 100644
--- a/src/HYDROGUI/resources/LightApp.xml
+++ b/src/HYDROGUI/resources/LightApp.xml
@@ -27,7 +27,7 @@
     <parameter value="HYDRO" name="name" />
     <parameter value="HYDROGUI" name="library" />
     <parameter value="0" name="parameter_test" />
-    <parameter name="version" value="2.0.0"/>
+    <parameter name="version" value="2.2.0"/>
     <parameter value="false" name="auto_fit_all"/>
     <parameter value="true" name="zoom_shutoff"/>
     <parameter value="true" name="chained_panning"/>