Merge from V6_5_BR 05/06/2012

diff --git a/Makefile.am b/Makefile.am
index 4a309b58fc3cd3809fc2c9f6e52c4d0484c18c7a..dcf47d06742ff01f9ca816fd7f1e40ce028d0f41 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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/SIERPINSKY_version.h.in b/SIERPINSKY_version.h.in
index 8f3bda536597e83b2af2ff15c1a45f33d087b3e4..eb333e39685533f225956d9365319e08889fdd3e 100644 (file)
--- a/SIERPINSKY_version.h.in
+++ b/SIERPINSKY_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2011  OPEN CASCADE
+// Copyright (C) 2005-2012  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 0fd3f5e45d1fd0435d922d09f1044d49b0ec99e9..4a9f027637fe52cb7d96fcf3f5058c2884d44fb6 100644 (file)
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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 bb0f0dcf1f34f2809442d03b16b5416182142d80..598e30d3acc0bf7c4d150a8515ec7014fb7b7a53 100644 (file)
--- a/adm_local/unix/Makefile.am
+++ b/adm_local/unix/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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 a83d2de06143b65fedc73a9f798fde541c8ceddb..cd0dde4b32aa545feaf6ac3b4fb71fa0e9aaf3c2 100644 (file)
--- a/adm_local/unix/config_files/Makefile.am
+++ b/adm_local/unix/config_files/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4
index bdf32565f05ca45340d62702de2aa48c10239baa..2465563df800ed7672e85f571d68b55e49c46a88 100755 (executable)
--- a/adm_local/unix/config_files/check_SIERPINSKY.m4
+++ b/adm_local/unix/config_files/check_SIERPINSKY.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2005-2011  OPEN CASCADE
+dnl Copyright (C) 2005-2012  OPEN CASCADE
 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_gd.m4 b/adm_local/unix/config_files/check_gd.m4
index 4d2ea0868dd7563f285a8ac8e516a7c49f307d44..b51fc98865502582e558464708dffb518361d2ab 100644 (file)
--- a/adm_local/unix/config_files/check_gd.m4
+++ b/adm_local/unix/config_files/check_gd.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2005-2011  OPEN CASCADE
+dnl Copyright (C) 2005-2012  OPEN CASCADE
 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 50ab225a087756337da322c4ab6a8d4f889e1409..9b7e259777e9a44d708237eceb781869c93364b2 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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 fbcde65543e537b8cc484675f3008ff0bf8213cc..3bda7f3e9ca33b0a9c61f087660e363f01bc9271 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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 1e2ed303cdde615d1e73f294d35ccb2a3a34c1dc..322e7b4f8b3bfbf7ff8fd78d004a8ca0c92279ed 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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 116848d3e2a3c3dbb0e9f8c5e7a6c7b70ba77775..faf1208ade20ac27ae391ec5dee9ebae70d06155 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -21,13 +21,5 @@
 rm -rf autom4te.cache aclocal.m4 configure make_config
 find . -name "*~" -print -exec rm {} \;
 find . -name "*.pyc" -print -exec rm {} \;
-#exit
-# ==================== ON SORT AVANT
-
-find bin -name Makefile.in | xargs rm -f
-find doc -name Makefile.in | xargs rm -f
-find idl -name Makefile.in | xargs rm -f
-find resources -name Makefile.in | xargs rm -f
-find salome_adm -name Makefile.in | xargs rm -f
-find src -name Makefile.in | xargs rm -f
-rm -f Makefile.in
+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 )

diff --git a/configure.ac b/configure.ac
index 03fbda23e4cf64772ac758cad35eaa57b28ce343..278b02ca4c7b9768fd9fd542fa0802758de62f92 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,7 @@
 # Modified by : Marc Tajchman (CEA)
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project SIERPINSKY module],[6.4.0], [webmaster.salome@opencascade.com], [SalomeSIERPINSKY])
+AC_INIT([Salome2 Project SIERPINSKY module],[6.5.0], [webmaster.salome@opencascade.com], [SalomeSIERPINSKY])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET

diff --git a/idl/Makefile.am b/idl/Makefile.am
index f012b150c130d93ed17055240b50e6801cee090d..e17e8615d941c2c057e064e657a25803af714bf7 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -26,6 +26,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 BASEIDL_FILES = Sierpinsky.idl
 
+BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py)
+
 # This variable defines the files to be installed
 dist_salomeidl_DATA = $(BASEIDL_FILES)
 
@@ -82,9 +84,15 @@ install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%)
          $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
        done
 
-# uninstall-local removes too much, but it works in distcheck
+# we want to remove only staff generated for IDL files and nothing more
 uninstall-local:
