Merge branch 'V9_2_2_BR'

diff --git a/ATOMGEN_version.h.in b/ATOMGEN_version.h.in
index adbf4e29a38bf921dd86699df49e195c6e930a70..6d9ca2b98f30fc0a9ef1be050c2779b4a7f0bdc8 100644 (file)
--- a/ATOMGEN_version.h.in
+++ b/ATOMGEN_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index ede8d75..8f122ef
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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
@@ -33,7 +33,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 2)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================
@@ -63,7 +63,7 @@ INCLUDE(SalomeSetupPlatform)   # From KERNEL
 # Always build libraries as shared objects:
 SET(BUILD_SHARED_LIBS TRUE)
 # Local macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files")
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 # User options 
 # ============
@@ -119,16 +119,8 @@ SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH
    "Install path: SALOME script data")
 SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH 
    "Install path: SALOME Python scripts")
-SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH 
-   "Install path: SALOME application skeleton - scripts")
-SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH 
-   "Install path: SALOME application skeleton - Python")
 #SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff")
-#SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH 
-#   "Install path: SALOME Python shared modules")
 SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH "Install path: SALOME CMake files")
-SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH
-  "Install path: local SALOME config files (obsolete, to be removed)")
 
 SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources")
 SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation")
@@ -139,9 +131,8 @@ SET(SALOME_ATOMGEN_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/atomgen" CACHE PATH
 
 MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS)
 MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON)
-MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS  SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES)
-MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
-MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
+MARK_AS_ADVANCED(SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES)
+MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_DOC)
 MARK_AS_ADVANCED(SALOME_ATOMGEN_INSTALL_RES_DATA)
 
 # Accumulate environment variables for ATOMGEN module
@@ -150,7 +141,7 @@ SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOM
 SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) 
                                               
 ADD_SUBDIRECTORY(idl)
-ADD_SUBDIRECTORY(adm_local)
+ADD_SUBDIRECTORY(cmake)
 ADD_SUBDIRECTORY(resources)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(bin)

diff --git a/README b/README
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/SalomeATOMGENConfig.cmake.in b/SalomeATOMGENConfig.cmake.in
index b5cb8da82001a3b3c0fefc602fa3d103dc29621c..a97dfa03a985ae65b240acc08b3cb5cb6198b458 100644 (file)
--- a/SalomeATOMGENConfig.cmake.in
+++ b/SalomeATOMGENConfig.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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
@@ -92,14 +92,10 @@ SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@")
 SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@")
 SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@")
 SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@")
-SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@")
-SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") 
 SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@")
 SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@")
-SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@")
 SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@")
 SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@")
-SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@")
 
 # Include GUI targets if they were not already loaded:
 IF(NOT (TARGET Event)) 

diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
deleted file mode 100755 (executable)
index 2341538..0000000
--- a/adm_local/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 2013-2016  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, 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
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-ADD_SUBDIRECTORY(unix)
-ADD_SUBDIRECTORY(cmake_files)

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
deleted file mode 100755 (executable)
index 18096d8..0000000
--- a/adm_local/cmake_files/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2013-2016  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, 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
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# ===============================================================
-# Files to be installed
-# ===============================================================
-
-# These files are data, module or lib files
-SET(_adm_data
-  FindSalomeATOMGEN.cmake
-)
-INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})

diff --git a/adm_local/cmake_files/FindSalomeATOMGEN.cmake b/adm_local/cmake_files/FindSalomeATOMGEN.cmake
deleted file mode 100644 (file)
index b982205..0000000
--- a/adm_local/cmake_files/FindSalomeATOMGEN.cmake
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2007-2016  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, 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
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-IF(NOT SalomeATOMGEN_FIND_QUIETLY)
-  MESSAGE(STATUS "Looking for Salome ATOMGEN ...")
-ENDIF()
-
-SET(CMAKE_PREFIX_PATH "${ATOMGEN_ROOT_DIR}")
-SALOME_FIND_PACKAGE(SalomeATOMGEN SalomeATOMGEN CONFIG)
-
-IF(NOT SalomeATOMGEN_FIND_QUIETLY)
-  MESSAGE(STATUS "Found Salome ATOMGEN: ${ATOMGEN_ROOT_DIR}")
-ENDIF()
-
-FOREACH(_res ${SalomeATOMGEN_EXTRA_ENV})
-  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeATOMGEN_EXTRA_ENV_${_res}}")
-ENDFOREACH()
\ No newline at end of file

diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
deleted file mode 100755 (executable)
index 758e103..0000000
--- a/adm_local/unix/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 2013-2016  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, 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
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-ADD_SUBDIRECTORY(config_files)

diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
deleted file mode 100755 (executable)
index fe9be6f..0000000
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2013-2016  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, 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
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-SET(_m4_data
-  check_ATOMGEN.m4
-)
-            
-INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files)

diff --git a/adm_local/unix/config_files/check_ATOMGEN.m4 b/adm_local/unix/config_files/check_ATOMGEN.m4
deleted file mode 100644 (file)
index b16c9f9..0000000
--- a/adm_local/unix/config_files/check_ATOMGEN.m4
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 2007-2016  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, 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
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-AC_DEFUN([CHECK_ATOMGEN],[
-
-AC_CHECKING(for ATOMGEN)
-
-ATOMGEN_ok=no
-
-AC_ARG_WITH(atomgen,
-           [  --with-atomgen=DIR root directory path of ATOMGEN module installation ],
-           ATOMGEN_DIR="$withval",ATOMGEN_DIR="")
-
-if test "x$ATOMGEN_DIR" == "x" ; then
-   # no --with-atomgen-dir option used
-   if test "x$ATOMGEN_ROOT_DIR" != "x" ; then
-      # ATOMGEN_ROOT_DIR environment variable defined
-      ATOMGEN_DIR=$ATOMGEN_ROOT_DIR
-   fi
-fi
-
-if test -f ${ATOMGEN_DIR}/bin/salome/ATOMGEN.py ; then
-   ATOMGEN_ok=yes
-   AC_MSG_RESULT(Using ATOMGEN module distribution in ${ATOMGEN_DIR})
-
-   if test "x$ATOMGEN_ROOT_DIR" == "x" ; then
-      ATOMGEN_ROOT_DIR=${ATOMGEN_DIR}
-   fi
-   AC_SUBST(ATOMGEN_ROOT_DIR)
-else
-   AC_MSG_WARN("Cannot find ATOMGEN module sources")
-fi
-  
-AC_MSG_RESULT(for ATOMGEN: $ATOMGEN_ok)
- 
-])dnl
- 

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index e925097cc8283117ddba50e3fc090b519544ed3f..065b8d32ba416eb32c92e4fd40e052b752b144d6 100644 (file)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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/VERSION.in b/bin/VERSION.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2d78d0f
--- /dev/null
+++ b/cmake/CMakeLists.txt
@@ -0,0 +1,28 @@
+# Copyright (C) 2013-2019  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, 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
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+# ===============================================================
+# Files to be installed
+# ===============================================================
+
+# These files are data, module or lib files
+SET(_adm_data
+  FindSalomeATOMGEN.cmake
+)
+INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})

