X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_adm%2Fcmake_files%2Fdeprecated%2Fam2cmake.py;h=9b00f75299b3260d9591facc84a6f1b1c4d60f63;hb=2e44426f61da038fedaa98b8c48e82d1dfcca29f;hp=7df4b970bf642cb60a7b86f7d7340917d017aea8;hpb=1bd23e1d8c2a072cb06068b14257f9ce96309e0a;p=modules%2Fkernel.git diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py index 7df4b970b..9b00f7529 100644 --- a/salome_adm/cmake_files/deprecated/am2cmake.py +++ b/salome_adm/cmake_files/deprecated/am2cmake.py @@ -1,10 +1,10 @@ # -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation; either -# version 2.1 of the License. +# version 2.1 of the License, or (at your option) any later version. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -33,7 +33,7 @@ p_multiline = re.compile(r""" p_dollar = re.compile(r""" \$\( # a $ then a ( (?P # open the group val -[^)]* # the group contain 0 or more non ) characters +[^()]* # the group contain 0 or more non ) characters ) # close the group \) # a ) at the end """, re.VERBOSE) @@ -550,6 +550,7 @@ class CMakeFile(object): INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindSWIG.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCPPUNIT.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindDOXYGEN.cmake) + INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSalomeLIBBATCH.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindKERNEL.cmake) """) @@ -594,9 +595,11 @@ class CMakeFile(object): newlines.append(""" SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR}) SET(MED_ROOT_DIR $ENV{MED_ROOT_DIR}) + INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindQWT.cmake) INCLUDE(${GEOM_ROOT_DIR}/adm_local/cmake_files/FindGEOM.cmake) - INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMEDFILE.cmake) - INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindMED.cmake) + INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) + + INCLUDE(${MED_ROOT_DIR}/adm_local/cmake_files/FindSalomeMED.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSPHINX.cmake) """) pass @@ -660,6 +663,10 @@ class CMakeFile(object): INCLUDE(${CMAKE_SOURCE_DIR}/adm/cmake/FindEXPAT.cmake) INCLUDE(${CMAKE_SOURCE_DIR}/adm/cmake/FindGRAPHVIZ.cmake) INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSPHINX.cmake) + + SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -D_SECURE_SCL=0) + SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -D_SECURE_SCL_THROWS=0) + SET(PLATFORM_CPPFLAGS ${PLATFORM_CPPFLAGS} -D_HAS_ITERATOR_DEBUGGING=0) # To avoid runtime error during checking iterators """) pass if self.module == "jobmanager": @@ -809,10 +816,10 @@ class CMakeFile(object): pass # -- newlines.append(""" - set(VERSION 7.1.0) - set(SHORT_VERSION 7.1) - set(XVERSION 0x070100) - set(VERSION_DEV 1) + set(VERSION 7.6.0) + set(SHORT_VERSION 7.6) + set(XVERSION 0x070600) + set(VERSION_DEV 0) """) pass # -- @@ -980,7 +987,13 @@ class CMakeFile(object): # Replace the $(TOTO) by ${TOTO} # Replace the @TOTO@ by ${TOTO} # -- - line = p_dollar.sub(r"${\1}", line) + # VSR 15.04.2013 - process nesting substitutions properly, e.g. $(aaa$(bbb)) + #line = p_dollar.sub(r"${\1}", line) + m_dollar = p_dollar.search(line) + while m_dollar: + line = p_dollar.sub(r"${\1}", line) + m_dollar = p_dollar.search(line) + pass line = p_arobas.sub(r"${\1}", line) # -- @@ -1126,7 +1139,7 @@ class CMakeFile(object): ) ''') self.files.append("static/header.html.in") - elif self.root[-len(mod):] == upmod and operator.contains(self.root, 'doc') or mod in ['kernel', 'gui', 'geom', 'med', 'smesh', 'visu', 'blsurfplugin'] and self.root[-len('tui'):] == 'tui' or operator.contains(self.root, 'doc') and mod in ['pyhello']: + elif self.root[-len(mod):] == upmod and operator.contains(self.root, 'doc') or mod in ['kernel', 'gui', 'geom', 'med', 'smesh', 'visu', 'blsurfplugin'] and self.root[-len('tui'):] == 'tui' or operator.contains(self.root, 'doc') and mod in ['pyhello', 'yacs']: newlines.append(r''' SET(top_builddir ${CMAKE_BINARY_DIR} @@ -1147,7 +1160,9 @@ class CMakeFile(object): ${datadir}/doc/salome ) ''') - if mod not in ['blsurfplugin']: + if mod in ['yacs']: + self.files.append("sources/header.html.in") + else: self.files.append("static/header.html.in") if mod in ['geom', 'smesh', 'visu','netgenplugin','blsurfplugin','hexoticplugin','ghs3dplugin',"ghs3dprlplugin"] and self.root[-len(mod):] == upmod: self.files.append("static/header_py.html.in") @@ -1159,13 +1174,6 @@ class CMakeFile(object): self.files.append("resources/SalomeApp.xml.in") pass pass - from os import path - if operator.contains(self.root, 'YACS_SRC'+path.sep+'doc'): - newlines.append(r''' - SET(srcdir - ${CMAKE_CURRENT_SOURCE_DIR} - ) - ''') if self.module == "jobmanager": key = "salomegui" @@ -1175,8 +1183,6 @@ class CMakeFile(object): pass for f in self.files: if f[-3:] == ".in": - if self.module == 'yacs' and f == "Doxyfile.in": - continue if f == "sstream.in": continue if f in ["runContainer.in", "stopContainer.in"]: @@ -1250,16 +1256,23 @@ class CMakeFile(object): newlines.append(r"""ADD_DEPENDENCIES(usr_docs html_docs)""") else: config_f = "" + extra_doc_dir = "" if mod in ['netgenplugin','blsurfplugin','hexoticplugin','ghs3dplugin', "ghs3dprlplugin"] : config_f = "${DOXYGEN_EXECUTABLE} doxyfile_py" + extra_doc_dir = "%spy_doc"%(mod) elif mod not in ['pyhello']: config_f = "${DOXYGEN_EXECUTABLE} doxyfile_idl" + if mod == 'visu': + extra_doc_dir = "%sgen_doc"%(mod) + inst_head_command = "" + if extra_doc_dir != "": + inst_head_command = "; shutil.copy(r'''%s''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/%s/%s''')"%(head_source, upmod, extra_doc_dir) newlines.append("""\t ADD_CUSTOM_TARGET(usr_docs %s COMMAND ${DOXYGEN_EXECUTABLE} doxyfile - COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''',True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}''',r'''%s''', ignore=shutil.ignore_patterns(%s)); shutil.copy(r'''%s''',r'''%s''')" + COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''',True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}''',r'''%s''', ignore=shutil.ignore_patterns(%s)); shutil.copy(r'''%s''',r'''%s''')%s" VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - )"""%(config_f, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination)) + )"""%(config_f, doc_gui_destination, doc_gui_destination, ign, head_source, doc_gui_destination, inst_head_command)) elif mod in ['yacs', 'jobmanager'] and operator.contains(self.root, upmod + '_SRC'+path.sep+'doc'): from sys import platform params = ''; @@ -1300,7 +1313,7 @@ class CMakeFile(object): # -- upmod = self.module.upper() - if mod in ['kernel', 'gui', 'med', 'smesh', 'visu', 'blsurfplugin'] and self.root[-len('tui'):] == 'tui': + if ( mod in ['kernel', 'gui', 'med', 'smesh', 'visu', 'blsurfplugin'] and self.root[-len('tui'):] == 'tui' ) or ( mod in ['yacs'] and self.root[-len('doc'):] == 'doc' ): if mod == 'kernel': tmp = """\tADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE} -u COMMAND ${DOXYGEN_EXECUTABLE} @@ -1314,10 +1327,12 @@ class CMakeFile(object): tmp1= """\n COMMAND ${PYTHON_EXECUTABLE} -c "from shutil import copy; copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/smeshscreen.png''', r'''%s''')" """%(doc_tui_destination) else: tmp1="" - doc_source = "${CMAKE_CURRENT_BINARY_DIR}/%s"%(upmod) + if mod == 'yacs': + doc_source = "${CMAKE_CURRENT_BINARY_DIR}/htmldev" + else: + doc_source = "${CMAKE_CURRENT_BINARY_DIR}/%s"%(upmod) inst_head_command="" - if mod not in ['blsurfplugin']: - inst_head_command = "; shutil.copy(r'''%s''', r'''%s''')"%(head_source, doc_tui_destination) + inst_head_command = "; shutil.copy(r'''%s''', r'''%s''')"%(head_source, doc_tui_destination) newlines.append(tmp + """ COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''', True); shutil.copytree(r'''%s''', r'''%s''')%s" """%(doc_tui_destination, doc_source, doc_tui_destination, inst_head_command) + tmp1 + """ VERBATIM @@ -1334,11 +1349,11 @@ class CMakeFile(object): ENDIF(WINDOWS) ADD_CUSTOM_TARGET(dev_docs ${PYTHON_EXECUTABLE} ${f} ${CMAKE_SOURCE_DIR}/src/%s_SWIG/%s.py COMMAND ${DOXYGEN_EXECUTABLE} doxyfile - COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.remove(r'''${CMAKE_BINARY_DIR}/src/%s_SWIG/%s.py''')" + COMMAND ${PYTHON_EXECUTABLE} -c "import os; os.remove(r'''${CMAKE_CURRENT_BINARY_DIR}/%s.py''')" COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''%s''', True); shutil.copytree(r'''%s''', r'''%s'''); shutil.copy(r'''%s''', r'''%s'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/geomscreen.png''', r'''%s''')" VERBATIM WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - )"""%(prepare_generating_doc_src, prepare_generating_doc_src, upmod, tmp, upmod, tmp, doc_tui_destination, doc_source, doc_tui_destination, head_source, doc_tui_destination, doc_tui_destination)) + )"""%(prepare_generating_doc_src, prepare_generating_doc_src, upmod, tmp, tmp, doc_tui_destination, doc_source, doc_tui_destination, head_source, doc_tui_destination, doc_tui_destination)) # -- # convert the SUBDIRS in cmake grammar @@ -1765,7 +1780,7 @@ class CMakeFile(object): "sharedpkgpython_PYTHON" : "${salomepythondir}/shared_modules", "salomepypkg_PYTHON" : "${salomepypkgdir}", "mypkgpython_PYTHON" : "${mypkgpythondir}", - "stdpkgpython_PYTHON" : "${stdpkgpythondir}", + "stdpkgpython_PYTHON" : "${stdpkgpythondir}", "nodist_mypkgpython_PYTHON" : "${mypkgpythondir}", } if self.module == "jobmanager": @@ -1826,6 +1841,7 @@ class CMakeFile(object): ''') # -- newlines.append(r''' + STRING(REPLACE "-module" "" ${amname}_LDFLAGS "${${amname}_LDFLAGS}") SET(libs ${PLATFORM_LIBADD} ${PLATFORM_LDFLAGS} ${LDADD} ${${amname}_LIBADD} ${${amname}_LDADD} ${${amname}_LDFLAGS}) FOREACH(lib SALOMEBasics SalomeBatch) IF(name STREQUAL lib)