From: vsr Date: Wed, 18 Dec 2013 14:18:16 +0000 (+0000) Subject: Merge from V7_3_BR branch 18/12/2013 X-Git-Tag: V7_4_0a1~1^2~6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b0565f7f9949335a55b831cc7ad6751e53caf439;p=tools%2Fdocumentation.git Merge from V7_3_BR branch 18/12/2013 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a2d436f..439402b 100644 --- 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 7d2104e..f79dbcf 100755 --- a/CMakeModules/SalomeMacros.cmake +++ b/CMakeModules/SalomeMacros.cmake @@ -801,32 +801,56 @@ ENDMACRO(SALOME_GENERATE_ENVIRONMENT_SCRIPT) # and puts this variable into 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" + 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 8d7084d..7bf3806 100755 --- a/HEXABLOCK_index.html +++ b/HEXABLOCK_index.html @@ -15,6 +15,9 @@

User's Guide + +

diff --git a/HOMARD_index.html b/HOMARD_index.html index bf218bb..3c6b365 100755 --- a/HOMARD_index.html +++ b/HOMARD_index.html @@ -14,7 +14,10 @@

-User's Guide (French version) +Users Guide (French version) +

+Users Guide (English version) +

diff --git a/JOBMANAGER_index.html b/JOBMANAGER_index.html index 8901939..5403372 100755 --- a/JOBMANAGER_index.html +++ b/JOBMANAGER_index.html @@ -15,6 +15,8 @@

User's Guide +

diff --git a/MED_index.html b/MED_index.html index 1d5b6c9..1644e87 100755 --- a/MED_index.html +++ b/MED_index.html @@ -18,8 +18,6 @@

Developer Documentation

-Additional Developer Documentation (French version) -

diff --git a/PARAVIS_index.html b/PARAVIS_index.html new file mode 100755 index 0000000..56cd226 --- /dev/null +++ b/PARAVIS_index.html @@ -0,0 +1,30 @@ + + + Post-Pro Module Documentation + + +

+ +

PARAVIS Module Documentation

+ +

+

+User's Guide +

+Developer Documentation +

+

+

+Copyright © 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+

+ + + + + diff --git a/index.html b/index.html index 36a3e6e..e8cac78 100755 --- a/index.html +++ b/index.html @@ -122,7 +122,7 @@