diff --git a/cmake/FindSalomeATOMGEN.cmake b/cmake/FindSalomeATOMGEN.cmake
new file mode 100644 (file)
index 0000000..8136bde
--- /dev/null
+++ b/cmake/FindSalomeATOMGEN.cmake
@@ -0,0 +1,33 @@
+# Copyright (C) 2007-2019  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, 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
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+IF(NOT SalomeATOMGEN_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for Salome ATOMGEN ...")
+ENDIF()
+
+SET(CMAKE_PREFIX_PATH "${ATOMGEN_ROOT_DIR}")
+SALOME_FIND_PACKAGE(SalomeATOMGEN SalomeATOMGEN CONFIG)
+
+IF(NOT SalomeATOMGEN_FIND_QUIETLY)
+  MESSAGE(STATUS "Found Salome ATOMGEN: ${ATOMGEN_ROOT_DIR}")
+ENDIF()
+
+FOREACH(_res ${SalomeATOMGEN_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeATOMGEN_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file

diff --git a/idl/ATOMGEN.idl b/idl/ATOMGEN.idl
index 5a9f331e2c38f3018878fc536cba6163d19f84f9..7ee6b553fe088e803fbb0c61bafafa1576cb4e9a 100644 (file)
--- a/idl/ATOMGEN.idl
+++ b/idl/ATOMGEN.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2019  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/CMakeLists.txt b/idl/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index edc8410..829d4a5
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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/ATOMGENCatalog.xml.in b/resources/ATOMGENCatalog.xml.in
index 7d0efef1472babd85521e3f07daaef344485bedf..70ab906c4e7547824689b4e15bcaba6fb6e7796e 100644 (file)
--- a/resources/ATOMGENCatalog.xml.in
+++ b/resources/ATOMGENCatalog.xml.in
@@ -1,47 +1,21 @@
 <?xml version='1.0' encoding='us-ascii' ?>
-
-<!--
-  Copyright (C) 2007-2016  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, 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
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
- 
 <!-- XML component catalog -->
 <begin-catalog>
-
-<!-- Path prefix information -->
-
-<path-prefix-list>
-</path-prefix-list>
-
-<!-- Component list -->
-<component-list>
-        <component>
-                <!-- Component identification -->
-                <component-name>ATOMGEN</component-name>
-               <component-username>AtomGEN</component-username>
-                <component-type>SAMPLE</component-type>
-                <component-author>SALOME team</component-author>
-                <component-version>@SALOMEATOMGEN_VERSION@</component-version>
-                <component-comment>Sample Python-based component</component-comment>
-                <component-icone>ATOMGEN.png</component-icone>
-                <constraint>'linux' ~ OS</constraint>
-       
-       </component>
-</component-list>
+  <!-- Path prefix information -->
+  <path-prefix-list>
+  </path-prefix-list>
+  <!-- Component list -->
+  <component-list>
+    <component>
+      <!-- Component identification -->
+      <component-name>ATOMGEN</component-name>
+      <component-username>AtomGEN</component-username>
+      <component-type>SAMPLE</component-type>
+      <component-author>SALOME team</component-author>
+      <component-version>@SALOMEATOMGEN_VERSION@</component-version>
+      <component-comment>Sample Python-based component</component-comment>
+      <component-icone>ATOMGEN.png</component-icone>
+      <constraint>'linux' ~ OS</constraint>
+    </component>
+  </component-list>
 </begin-catalog>

diff --git a/resources/ATOMGEN_en.xml b/resources/ATOMGEN_en.xml
deleted file mode 100644 (file)
index 504f902..0000000
--- a/resources/ATOMGEN_en.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version='1.0' encoding='us-ascii'?>
-
-<!--
-  Copyright (C) 2007-2016  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, 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
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
-
-<!DOCTYPE application PUBLIC "" "desktop.dtd">
-<application title="ATOMGEN component" date="15/11/2005" author="SALOME team" appId="SALOME" >
-<desktop>
-
-<!-- ### MENUBAR ###  -->
-<menubar>
- <menu-item label-id="ATOMGEN" item-id="90" pos-id="3">
-  <popup-item item-id="4010" label-id="Run" icon-id="" tooltip-id="Runs calculations" accel-id="" toggle-id="" execute-action=""/>
- </menu-item>
-</menubar>
-
-<!-- ### TOOLBARS ###  -->
-<toolbar label-id="ATOMGEN" name-id="ATOMGEN">
- <toolbutton-item item-id="4002" label-id="Run" icon-id="atomgen_run.png" tooltip-id="Runs calculations" accel-id="" toggle-id="" execute-action=""/>
-</toolbar>
-
-</desktop>
-</application>
-

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index b677d4d..f6edf35
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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
@@ -20,7 +20,6 @@
 SET(ATOMGEN_RESOURCES_FILES
   atomgen_run.png
   ATOMGEN.png
-  ATOMGEN_en.xml
 )
 
 INSTALL(FILES ${ATOMGEN_RESOURCES_FILES} DESTINATION ${SALOME_ATOMGEN_INSTALL_RES_DATA})

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index d6b7a0db57491273ea88408169d4edd613328d82..8ee8379ee9f316e805b4ac0e23c24e3aae3ca49f 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,41 +1,21 @@
 <!DOCTYPE document>
-<!--
-  Copyright (C) 2007-2016  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, 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
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with this library; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
 <document>
- <section name="launch" >
-  <parameter name="modules" value="ATOMGEN" />
- </section>
- <section name="ATOMGEN" >
-  <parameter name="name"    value="AtomGen" />
-  <parameter name="icon"    value="ATOMGEN.png" />
-  <parameter name="version" value="@SALOMEATOMGEN_VERSION@" />  
-  <parameter name="library" value="SalomePyQtGUI" />
- </section>
- <section name="resources" >
-  <parameter name="ATOMGEN" value="%ATOMGEN_ROOT_DIR%/share/salome/resources/atomgen" />
- </section>
- <section name="windows_geometry">
-  <parameter name="ATOMGEN" value="#00 #00 #00 #FF #00 #00 #00 #00 #FD #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #01 #00 #00 #00 #02 #6B #FC #02 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #59 #00 #00 #02 #6B #00 #00 #00 #53 #00 #FF #FF #FF #00 #00 #00 #03 #00 #00 #05 #40 #00 #00 #00 #53 #FC #01 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #00 #00 #05 #40 #00 #00 #00 #46 #00 #FF #FF #FF #00 #00 #04 #38 #00 #00 #02 #6B #00 #00 #00 #04 #00 #00 #00 #04 #00 #00 #00 #08 #00 #00 #00 #08 #FC #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #CE #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #01 #00 #00 #00 #0E #00 #41 #00 #54 #00 #4F #00 #4D #00 #47 #00 #45 #00 #4E #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00"/>
- </section>
- <section name="windows_visibility">
-  <parameter name="ATOMGEN" value="#00 #00 #00 #00 #03 #00 #00 #00 #0E #00 #41 #00 #54 #00 #4F #00 #4D #00 #47 #00 #45 #00 #4E #01 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #01 #00 #00 #00 #02 #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01"/>
- </section>
+  <section name="launch" >
+    <parameter name="modules" value="ATOMGEN" />
+  </section>
+  <section name="ATOMGEN" >
+    <parameter name="name"    value="AtomGen" />
+    <parameter name="icon"    value="ATOMGEN.png" />
+    <parameter name="version" value="@SALOMEATOMGEN_VERSION@" />  
+    <parameter name="library" value="SalomePyQtGUI" />
+  </section>
+  <section name="resources" >
+    <parameter name="ATOMGEN" value="%ATOMGEN_ROOT_DIR%/share/salome/resources/atomgen" />
+  </section>
+  <section name="windows_geometry">
+    <parameter name="ATOMGEN" value="#00 #00 #00 #FF #00 #00 #00 #00 #FD #00 #00 #00 #02 #00 #00 #00 #00 #00 #00 #01 #00 #00 #00 #02 #6B #FC #02 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #59 #00 #00 #02 #6B #00 #00 #00 #53 #00 #FF #FF #FF #00 #00 #00 #03 #00 #00 #05 #40 #00 #00 #00 #53 #FC #01 #00 #00 #00 #01 #FB #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #00 #00 #00 #05 #40 #00 #00 #00 #46 #00 #FF #FF #FF #00 #00 #04 #38 #00 #00 #02 #6B #00 #00 #00 #04 #00 #00 #00 #04 #00 #00 #00 #08 #00 #00 #00 #08 #FC #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #02 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #CE #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #00 #02 #00 #00 #00 #01 #00 #00 #00 #0E #00 #41 #00 #54 #00 #4F #00 #4D #00 #47 #00 #45 #00 #4E #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00"/>
+  </section>
+  <section name="windows_visibility">
+    <parameter name="ATOMGEN" value="#00 #00 #00 #00 #03 #00 #00 #00 #0E #00 #41 #00 #54 #00 #4F #00 #4D #00 #47 #00 #45 #00 #4E #01 #00 #00 #00 #1A #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #4D #00 #6F #00 #64 #00 #75 #00 #6C #00 #65 #00 #73 #01 #00 #00 #00 #1C #00 #53 #00 #61 #00 #6C #00 #6F #00 #6D #00 #65 #00 #53 #00 #74 #00 #61 #00 #6E #00 #64 #00 #61 #00 #72 #00 #64 #01 #01 #00 #00 #00 #02 #00 #00 #00 #22 #00 #6F #00 #62 #00 #6A #00 #65 #00 #63 #00 #74 #00 #42 #00 #72 #00 #6F #00 #77 #00 #73 #00 #65 #00 #72 #00 #44 #00 #6F #00 #63 #00 #6B #01 #00 #00 #00 #22 #00 #70 #00 #79 #00 #74 #00 #68 #00 #6F #00 #6E #00 #43 #00 #6F #00 #6E #00 #73 #00 #6F #00 #6C #00 #65 #00 #44 #00 #6F #00 #63 #00 #6B #01"/>
+  </section>
 </document>

diff --git a/src/ATOMGEN/ATOMGEN.py b/src/ATOMGEN/ATOMGEN.py
old mode 100755 (executable)
new mode 100644 (file)
index 04e5d51..004a1f3
--- a/src/ATOMGEN/ATOMGEN.py
+++ b/src/ATOMGEN/ATOMGEN.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  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/src/ATOMGEN/ATOMGEN_Data.py b/src/ATOMGEN/ATOMGEN_Data.py
index ad904b3d3cd654621a650a909df3094a16670075..09518422555c75cd8dc0ed43deaee4677e32f210 100644 (file)
--- a/src/ATOMGEN/ATOMGEN_Data.py
+++ b/src/ATOMGEN/ATOMGEN_Data.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  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/src/ATOMGEN/ATOMGEN_XmlParser.py b/src/ATOMGEN/ATOMGEN_XmlParser.py
index 50daf3272df10b551d3e30f431037a96b938e2ec..6c17c896dbde20b8d5eeb6818f2aec4139a26d6e 100644 (file)
--- a/src/ATOMGEN/ATOMGEN_XmlParser.py
+++ b/src/ATOMGEN/ATOMGEN_XmlParser.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  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/src/ATOMGEN/CMakeLists.txt b/src/ATOMGEN/CMakeLists.txt
index ce66ea05eb3c22f614c17650244f0f4052bdf127..99d1c7c3c94e0fe78ae5a78ff94a723f92624f13 100644 (file)
--- a/src/ATOMGEN/CMakeLists.txt
+++ b/src/ATOMGEN/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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/src/ATOMGENGUI/ATOMGENGUI.py b/src/ATOMGENGUI/ATOMGENGUI.py
old mode 100755 (executable)
new mode 100644 (file)
index d759d3b..97fa437
--- a/src/ATOMGENGUI/ATOMGENGUI.py
+++ b/src/ATOMGENGUI/ATOMGENGUI.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  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/src/ATOMGENGUI/CMakeLists.txt b/src/ATOMGENGUI/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index dbce181..0c81e28
--- a/src/ATOMGENGUI/CMakeLists.txt
+++ b/src/ATOMGENGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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/src/CMakeLists.txt b/src/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index e53a4ed..3c1c2f9
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  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