From c39fee26b9c3fe12f2b207d241af4165a13d2f49 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 1 Apr 2013 13:27:10 +0000 Subject: [PATCH] Merge from V6_main 01/04/2013 --- GHS3DPLUGIN_version.h.in | 2 +- Makefile.am | 2 +- adm_local/Makefile.am | 2 +- adm_local/unix/Makefile.am | 2 +- adm_local/unix/config_files/Makefile.am | 2 +- adm_local/unix/config_files/check_GHS3D.m4 | 2 +- adm_local/unix/config_files/check_GHS3DPLUGIN.m4 | 2 +- adm_local/unix/config_files/check_MESHGEMS_TETRA.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/GHS3DPLUGIN/CMakeLists.txt | 2 +- doc/salome/gui/GHS3DPLUGIN/Makefile.am | 2 +- doc/salome/gui/GHS3DPLUGIN/doxyfile.in | 2 +- doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in | 2 +- doc/salome/gui/GHS3DPLUGIN/static/footer.html | 4 +--- doc/salome/gui/Makefile.am | 2 +- idl/GHS3DPlugin_Algorithm.idl | 2 +- idl/Makefile.am | 2 +- resources/GHS3DPlugin.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml | 2 +- src/GHS3DPlugin/GHS3DPluginDC.py | 2 +- src/GHS3DPlugin/GHS3DPlugin_Defs.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.cxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_i.cxx | 2 +- src/GHS3DPlugin/Makefile.am | 2 +- src/GUI/GHS3DPluginGUI.cxx | 2 +- src/GUI/GHS3DPluginGUI_Enums.h | 2 +- src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx | 2 +- src/GUI/GHS3DPluginGUI_HypothesisCreator.h | 2 +- src/GUI/Makefile.am | 2 +- src/Makefile.am | 2 +- 46 files changed, 53 insertions(+), 49 deletions(-) diff --git a/GHS3DPLUGIN_version.h.in b/GHS3DPLUGIN_version.h.in index 7d4806c..ee16262 100644 --- a/GHS3DPLUGIN_version.h.in +++ b/GHS3DPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2004-2012 CEA/DEN, EDF R&D +// Copyright (C) 2004-2013 CEA/DEN, EDF R&D // // 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/Makefile.am b/Makefile.am index afc6dd9..908b6a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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/Makefile.am b/adm_local/Makefile.am index 249f903..8d04224 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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 cd2cfe6..266588a 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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 6d25f43..5d652ee 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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_GHS3D.m4 b/adm_local/unix/config_files/check_GHS3D.m4 index cec27b7..9224772 100644 --- a/adm_local/unix/config_files/check_GHS3D.m4 +++ b/adm_local/unix/config_files/check_GHS3D.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2004-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2004-2013 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 index 25f56bd..dbee352 100755 --- a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 +++ b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2004-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2004-2013 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 b/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 index ab354e0..2c71b9b 100644 --- a/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 +++ b/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2004-2012 CEA/DEN, EDF R&D +dnl Copyright (C) 2004-2013 CEA/DEN, EDF R&D dnl dnl This library is free software; you can redistribute it and/or dnl modify it under the terms of the GNU Lesser General Public diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 694041f..df66ed8 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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 75e88d0..6b83108 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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 57364c4..c7e12a4 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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 d702932..dab81a7 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2004-2012 CEA/DEN, EDF R&D +@REM Copyright (C) 2004-2013 CEA/DEN, EDF R&D @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 33e1049..ef04e8c 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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/clean_configure b/clean_configure index 891edb9..77553c6 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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 752f3ff..6708ddb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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 2599845..a85cfff 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 15038d3..9fd2b2d 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/GHS3DPLUGIN/CMakeLists.txt b/doc/salome/gui/GHS3DPLUGIN/CMakeLists.txt index 10e133d..35d31cc 100755 --- a/doc/salome/gui/GHS3DPLUGIN/CMakeLists.txt +++ b/doc/salome/gui/GHS3DPLUGIN/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/GHS3DPLUGIN/Makefile.am b/doc/salome/gui/GHS3DPLUGIN/Makefile.am index 8d25b01..6cc9cbf 100755 --- a/doc/salome/gui/GHS3DPLUGIN/Makefile.am +++ b/doc/salome/gui/GHS3DPLUGIN/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/GHS3DPLUGIN/doxyfile.in b/doc/salome/gui/GHS3DPLUGIN/doxyfile.in index 7af64c9..cbb8f6a 100755 --- a/doc/salome/gui/GHS3DPLUGIN/doxyfile.in +++ b/doc/salome/gui/GHS3DPLUGIN/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 # # 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/GHS3DPLUGIN/doxyfile_py.in b/doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in index 84c92fa..9a63aa6 100755 --- a/doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/GHS3DPLUGIN/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 # # 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/GHS3DPLUGIN/static/footer.html b/doc/salome/gui/GHS3DPLUGIN/static/footer.html index 4c89a2b..f89cfbb 100755 --- a/doc/salome/gui/GHS3DPLUGIN/static/footer.html +++ b/doc/salome/gui/GHS3DPLUGIN/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/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index ddbdb9e..20a9044 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/idl/GHS3DPlugin_Algorithm.idl b/idl/GHS3DPlugin_Algorithm.idl index f930af5..af17c87 100644 --- a/idl/GHS3DPlugin_Algorithm.idl +++ b/idl/GHS3DPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2004-2012 CEA/DEN, EDF R&D +// Copyright (C) 2004-2013 CEA/DEN, EDF R&D // // 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/Makefile.am b/idl/Makefile.am index e675d27..723911d 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2012 CEA/DEN, EDF R&D +# Copyright (C) 2004-2013 CEA/DEN, EDF R&D # # 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/GHS3DPlugin.xml b/resources/GHS3DPlugin.xml index b0cebaa..fcea00f 100644 --- a/resources/GHS3DPlugin.xml +++ b/resources/GHS3DPlugin.xml @@ -1,7 +1,7 @@