-       rm -rf $(DESTDIR)$(salomepythondir)/*
+       @for modulen in SIERPINSKY_ORB ; do \
+         test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \
+         test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \
+       done ; \
+       for filen in $(BASEIDL_FILES_PY) ; do \
+         echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \
+       done
 
 mostlyclean-local:
        -rm -f *.hh *.cc .depidl

diff --git a/idl/Sierpinsky.idl b/idl/Sierpinsky.idl
index 5ff5941d2a17c2eee03d58c372d6452511d7efd6..e51fd46e6890f0aba70aea52737377cc7b960d5f 100644 (file)
--- a/idl/Sierpinsky.idl
+++ b/idl/Sierpinsky.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2011  OPEN CASCADE
+// Copyright (C) 2005-2012  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/Makefile.am b/resources/Makefile.am
index c88b683deccc8f32349ef7e0eb5e0cc95b76384b..de3a4497123c0796ce1d9f8ae1793ab08d980649 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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/SIERPINSKYCatalog.xml.in b/resources/SIERPINSKYCatalog.xml.in
index 4f4750abd1d244157a3b77571afb2d8907d3e3d2..524a36afdfd403bbc216b47d3d891804aadb42a5 100644 (file)
--- a/resources/SIERPINSKYCatalog.xml.in
+++ b/resources/SIERPINSKYCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2005-2011  OPEN CASCADE
+  Copyright (C) 2005-2012  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/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 2e1c8260e4d20e5b602acc31b4ccfe63e730525a..4dfe7e2ea865a99114e72e86728f2bed58bef92b 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2005-2011  OPEN CASCADE
+  Copyright (C) 2005-2012  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/graph1.xml b/resources/graph1.xml
index adbf6e636fcd21f4233872503043f76f481a8d62..bf15fd9666dc511d4e7704d0ffad0dba825c8305 100644 (file)
--- a/resources/graph1.xml
+++ b/resources/graph1.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE SuperGraph>
 <!--
-  Copyright (C) 2005-2011  OPEN CASCADE
+  Copyright (C) 2005-2012  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/graph2.xml b/resources/graph2.xml
index 8311f074127766c57994b9b1c818f8d61ce53426..fd4cb5c2f3ef73756c1e766add1e073789caea22 100644 (file)
--- a/resources/graph2.xml
+++ b/resources/graph2.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE SuperGraph>
 <!--
-  Copyright (C) 2005-2011  OPEN CASCADE
+  Copyright (C) 2005-2012  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/src/Makefile.am b/src/Makefile.am
index bce80055cee1a57bfd09d4e741ad4c17f4e6d4ac..dc0852d30141c290c34d6d1b15a9c4cfa13d5d55 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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/src/Sierpinsky/Makefile.am b/src/Sierpinsky/Makefile.am
index 209e45ae4db0d810f15efe4ecc44409e0b1b8e63..3589c15d6c05cdfcf95bff21f4df8aa1039d2897 100644 (file)
--- a/src/Sierpinsky/Makefile.am
+++ b/src/Sierpinsky/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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/src/Sierpinsky/SIERPINSKY_Gen_i.cxx b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
index c5d75dbd44ea77e1524a15bd3a8f9b3a6a56b4c9..daf5c99f4fede577d6b260337dac776077e7d608 100644 (file)
--- a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
+++ b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2011  OPEN CASCADE
+// Copyright (C) 2005-2012  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/src/Sierpinsky/SIERPINSKY_Gen_i.hxx b/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
index 383fac13701135c42e7d7fb006a103c8cdf13259..9fa4d597c9eaf089aef15bef9ab593f280ca7b87 100644 (file)
--- a/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
+++ b/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2011  OPEN CASCADE
+// Copyright (C) 2005-2012  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/src/SierpinskyGUI/Makefile.am b/src/SierpinskyGUI/Makefile.am
index a1cfe0e2922b91e9e499ca5ea0722d2db9bf6a13..9083378e87a7261429f2d6de2207cbf5dcfe9cdd 100644 (file)
--- a/src/SierpinskyGUI/Makefile.am
+++ b/src/SierpinskyGUI/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2011  OPEN CASCADE
+# Copyright (C) 2005-2012  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/src/SierpinskyGUI/SierpinskyGUI.cxx b/src/SierpinskyGUI/SierpinskyGUI.cxx
index 3d38fc95f85de6ca6747e845d8521629fa69e7f3..df30623e7f8e9ce2cbb7208c3421ab004b00d287 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI.cxx
+++ b/src/SierpinskyGUI/SierpinskyGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2011  OPEN CASCADE
+// Copyright (C) 2005-2012  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/src/SierpinskyGUI/SierpinskyGUI.h b/src/SierpinskyGUI/SierpinskyGUI.h
index 9e7b9ce3de346f2c4aaf02b9daaecf83ac9288b5..b75019e270fed7762cb5f8622c8edb0b63e96db1 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI.h
+++ b/src/SierpinskyGUI/SierpinskyGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2011  OPEN CASCADE
+// Copyright (C) 2005-2012  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/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
index f7afd4464d41604895270111c6a5bbb9caad88b7..4cc8c298963465e63426c7603c7511d4a5816c07 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
+++ b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2011  OPEN CASCADE
+// Copyright (C) 2005-2012  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/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h
index 44da621f095bcec50c78ad7433a53c4a3012cdd6..64c1b0313b9be5c250d295b8122155b56654143e 100644 (file)
--- a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h
+++ b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2005-2011  OPEN CASCADE
+// Copyright (C) 2005-2012  OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public