Merge branch 'V9_2_2_BR'

diff --git a/ATOMSOLV_version.h.in b/ATOMSOLV_version.h.in
index 83bf7662d7c9193ef765a7e5cfa0ada2911f68d6..6cc5d6f8c55fcc1f7af7e3898f26b5dbee49c4a9 100644 (file)
--- a/ATOMSOLV_version.h.in
+++ b/ATOMSOLV_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 9592edf..ae14848
--- 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
@@ -35,7 +35,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
 # ===================
@@ -65,7 +65,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 
 # ============
@@ -134,17 +134,9 @@ 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: local 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")
 
@@ -154,10 +146,8 @@ SET(SALOME_ATOMSOLV_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/atomsolv" 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_ATOMSOLV_INSTALL_RES_DATA)
+MARK_AS_ADVANCED(SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES SALOME_INSTALL_PYTHON)
+MARK_AS_ADVANCED(SALOME_INSTALL_DOC SALOME_ATOMSOLV_INSTALL_RES_DATA)
 
 # Accumulate environment variables for ATOMSOLV module
 SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
@@ -167,7 +157,7 @@ SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${
 # Sources 
 # ========
 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/SalomeATOMSOLVConfig.cmake.in b/SalomeATOMSOLVConfig.cmake.in
index 53b41532b60856c71a6dc35af8a582e5322df114..5976670d386174aa5e5812be98d8b664b4f7097b 100644 (file)
--- a/SalomeATOMSOLVConfig.cmake.in
+++ b/SalomeATOMSOLVConfig.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
@@ -93,14 +93,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 ATOMGEN targets if they were not already loaded:
 IF(NOT (TARGET SalomeIDLATOMGEN)) 

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 77cf9dd..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
-  FindSalomeATOMSOLV.cmake
-)
-INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})

diff --git a/adm_local/cmake_files/FindSalomeATOMSOLV.cmake b/adm_local/cmake_files/FindSalomeATOMSOLV.cmake
deleted file mode 100644 (file)
index 7411dc7..0000000
--- a/adm_local/cmake_files/FindSalomeATOMSOLV.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 SalomeATOMSOLV_FIND_QUIETLY)
-  MESSAGE(STATUS "Looking for Salome ATOMSOLV ...")
-ENDIF()
-
-SET(CMAKE_PREFIX_PATH "${ATOMSOLV_ROOT_DIR}")
-SALOME_FIND_PACKAGE(SalomeATOMSOLV SalomeATOMSOLV CONFIG)
-
-IF(NOT SalomeATOMSOLV_FIND_QUIETLY)
-  MESSAGE(STATUS "Found Salome ATOMSOLV: ${ATOMSOLV_ROOT_DIR}")
-ENDIF()
-
-FOREACH(_res ${SalomeATOMSOLV_EXTRA_ENV})
-  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeATOMSOLV_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 2248066..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_ATOMSOLV.m4
-)
-            
-INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files)

diff --git a/adm_local/unix/config_files/check_ATOMSOLV.m4 b/adm_local/unix/config_files/check_ATOMSOLV.m4
deleted file mode 100755 (executable)
index 7bc3fda..0000000
--- a/adm_local/unix/config_files/check_ATOMSOLV.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_ATOMSOLV],[
-
-AC_CHECKING(for ATOMSOLV)
-
-ATOMSOLV_ok=no
-
-AC_ARG_WITH(atomic,
-           [  --with-atomic=DIR root directory path of ATOMSOLV module installation ],
-           ATOMSOLV_DIR="$withval",ATOMSOLV_DIR="")
-
-if test "x$ATOMSOLV_DIR" == "x" ; then
-   # no --with-atomic-dir option used
-   if test "x$ATOMSOLV_ROOT_DIR" != "x" ; then
-      # ATOMSOLV_ROOT_DIR environment variable defined
-      ATOMSOLV_DIR=$ATOMSOLV_ROOT_DIR
-   fi
-fi
-
-if test -f ${ATOMSOLV_DIR}/lib/salome/libATOMSOLV.so ; then
-   ATOMSOLV_ok=yes
-   AC_MSG_RESULT(Using ATOMSOLV module distribution in ${ATOMSOLV_DIR})
-
-   if test "x$ATOMSOLV_ROOT_DIR" == "x" ; then
-      ATOMSOLV_ROOT_DIR=${ATOMSOLV_DIR}
-   fi
-   AC_SUBST(ATOMSOLV_ROOT_DIR)
-else
-   AC_MSG_WARN("Cannot find ATOMSOLV module sources")
-fi
-  
-AC_MSG_RESULT(for ATOMSOLV: $ATOMSOLV_ok)
- 
-])dnl
- 

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 1444805..e42abf6
--- 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
@@ -18,7 +18,7 @@
 #
 
 SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
-SALOME_CONFIGURE_FILE(runATOMSOLV.in runATOMSOLV INSTALL ${SALOME_INSTALL_BINS})
+SALOME_CONFIGURE_FILE(runATOMSOLV.in runATOMSOLV INSTALL ${SALOME_INSTALL_BINS} EXEC_PERMS)
 
 # ===============================================================
 # Files to be installed

