From 4ecbeac48745db28b4be1ce54b2fd7a28884184e Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 5 Jun 2012 12:40:43 +0000 Subject: [PATCH] Merge from V6_5_BR 05/06/2012 --- ATOMIC_version.h.in | 2 +- INSTALL | 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_ATOMIC.m4 | 2 +- adm_local/unix/make_common_starter.am | 2 +- bin/Makefile.am | 2 +- build_configure | 2 +- clean_configure | 11 +++++------ configure.ac | 4 ++-- resources/LightApp.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml.in | 2 +- src/ATOMICGUI/ATOMICGUI.cxx | 2 +- src/ATOMICGUI/ATOMICGUI.h | 2 +- src/ATOMICGUI/ATOMICGUI_AddAtomDlg.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_AddAtomDlg.h | 2 +- src/ATOMICGUI/ATOMICGUI_AddAtomOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_AddAtomOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_CreateMolOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_CreateMolOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_Data.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_Data.h | 2 +- src/ATOMICGUI/ATOMICGUI_DataModel.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_DataModel.h | 2 +- src/ATOMICGUI/ATOMICGUI_DataObject.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_DataObject.h | 2 +- src/ATOMICGUI/ATOMICGUI_DeleteOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_DeleteOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_ImportExportOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_ImportExportOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_Operation.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_Operation.h | 2 +- src/ATOMICGUI/ATOMICGUI_RenameOp.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_RenameOp.h | 2 +- src/ATOMICGUI/ATOMICGUI_Selection.cxx | 2 +- src/ATOMICGUI/ATOMICGUI_Selection.h | 2 +- src/ATOMICGUI/Makefile.am | 2 +- src/AtomicPy/AtomicPy.cxx | 5 +---- src/AtomicPy/AtomicPy.h | 5 +---- src/AtomicPy/AtomicPy.sip | 5 +---- src/AtomicPy/Makefile.am | 5 +---- src/Makefile.am | 2 +- 45 files changed, 50 insertions(+), 63 deletions(-) diff --git a/ATOMIC_version.h.in b/ATOMIC_version.h.in index 7af3c77..8d06c29 100644 --- a/ATOMIC_version.h.in +++ b/ATOMIC_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 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/INSTALL b/INSTALL index 6037186..78f3b9b 100755 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -This is the version 0.3.0 of ATOMIC (sample no-corba-engine) SALOME module +This is ATOMIC (sample no-corba-engine) SALOME module diff --git a/Makefile.am b/Makefile.am index fe0addf..9feda47 100755 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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/Makefile.am b/adm_local/Makefile.am index c015d4a..9863d29 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 8451478..0d5ee76 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 2be057c..86b933e 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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_ATOMIC.m4 b/adm_local/unix/config_files/check_ATOMIC.m4 index 38e215a..f4c21be 100755 --- a/adm_local/unix/config_files/check_ATOMIC.m4 +++ b/adm_local/unix/config_files/check_ATOMIC.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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/make_common_starter.am b/adm_local/unix/make_common_starter.am index bda4e12..2f9a5ee 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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/bin/Makefile.am b/bin/Makefile.am index abc5114..64ec0dd 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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_configure b/build_configure index 55f5813..0e268e1 100755 --- a/build_configure +++ b/build_configure @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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/clean_configure b/clean_configure index d1c90db..1decc20 100755 --- a/clean_configure +++ b/clean_configure @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 @@ -22,9 +22,8 @@ rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; +find . -name Makefile.in | xargs rm -f +( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile ) + + -find adm_local -name Makefile.in | xargs rm -f -find bin -name Makefile.in | xargs rm -f -find resources -name Makefile.in | xargs rm -f -find src -name Makefile.in | xargs rm -f -rm -f Makefile.in diff --git a/configure.ac b/configure.ac index 652b2fc..ba01a22 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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 @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -AC_INIT([Salome2 Project ATOMIC module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeATOMIC]) +AC_INIT([Salome2 Project ATOMIC module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeATOMIC]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/resources/LightApp.xml b/resources/LightApp.xml index 7e5442d..4e37e3a 100644 --- a/resources/LightApp.xml +++ b/resources/LightApp.xml @@ -1,6 +1,6 @@