Merge branch 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/SALOME

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f890a94ac02755a07cc4f3cc9f17ad8950381618..48d962de567176a7ea3e03928559531edb885bbd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,21 +17,16 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)
-PROJECT(Salome_SALOME C CXX)
 
-# Versioning
-# ===========
-# Project name, upper case
+# Project name
+# ============
+# original
+PROJECT(Salome_SALOME C CXX)
+# upper case
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 0)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
-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})
-
-
 # Common CMake macros
+# ===================
 SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files")
 IF(EXISTS ${CONFIGURATION_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
@@ -40,6 +35,11 @@ ELSE()
   MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
 ENDIF()
 
+# Versioning
+# ===========
+SALOME_SETUP_VERSION(9.8.0)
+MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
+
 # Find KERNEL
 # ===========
 SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL")

diff --git a/resources/LightApp_msg_en.ts b/resources/LightApp_msg_en.ts
index c6144735d568d72f8a4c7be96321184a930f20bc..978038e703a51ea8a165f74f91814d78d64ab454 100644 (file)
--- a/resources/LightApp_msg_en.ts
+++ b/resources/LightApp_msg_en.ts
@@ -20,7 +20,7 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>9.7.0</translation>
+        <translation>9.8.0</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -28,7 +28,7 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 9.7.0</translation>
+        <translation>Version 9.8.0</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/resources/LightApp_msg_fr.ts b/resources/LightApp_msg_fr.ts
index bb00caca3e3fb25ad4e439b2b022fcdb839ecc7d..24eb7117ab3c3426b66aa0822a9a75023b00d31d 100644 (file)
--- a/resources/LightApp_msg_fr.ts
+++ b/resources/LightApp_msg_fr.ts
@@ -20,7 +20,7 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
     </message>
     <message>
         <source>APP_VERSION</source>
-        <translation>9.7.0</translation>
+        <translation>9.8.0</translation>
     </message>
     <message>
         <source>ABOUT_LICENSE</source>
@@ -28,7 +28,7 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
     </message>
     <message>
         <source>ABOUT_VERSION</source>
-        <translation>Version 9.7.0</translation>
+        <translation>Version 9.8.0</translation>
     </message>
     <message>
         <source>ABOUT_TITLE</source>

diff --git a/resources/LightApp_msg_ja.ts b/resources/LightApp_msg_ja.ts
index e9d99d14b50318d2d4ba2024921c5f641649a91a..3d8ca35c4d88d76a522be3fbcf64a9baf1141a61 100644 (file)
--- a/resources/LightApp_msg_ja.ts
+++ b/resources/LightApp_msg_ja.ts
@@ -20,7 +20,7 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
     </message>
     <message>
       <source>APP_VERSION</source>
-      <translation>9.7.0</translation>
+      <translation>9.8.0</translation>
     </message>
     <message>
       <source>ABOUT_LICENSE</source>
@@ -28,7 +28,7 @@ CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translatio
     </message>
     <message>
       <source>ABOUT_VERSION</source>
-      <translation>Version 9.7.0</translation>
+      <translation>Version 9.8.0</translation>
     </message>
     <message>
       <source>ABOUT_TITLE</source>