diff --git a/bin/VERSION.in b/bin/VERSION.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/bin/runATOMSOLV.in b/bin/runATOMSOLV.in
index a2d30e1576e36b9154af4406aa33f1ebe7be912a..b3cd3a8c1e55faa16959485eb2028b1946cabb4f 100755 (executable)
--- a/bin/runATOMSOLV.in
+++ b/bin/runATOMSOLV.in
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# 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/bin/runATOMSOLV.py b/bin/runATOMSOLV.py
index 90f1002a5857f06a29c1f39731b4732b7970c3cc..3c249e7ad3887512589584b3b8bd5bd55cbb3535 100755 (executable)
--- a/bin/runATOMSOLV.py
+++ b/bin/runATOMSOLV.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# 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/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
new file mode 100644 (file)
index 0000000..33fcd07
--- /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
+  FindSalomeATOMSOLV.cmake
+)
+INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL})

diff --git a/cmake/FindSalomeATOMSOLV.cmake b/cmake/FindSalomeATOMSOLV.cmake
new file mode 100644 (file)
index 0000000..9cfa725
--- /dev/null
+++ b/cmake/FindSalomeATOMSOLV.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 SalomeATOMSOLV_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for Salome ATOMSOLV ...")
+ENDIF()
+
+SET(CMAKE_PREFIX_PATH "${ATOMSOLV_ROOT_DIR}")
+SALOME_FIND_PACKAGE(SalomeATOMSOLV SalomeATOMSOLV CONFIG)
+
+IF(NOT SalomeATOMSOLV_FIND_QUIETLY)
+  MESSAGE(STATUS "Found Salome ATOMSOLV: ${ATOMSOLV_ROOT_DIR}")
+ENDIF()
+
+FOREACH(_res ${SalomeATOMSOLV_EXTRA_ENV})
+  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeATOMSOLV_EXTRA_ENV_${_res}}")
+ENDFOREACH()
\ No newline at end of file

diff --git a/idl/ATOMSOLV.idl b/idl/ATOMSOLV.idl
index 74f4523a821802e8b21461d6a207bade0242fe2c..6bb22d25b49474904715251f152e7c58723bb886 100644 (file)
--- a/idl/ATOMSOLV.idl
+++ b/idl/ATOMSOLV.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
index 3a29bfc0a60a7c19f841a8950a49ba81ff1ea676..8e4ea6869b4a3f8219f3845af796b89e7a84c22e 100644 (file)
--- 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/ATOMSOLVCatalog.xml b/resources/ATOMSOLVCatalog.xml
index 1ac1c7f03f4b8ecc0d687f7ebdb90709ae2eaf59..9b96ff4bbf6899934ee68a8a101281f7ead41226 100644 (file)
--- a/resources/ATOMSOLVCatalog.xml
+++ b/resources/ATOMSOLVCatalog.xml
@@ -1,48 +1,22 @@
 <?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>ATOMSOLV</component-name>
-               <component-username>ATOMSOLV GUI</component-username>
-                <component-type>Data</component-type>
-                <component-author>SALOME team</component-author>
-                <component-version>0.3.0</component-version>
-                <component-comment>Open CASCADE S.A.S.</component-comment>
-                <component-multistudy>1</component-multistudy>
-                <component-icone>ATOMSOLV.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>ATOMSOLV</component-name>
+      <component-username>ATOMSOLV GUI</component-username>
+      <component-type>Data</component-type>
+      <component-author>SALOME team</component-author>
+      <component-version>0.3.0</component-version>
+      <component-comment>Open CASCADE S.A.S.</component-comment>
+      <component-multistudy>1</component-multistudy>
+      <component-icone>ATOMSOLV.png</component-icone>
+      <constraint>'linux' ~ OS</constraint>
+    </component>
+  </component-list>
 </begin-catalog>

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 974519c..16e84b1
--- 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

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 8977269d819a845a4a03a2af0ac2cc2dc2e2da2a..73c6802313e275f63072a734f3d6e7eda239b276 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,23 +1,3 @@
-<!--
-  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="ATOMSOLV">
     <!-- Major module parameters -->
@@ -29,10 +9,10 @@
     <!-- Module resources -->
     <parameter name="ATOMSOLV" value="%ATOMSOLV_ROOT_DIR%/share/salome/resources/atomsolv"/>
   </section>
