]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
projects / modules / geom.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9998044)
Proper version set-up
authorvsr <vsr@opencascade.com>
Thu, 19 Sep 2013 09:41:56 +0000 (09:41 +0000)
committervsr <vsr@opencascade.com>
Thu, 19 Sep 2013 09:41:56 +0000 (09:41 +0000)
bin/VERSION.in patch | blob | history
doc/docutils/conf.py.in patch | blob | history
doc/salome/gui/GEOM/static/header.html.in patch | blob | history
doc/salome/gui/GEOM/static/header_py.html.in patch | blob | history
doc/salome/tui/static/header.html.in patch | blob | history
resources/GEOMCatalog.xml.in patch | blob | history
resources/SalomeApp.xml.in patch | blob | history

diff --git a/bin/VERSION.in b/bin/VERSION.in
index 33c708f57304b4562f5a484b0daafaedf779f7d2..2fc977aac151fb9e62cd2ac6a65091c416efef3c 100755 (executable)
--- a/bin/VERSION.in
+++ b/bin/VERSION.in
@@ -1,3 +1,3 @@
-[SALOME GEOM] : @VERSION@
-[DEVELOPMENT] : @VERSION_DEV@
+[SALOME GEOM] : @SALOMEGEOM_VERSION@
+[DEVELOPMENT] : @SALOMEGEOM_VERSION_DEV@
 [DESCRIPTION] : SALOME Geometry module
diff --git a/doc/docutils/conf.py.in b/doc/docutils/conf.py.in
index ab0f94d0765c2d39969b3f2ee731e4bceedff981..a7606ba2491cbdcfca3f23a9ca5d320466d518f8 100644 (file)
--- a/doc/docutils/conf.py.in
+++ b/doc/docutils/conf.py.in
@@ -54,9 +54,9 @@ copyright = '2010 EDF R&D'
 # built documents.
 #
 # The short X.Y version.
-version = '@VERSION@'
+version = '@SALOMEGEOM_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
+release = '@SALOMEGEOM_VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/salome/gui/GEOM/static/header.html.in b/doc/salome/gui/GEOM/static/header.html.in
index cd9329091cc664d09457377302e6d49acf311a30..e8fca969942c97ca3662ad34dd731e0d6a5109dd 100755 (executable)
--- a/doc/salome/gui/GEOM/static/header.html.in
+++ b/doc/salome/gui/GEOM/static/header.html.in
@@ -19,5 +19,5 @@ $extrastylesheet
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
-<div id="titlearea"><div align="right"><div class="version">Version: @VERSION@</div></div></div>
+<div id="titlearea"><div align="right"><div class="version">Version: @SALOMEGEOM_VERSION@</div></div></div>
 <!-- end header part -->
diff --git a/doc/salome/gui/GEOM/static/header_py.html.in b/doc/salome/gui/GEOM/static/header_py.html.in
index 7b68cef81b799d462f896b9705bab96c3201d464..d5ce9cb6f8fa9f01eb2dd4b13316f422a8c5cf7c 100644 (file)
--- a/doc/salome/gui/GEOM/static/header_py.html.in
+++ b/doc/salome/gui/GEOM/static/header_py.html.in
@@ -19,6 +19,6 @@ $extrastylesheet
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
-<div id="titlearea"><div align="right"><div class="version">Version: @VERSION@</div></div></div>
+<div id="titlearea"><div align="right"><div class="version">Version: @SALOMEGEOM_VERSION@</div></div></div>
 <div align="bottom-left"><a href=../index.html>Home</a></div>
 <!-- end header part -->
diff --git a/doc/salome/tui/static/header.html.in b/doc/salome/tui/static/header.html.in
index cd9329091cc664d09457377302e6d49acf311a30..e8fca969942c97ca3662ad34dd731e0d6a5109dd 100755 (executable)
--- a/doc/salome/tui/static/header.html.in
+++ b/doc/salome/tui/static/header.html.in
@@ -19,5 +19,5 @@ $extrastylesheet
 <body>
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
-<div id="titlearea"><div align="right"><div class="version">Version: @VERSION@</div></div></div>
+<div id="titlearea"><div align="right"><div class="version">Version: @SALOMEGEOM_VERSION@</div></div></div>
 <!-- end header part -->
diff --git a/resources/GEOMCatalog.xml.in b/resources/GEOMCatalog.xml.in
index 22e8b1666e4dfd1c2ff35928ff5b9384bfdfe26a..00803d946b77a680c6f32cc544e5203a90a0d532 100644 (file)
--- a/resources/GEOMCatalog.xml.in
+++ b/resources/GEOMCatalog.xml.in
@@ -69,7 +69,7 @@
         <component-username>Geometry</component-username>
         <component-type>Geom</component-type>
         <component-author>NRI</component-author>
-        <component-version>@VERSION@</component-version>
+        <component-version>@SALOMEGEOM_VERSION@</component-version>
         <component-comment>Geometry component</component-comment>
         <component-multistudy>1</component-multistudy>
         <component-icone>ModuleGeom.png</component-icone>
@@ -642,7 +642,7 @@
             <component-username>GEOM_Superv</component-username>
             <component-type>OTHER</component-type>
             <component-author></component-author>
-            <component-version>@VERSION@</component-version>
+            <component-version>@SALOMEGEOM_VERSION@</component-version>
             <component-comment>Supervision wrapper for Geometry component</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-impltype>1</component-impltype>
diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 6f5be593daaf465af71a0df0d0d574c0c7742329..d61bbf8bfca5baa333327670c885b51eaca78f1d 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -27,7 +27,7 @@
     <parameter name="name" value="Geometry"/>
     <parameter name="icon" value="ModuleGeom.png"/>
     <parameter name="documentation" value="geom_help"/>
-    <parameter name="version" value="@VERSION@"/>
+    <parameter name="version" value="@SALOMEGEOM_VERSION@"/>
   </section>
   <section name="geom_help" >
     <parameter name="sub_menu"          value="%1 module"/>
SALOME Geometry module

Copyright © 2005 - 2024 Open CASCADE.
All rights reserved.
Legal Information