Merge with version on tag OCC-V2_1_0d

diff --git a/INSTALL b/INSTALL
new file mode 100644 (file)
index 0000000..f26297f
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,3 @@
+This is the version 2.1.0 of PYCALCULATOR
+Compatible with :
+       - KERNEL 2.1.0

diff --git a/bin/VERSION b/bin/VERSION
index 1b4eeb6ebb176fce6e9ea3e940d5b2fc7efd29b8..4e4d7d8f16c9769f5c3142e2a8a7c6b3b30e7008 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - GEOM VERSION: 2.0.0
+THIS IS SALOME - PYCALCULATOR VERSION: 2.1.0
\ No newline at end of file

diff --git a/doc/salome/tui/PYCALCULATOR/doxyfile b/doc/salome/tui/PYCALCULATOR/doxyfile
index fb3a46eb76dccd8d63bebb8e8e990bbdd7ced147..b091c6e4f65842fd455b2a8561b7314082ec2348 100755 (executable)
--- a/doc/salome/tui/PYCALCULATOR/doxyfile
+++ b/doc/salome/tui/PYCALCULATOR/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - PYCALCULATOR - v.2.0.0"
+PROJECT_NAME           = "SALOME - PYCALCULATOR - v.2.1.0"
 PROJECT_NUMBER         = id#1.0
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/doc/salome/tui/PYCALCULATOR/sources/static/tree.js b/doc/salome/tui/PYCALCULATOR/sources/static/tree.js
index 885668af6f14daaf72f1cd2903d76fb6754a210d..4cb4cb9cc87b0ba5dbc9b06b93cff92a3ebfc629 100755 (executable)
--- a/doc/salome/tui/PYCALCULATOR/sources/static/tree.js
+++ b/doc/salome/tui/PYCALCULATOR/sources/static/tree.js
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.2.0.0 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.2.1.0 </b>", "", "")
      insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
 
 aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))

diff --git a/resources/PYCALCULATORCatalog.xml b/resources/PYCALCULATORCatalog.xml
index 4c65e96c1f1c65e8a21c4cbd17245996bed80ace..4af53d842c4c03d5cb3e4c8765a42d6705f12a16 100644 (file)
--- a/resources/PYCALCULATORCatalog.xml
+++ b/resources/PYCALCULATORCatalog.xml
@@ -16,7 +16,7 @@
                <component-username>PyCalculator</component-username>
                <component-type>SOLVER</component-type>
                <component-author>LD</component-author>
-               <component-version> 1.0</component-version>
+               <component-version>2.1.0</component-version>
                <component-comment>Test component (Arithmetic operations with MED_Field) - SALOME component </component-comment>
                <component-multistudy>0</component-multistudy>
                <constraint>hostname = localhost</constraint>