Merge from V7_3_BR branch 18/12/2013

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2d436f25d23b4ab3dcb84f832da09c213f8a829..439402b2b6019be3a235196621f3a8d1d602243b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ PROJECT(SalomeDOCUMENTATION)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 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})

diff --git a/CMakeModules/SalomeMacros.cmake b/CMakeModules/SalomeMacros.cmake
index 7d2104e424854270855c4759ae54f8a5e78468ee..f79dbcf526898a47c762a4f11d3d23f87306d168 100755 (executable)
--- a/CMakeModules/SalomeMacros.cmake
+++ b/CMakeModules/SalomeMacros.cmake
@@ -801,32 +801,56 @@ ENDMACRO(SALOME_GENERATE_ENVIRONMENT_SCRIPT)
 # and puts this variable into <output> argument.
 #
 MACRO(SALOME_GENERATE_TESTS_ENVIRONMENT output)
-  SET(_env)
-  SET(_WIN_LD_LIBRARY OFF)
-  FOREACH(_item ${_${PROJECT_NAME}_EXTRA_ENV})
-    IF(${_item} STREQUAL "LD_LIBRARY_PATH")
-      SET(_WIN_LD_LIBRARY ON)
-    ENDIF()
-    SET(_env_${_item})
-    FOREACH(_val ${_${PROJECT_NAME}_EXTRA_ENV_${_item}})
-      IF(WIN32)
-        SET(_env_${_item} "${_val};${_env_${_item}}")
-      ELSE()
-        SET(_env_${_item} "${_val}:${_env_${_item}}")
-      ENDIF()
-    ENDFOREACH()
-  ENDFOREACH()
+ SET(_env)
+ SET(_WIN_LD_LIBRARY OFF)
+ FOREACH(_item ${_${PROJECT_NAME}_EXTRA_ENV})
+   IF(${_item} STREQUAL "LD_LIBRARY_PATH")
+     SET(_WIN_LD_LIBRARY ON)
+   ENDIF()
+   SET(_env_${_item})
+   FOREACH(_val ${_${PROJECT_NAME}_EXTRA_ENV_${_item}})
+     IF(WIN32)
+       STRING(REPLACE "/" "\\" _val "${_val}")
+       SET(_env_${_item} "${_val};${_env_${_item}}")
+     ELSE()
+       SET(_env_${_item} "${_val}:${_env_${_item}}")
+     ENDIF()
+   ENDFOREACH()
+ ENDFOREACH()
+
+ IF(_WIN_LD_LIBRARY AND WIN32)
+   SET(_env_PATH "${_env_PATH}$ENV{LD_LIBRARY_PATH};${_env_LD_LIBRARY_PATH}")
+ ENDIF()
+
+ IF(WIN32)
+   SET(sep ",")
+ ELSE()
+   SET(sep ";")
+ ENDIF()
+ 
+ FOREACH(_item ${_${PROJECT_NAME}_EXTRA_ENV})
+   IF(WIN32)
+     IF(NOT ${_item} STREQUAL "LD_LIBRARY_PATH")
+       SET(_env "${_item}=$ENV{${_item}};${_env_${_item}}${sep}${_env}")
+     ENDIF()
+   ELSE()
+     SET(_env "${_item}=$ENV{${_item}}:${_env_${_item}}${sep}${_env}")
+   ENDIF()
+ ENDFOREACH()
+
+ # Get module name as substring of "Salome<ModuleName>"
+ STRING(SUBSTRING "${PROJECT_NAME}" 6 -1 PRNAME) 
+ SET(_env "${PRNAME}_ROOT_DIR=${CMAKE_INSTALL_PREFIX}${sep}${_env}")
+  
+ # Creating follow string for Windows environement:
+ # "VAR1_ENV=1\;2\;3\;...\;...\;...;VAR2_ENV=1\;2\;3\;...\;...\;...;VAR3_ENV=1\;2\;3\;...\;...\;...;..."
+ IF(WIN32)
+   STRING(REGEX REPLACE "\\\\*;" "\\\\;" _env "${_env}")
+   STRING(REGEX REPLACE "\\\\*;*," ";" _env "${_env}")
+ ENDIF()
 
-  IF(_WIN_LD_LIBRARY AND WIN32)
-    SET(_env_PATH "${_env_PATH} ${_env_LD_LIBRARY_PATH}")
-  ENDIF()
+ SET(${output} "${_env}")
 
-  FOREACH(_item ${_${PROJECT_NAME}_EXTRA_ENV})
-    IF(NOT(WIN32 AND ${_item} STREQUAL "LD_LIBRARY_PATH"))
-      SET(_env "${_item}=${_env_${_item}} ${_env}")
-    ENDIF()
-  ENDFOREACH()
-  SET(${output} ${_env})  
 ENDMACRO(SALOME_GENERATE_TESTS_ENVIRONMENT) 
 
 #########################################################################

diff --git a/HEXABLOCK_index.html b/HEXABLOCK_index.html
index 8d7084da9829cc77c9efee8156a2704bff111902..7bf3806caa7345be51fc7d0e094aed4bafa4a907 100755 (executable)
--- a/HEXABLOCK_index.html
+++ b/HEXABLOCK_index.html
@@ -15,6 +15,9 @@
 <p><img src="about.png" alt="about.png"></p>
 <br><br>
 <big><a href="gui/HEXABLOCK/index.html">User's Guide</a></big>
