From fbceed67d3744002f1e438129b3b3183dd6ac861 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:28:55 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- Makefile.am | 2 +- NETGENPLUGIN_version.h.in | 2 +- adm_local/Makefile.am | 2 +- adm_local/cmake_files/FindNETGEN.cmake | 2 +- adm_local/unix/Makefile.am | 2 +- adm_local/unix/config_files/Makefile.am | 2 +- adm_local/unix/config_files/check_NETGEN.m4 | 2 +- adm_local/unix/config_files/check_NETGENPLUGIN.m4 | 2 +- adm_local/unix/make_common_starter.am | 10 ++++++++-- bin/Makefile.am | 2 +- build_cmake | 2 +- build_cmake.bat | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 2 +- doc/Makefile.am | 2 +- doc/salome/Makefile.am | 2 +- doc/salome/gui/Makefile.am | 2 +- doc/salome/gui/NETGENPLUGIN/CMakeLists.txt | 2 +- doc/salome/gui/NETGENPLUGIN/Makefile.am | 2 +- doc/salome/gui/NETGENPLUGIN/doxyfile.in | 2 +- doc/salome/gui/NETGENPLUGIN/doxyfile_py.in | 2 +- doc/salome/gui/NETGENPLUGIN/static/footer.html | 4 +--- idl/Makefile.am | 2 +- idl/NETGENPlugin_Algorithm.idl | 2 +- resources/Makefile.am | 2 +- resources/NETGENPlugin.xml | 2 +- resources/SalomeApp.xml | 2 +- src/GUI/Makefile.am | 2 +- src/GUI/NETGENPluginGUI.cxx | 2 +- src/GUI/NETGENPluginGUI.h | 2 +- src/GUI/NETGENPluginGUI_HypothesisCreator.cxx | 2 +- src/GUI/NETGENPluginGUI_HypothesisCreator.h | 2 +- src/GUI/NETGENPluginGUI_SimpleCreator.cxx | 2 +- src/GUI/NETGENPluginGUI_SimpleCreator.h | 2 +- src/Makefile.am | 2 +- src/NETGENPlugin/Makefile.am | 2 +- src/NETGENPlugin/NETGENPluginDC.py | 2 +- src/NETGENPlugin/NETGENPlugin_Defs.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_ONLY_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_3D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_Mesher.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_Mesher.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx | 2 +- .../NETGENPlugin_SimpleHypothesis_2D_i.cxx | 2 +- .../NETGENPlugin_SimpleHypothesis_2D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx | 2 +- src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx | 2 +- .../NETGENPlugin_SimpleHypothesis_3D_i.cxx | 2 +- .../NETGENPlugin_SimpleHypothesis_3D_i.hxx | 2 +- src/NETGENPlugin/NETGENPlugin_i.cxx | 2 +- 78 files changed, 85 insertions(+), 81 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6c9e9d1..e789c7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/NETGENPLUGIN_version.h.in b/NETGENPLUGIN_version.h.in index d90a928..9c02a35 100644 --- a/NETGENPLUGIN_version.h.in +++ b/NETGENPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 9863d29..a8acbbd 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/adm_local/cmake_files/FindNETGEN.cmake b/adm_local/cmake_files/FindNETGEN.cmake index c64662d..05e49a8 100644 --- a/adm_local/cmake_files/FindNETGEN.cmake +++ b/adm_local/cmake_files/FindNETGEN.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 0d5ee76..c68bae1 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 77cb591..d6a9e13 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/adm_local/unix/config_files/check_NETGEN.m4 b/adm_local/unix/config_files/check_NETGEN.m4 index 9358e49..5cee3c2 100644 --- a/adm_local/unix/config_files/check_NETGEN.m4 +++ b/adm_local/unix/config_files/check_NETGEN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE dnl dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/adm_local/unix/config_files/check_NETGENPLUGIN.m4 b/adm_local/unix/config_files/check_NETGENPLUGIN.m4 index 6d94051..2b1231c 100644 --- a/adm_local/unix/config_files/check_NETGENPLUGIN.m4 +++ b/adm_local/unix/config_files/check_NETGENPLUGIN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE dnl dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 4f70a70..782d75c 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 @@ -58,6 +58,11 @@ docdir = $(datadir)/doc/salome # common rules +# ============================================================ +# Cmake files wildcard (to add then to the distribution) +# ============================================================ +CMAKEFILES = $(notdir $(wildcard $(srcdir)/CMakeLists.txt)) + # meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ @@ -76,7 +81,8 @@ ui_%.h: %.ui # extra distributed files EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ - $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) + $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) \ + $(CMAKEFILES) # customize clean operation mostlyclean-local: diff --git a/bin/Makefile.am b/bin/Makefile.am index d636593..5e7c6db 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/build_cmake b/build_cmake index da5f9fb..bc7c698 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/build_cmake.bat b/build_cmake.bat index 7561ac2..27fc2a6 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +@REM Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE @REM @REM This library is free software; you can redistribute it and/or @REM modify it under the terms of the GNU Lesser General Public diff --git a/build_configure b/build_configure index e7120c7..bf2d2c4 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/clean_configure b/clean_configure index 1f4c3ce..2a63bf2 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/configure.ac b/configure.ac index b2a789d..ef3cdad 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/doc/Makefile.am b/doc/Makefile.am index 570ccb2..40f4a8a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 9ded0be..dc7adde 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 7a41bf6..6f06d86 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/doc/salome/gui/NETGENPLUGIN/CMakeLists.txt b/doc/salome/gui/NETGENPLUGIN/CMakeLists.txt index 868561c..18789a4 100755 --- a/doc/salome/gui/NETGENPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/NETGENPLUGIN/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2013 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 diff --git a/doc/salome/gui/NETGENPLUGIN/Makefile.am b/doc/salome/gui/NETGENPLUGIN/Makefile.am index 2b360e8..84ee7cd 100755 --- a/doc/salome/gui/NETGENPLUGIN/Makefile.am +++ b/doc/salome/gui/NETGENPLUGIN/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/doc/salome/gui/NETGENPLUGIN/doxyfile.in b/doc/salome/gui/NETGENPLUGIN/doxyfile.in index 510aa76..75fd0d0 100755 --- a/doc/salome/gui/NETGENPLUGIN/doxyfile.in +++ b/doc/salome/gui/NETGENPLUGIN/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/NETGENPLUGIN/doxyfile_py.in b/doc/salome/gui/NETGENPLUGIN/doxyfile_py.in index 4863fbd..799e701 100755 --- a/doc/salome/gui/NETGENPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/NETGENPLUGIN/doxyfile_py.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/NETGENPLUGIN/static/footer.html b/doc/salome/gui/NETGENPLUGIN/static/footer.html index 4c89a2b..f89cfbb 100755 --- a/doc/salome/gui/NETGENPLUGIN/static/footer.html +++ b/doc/salome/gui/NETGENPLUGIN/static/footer.html @@ -3,10 +3,8 @@
- Copyright © 2007-2012 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
+ Copyright © 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
- \ No newline at end of file diff --git a/idl/Makefile.am b/idl/Makefile.am index da889b2..4d89060 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/idl/NETGENPlugin_Algorithm.idl b/idl/NETGENPlugin_Algorithm.idl index 1dd6fc0..05fab2a 100644 --- a/idl/NETGENPlugin_Algorithm.idl +++ b/idl/NETGENPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/resources/Makefile.am b/resources/Makefile.am index dfcdf8f..2a32669 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2013 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 diff --git a/resources/NETGENPlugin.xml b/resources/NETGENPlugin.xml index 143af70..cdb581f 100644 --- a/resources/NETGENPlugin.xml +++ b/resources/NETGENPlugin.xml @@ -1,7 +1,7 @@