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

diff --git a/CMakeCommon/SalomeMacros.cmake b/CMakeCommon/SalomeMacros.cmake
index 970f7c1047deb6e8d8f0a3f7f409ce0eed4c2559..686c8a08b52837b2931f66fecbfd37881fe0e258 100644 (file)
--- a/CMakeCommon/SalomeMacros.cmake
+++ b/CMakeCommon/SalomeMacros.cmake
@@ -965,9 +965,13 @@ ENDMACRO(SALOME_CONFIGURE_PREPARE)
 #\r
 MACRO(SALOME_EXTRACT_VERSION version_string major minor patch)\r
   IF(${version_string} MATCHES "[0-9]+[^0-9]*\\.[0-9]+[^0-9]*\\.[0-9]+[^0-9]*")\r
-    STRING(REGEX REPLACE "^([0-9]+)[^0-9]*\\.[0-9]+[^0-9]*\\.[0-9]+[^0-9]*" "\\1" ${major} "${version_string}")\r
-    STRING(REGEX REPLACE "^[0-9]+[^0-9]*\\.([0-9]+)[^0-9]*\\.[0-9]+[^0-9]*" "\\1" ${minor} "${version_string}")\r
-    STRING(REGEX REPLACE "^[0-9]+[^0-9]*\\.[0-9]+[^0-9]*\\.([0-9]+)[^0-9]*" "\\1" ${patch} "${version_string}")\r
+    STRING(REGEX REPLACE "^([0-9]+)[^0-9]*\\.[0-9]+[^0-9]*\\.[0-9]+[^0-9]*" "\\1" major "${version_string}")\r
+    STRING(REGEX REPLACE "^[0-9]+[^0-9]*\\.([0-9]+)[^0-9]*\\.[0-9]+[^0-9]*" "\\1" minor "${version_string}")\r
+    STRING(REGEX REPLACE "^[0-9]+[^0-9]*\\.[0-9]+[^0-9]*\\.([0-9]+)[^0-9]*" "\\1" patch "${version_string}")\r
+  ELSEIF(${version_string} MATCHES "[0-9]+[^0-9]*\\.[0-9]+[^0-9]*")\r
+    STRING(REGEX REPLACE "^([0-9]+)[^0-9]*\\.[0-9]+[^0-9]*" "\\1" major "${version_string}")\r
+    STRING(REGEX REPLACE "^[0-9]+[^0-9]*\\.([0-9]+)[^0-9]*" "\\1" minor "${version_string}")\r
+    SET(PATCH "0")\r
   ELSE()\r
     MESSAGE("MACRO(SALOME_EXTRACT_VERSION ${version_string} ${major} ${minor} ${patch}")\r
     MESSAGE(FATAL_ERROR "Problem parsing version string, I can't parse it properly.")\r

diff --git a/env.sh b/env.sh
index a1de6f2e2b369b0e92874ec372cb6b0d6744a688..8e5b910c077ba1dce987dd82e9618c1dc87329f5 100644 (file)
--- a/env.sh
+++ b/env.sh
@@ -11,7 +11,7 @@ export AUT_DIR=$(pwd)
 export TOOLS_DIR=$(pwd)
 
 export HOME_OLD=$HOME
-source /dn46/SALOME/series8x/current-2018-05-30/start.sh
+source /dn46/SALOME/series9x/current-2018-08-17/start.sh
 export HOME=$HOME_OLD
 
 # Path to solvespace-2