+<!--<br><br>
+<big><a href="tui/HEXABLOCK/index.html">Developer Documentation</a></big>-->
+<br><br>
 </div>
 <br><br><br><br><br><br><br>
 <div style="text-align: center; background-color: #D9f4fd; border: 1px solid #AAAAAA; font-family: Arial, Helvetica, sans-serif; font-size: 11px; padding: 10px; margin-top: 15px;">

diff --git a/HOMARD_index.html b/HOMARD_index.html
index bf218bb82ee247f1912fa434361a53f62e889022..3c6b3657d5c736380b06b3bd1f7e415cc043694b 100755 (executable)
--- a/HOMARD_index.html
+++ b/HOMARD_index.html
@@ -14,7 +14,10 @@
 <div align="center">       
 <p><img src="about.png" alt="about.png"></p>
 <br><br>
-<big><a href="gui/HOMARD/index.html">User's Guide (French version)</a></big>
+<big><a href="gui/HOMARD/fr/index.html">Users Guide (French version)</a></big>
+<br><br>
+<big><a href="gui/HOMARD/en/index.html">Users Guide (English version)</a></big>
+<br><br>
 </div>
 <br><br><br><br><br><br><br>
 <div style="text-align: center; background-color: #D9f4fd; border: 1px solid #AAAAAA; font-family: Arial, Helvetica, sans-serif; font-size: 11px; padding: 10px; margin-top: 15px;">

diff --git a/JOBMANAGER_index.html b/JOBMANAGER_index.html
index 8901939e7d225f21de73b1f24ee5a2bbf6f4f224..54033721d79cc341a792fb2ba4b51e5fcdc68100 100755 (executable)
--- a/JOBMANAGER_index.html
+++ b/JOBMANAGER_index.html
@@ -15,6 +15,8 @@
 <p><img src="about.png" alt="about.png"></p>
 <br><br>
 <big><a href="gui/JOBMANAGER/index.html">User's Guide</a></big>
+<!--<br><br>
+<big><a href="tui/JOBMANAGER/index.html">Developer Documentation</a></big>-->
 </div>
 <br><br><br><br><br><br><br>
 <div style="text-align: center; background-color: #D9f4fd; border: 1px solid #AAAAAA; font-family: Arial, Helvetica, sans-serif; font-size: 11px; padding: 10px; margin-top: 15px;">

diff --git a/MED_index.html b/MED_index.html
index 1d5b6c99e418145bc5c4a8325b8e2c83161e47fa..1644e87e65438876cbfcc8dff60cfaed72e3e94d 100755 (executable)
--- a/MED_index.html
+++ b/MED_index.html
@@ -18,8 +18,6 @@
 <br><br>
 <big><a href="tui/MED/index.html">Developer Documentation</a></big>
 <br><br>
-<big><a href="dev/MED/index.html">Additional Developer Documentation (French version)</a></big>
-<br><br>
 </div>
 </div>
 <br><br><br><br><br><br><br><br><br>

diff --git a/PARAVIS_index.html b/PARAVIS_index.html
new file mode 100755 (executable)
index 0000000..56cd226
--- /dev/null
+++ b/PARAVIS_index.html
@@ -0,0 +1,30 @@
+<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en"><html><head>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+  <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]"><title>Post-Pro Module Documentation</title></head>
+<body bgcolor="#ffffff" text="#000000" link="#0000ee" alink="#0000ee" vlink="#551a8b">
+
+<div style="text-align: left; background-color: #175783; border: 1px solid; height: 80px; background-repeat: no-repeat; margin-bottom: 10px;">
+      <img src="head.png" border=0>
+</div>
+
+<div align="center">    
+<h1>PARAVIS Module Documentation</h1>
+</div>
+
+<div align="center">       
+<p><img src="about.png" alt="about.png"></p>
+<br><br>
+<big><a href="gui/PARAVIS/index.html">User's Guide</a></big>
+<br><br>
+<big><a href="tui/PARAVIS/index.html">Developer Documentation</a></big>
+</div>
+<br><br><br><br><br><br><br>
+<div style="text-align: center; background-color: #D9f4fd; border: 1px solid #AAAAAA; font-family: Arial, Helvetica, sans-serif; font-size: 11px; padding: 10px; margin-top: 15px;">
+Copyright &copy; 2007-2013  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
+Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
+</div>
+
+</body>
+</html>
+
+

diff --git a/index.html b/index.html
index 36a3e6ed7e7f8fc483a4dae70b136a831b6074cf..e8cac78d34c59721b8b1601a24c640173a7c9a94 100755 (executable)
--- a/index.html
+++ b/index.html
@@ -122,7 +122,7 @@
         <li><a href="GEOM_index.html">Geometry</a></li>
         <li><a href="SMESH_index.html">Mesh</a></li>
         <li><a href="MED_index.html">MED</a></li>
-        <li><a href="VISU_index.html">Post-Pro</a></li>
+<!--        <li><a href="PARAVIS_index.html">PARAVIS</a></li> -->
         <li><a href="YACS_index.html">YACS</a></li>
         <li><a href="JOBMANAGER_index.html">JobManager</a></li>
         <li><a href="HEXABLOCK_index.html">HexaBlock</a></li>