- <section name="windows_geometry">
-  <parameter 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 #10 #00 #41 #00 #74 #00 #6F #00 #6D #00 #53 #00 #6F #00 #6C #00 #76 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00" name="ATOMSOLV"/>
- </section>
- <section name="windows_visibility">
-  <parameter value="#00 #00 #00 #00 #05 #00 #00 #00 #10 #00 #41 #00 #74 #00 #6F #00 #6D #00 #53 #00 #6F #00 #6C #00 #76 #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 #00 #00 #00 #2C #00 #56 #00 #54 #00 #4B #00 #52 #00 #65 #00 #63 #00 #6F #00 #72 #00 #64 #00 #69 #00 #6E #00 #67 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #2E #00 #56 #00 #54 #00 #4B #00 #56 #00 #69 #00 #65 #00 #77 #00 #65 #00 #72 #00 #56 #00 #69 #00 #65 #00 #77 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #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" name="ATOMSOLV"/>
- </section>
+  <section name="windows_geometry">
+    <parameter 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 #10 #00 #41 #00 #74 #00 #6F #00 #6D #00 #53 #00 #6F #00 #6C #00 #76 #01 #00 #00 #00 #00 #FF #FF #FF #FF #00 #00 #00 #00 #00 #00 #00 #00" name="ATOMSOLV"/>
+  </section>
+  <section name="windows_visibility">
+    <parameter value="#00 #00 #00 #00 #05 #00 #00 #00 #10 #00 #41 #00 #74 #00 #6F #00 #6D #00 #53 #00 #6F #00 #6C #00 #76 #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 #00 #00 #00 #2C #00 #56 #00 #54 #00 #4B #00 #52 #00 #65 #00 #63 #00 #6F #00 #72 #00 #64 #00 #69 #00 #6E #00 #67 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #01 #00 #00 #00 #2E #00 #56 #00 #54 #00 #4B #00 #56 #00 #69 #00 #65 #00 #77 #00 #65 #00 #72 #00 #56 #00 #69 #00 #65 #00 #77 #00 #4F #00 #70 #00 #65 #00 #72 #00 #61 #00 #74 #00 #69 #00 #6F #00 #6E #00 #73 #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" name="ATOMSOLV"/>
+  </section>
 </document>

diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
old mode 100755 (executable)
new mode 100644 (file)
index 282d82a..1d902e1
--- a/src/ATOMSOLV/ATOMSOLV.cxx
+++ b/src/ATOMSOLV/ATOMSOLV.cxx
@@ -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/ATOMSOLV/ATOMSOLV.hxx b/src/ATOMSOLV/ATOMSOLV.hxx
index 2cfde291eccc155450df6e8911af1e7272497645..b9bc51865bdcb1050bcdff1e36e535a685747f06 100644 (file)
--- a/src/ATOMSOLV/ATOMSOLV.hxx
+++ b/src/ATOMSOLV/ATOMSOLV.hxx
@@ -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/ATOMSOLV/CMakeLists.txt b/src/ATOMSOLV/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 97de2ab..a3d5d12
--- a/src/ATOMSOLV/CMakeLists.txt
+++ b/src/ATOMSOLV/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/ATOMSOLVGUI/ATOMSOLVGUI.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
index a3c48bf50987a557bfdafbb1086742c36d9156f1..d731ad84645c8e38302026ad067e2e4807abcf53 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI.h b/src/ATOMSOLVGUI/ATOMSOLVGUI.h
index 951334ae52a1d6158c7039ae167b45b00a5cadaa..bf7aaedce023037bde8f9d500e1798a0dec5d09a 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.h
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx
old mode 100755 (executable)
new mode 100644 (file)
index f6d4aa0..5ff40d0
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx
index 9de2d1bcf1a9d8a8c6a1045680d2ede3c8ffcbaf..26d65066db4d92d316e0cadccad2e3e98bf5746b 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
index 45e683807295741d8588f3d97d763e9e591d4332..90d104c46bdac1445e97187c07661ef2483295fe 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx
index 54c929b834da6e71f8ed8f405e2ae08309ec727f..e5b848cc0fb0216115d00e68693394784c92548b 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
index ce677cf093efda8363c074184cadfc9693ec0289..3b171a11c3948857a296f7cb4ad5108a039ce17c 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
index f060251d8c8cbb2df40b38bb4dfd976f8be64c8e..bc95fe9ce9243ab13bc065789c0bdfb364ddc354 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
index ad8e35674f1e185751b8af49b86b72af052dc904..4657abe2da228eeea39383c29b28685c30b1e08a 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx
index 439b5535ffc3c04c01e44c2a44df4435203b28ee..0fc42cde57e2a96405d88847dc76db1986b4d965 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
index bc68d0470da38d71010bd76d4ad28788422dcfd5..5c9ad01d37ae719f89cc3b96e73538d32e37b07a 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
index fc8cda04cd82b84e542cbeea0ec3254b8cc2caf3..44180942721bb7722ddfe38f3a095903efe0806f 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
@@ -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/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
index 6d6b3fcfe73b090071722c9ca6baf36a41063b4d..6681d4301906d93f7e0b7506cfc5e1c2d0019f40 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
@@ -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/ATOMSOLVGUI/CMakeLists.txt b/src/ATOMSOLVGUI/CMakeLists.txt
index 5c3f21565bdfd0f4d4303c3ba221d053112a7f58..a8e5e88464989777df790794a281126a8df1d911 100644 (file)
--- a/src/ATOMSOLVGUI/CMakeLists.txt
+++ b/src/ATOMSOLVGUI/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 7ffcf87..c6dbf83
--- 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