From b3d523481abb9be0960b9dc69b1ad7e0330d8eb2 Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 4 Oct 2021 12:35:15 +0300 Subject: [PATCH] bos #26458 Versioning of sources via git commit id (sha1) --- CMakeLists.txt | 21 +++++++++------------ src/yacsorb/CMakeLists.txt | 1 + src/yacsorb/__init__.py | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 src/yacsorb/__init__.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 1123a5504..6dc9594d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,20 +19,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) INCLUDE(CMakeDependentOption) +# Project name +# ============ +# original PROJECT(SalomeYACS C CXX) - -# Versioning -# =========== -# Project name, upper case +# upper case STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) -SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 7) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) -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 1) - # Common CMake macros # =================== SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake configuration files") @@ -43,6 +36,11 @@ ELSE() MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !") ENDIF() +# Versioning +# =========== +SALOME_SETUP_VERSION(9.7.0 DEVELOPMENT) +MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"") + # Find KERNEL (optional) # ============== OPTION(SALOME_YACS_USE_KERNEL "Use SALOME KERNEL" ON) @@ -276,7 +274,6 @@ ADD_SUBDIRECTORY(Demo) # Header configuration # ==================== -SALOME_XVERSION(${PROJECT_NAME}) SALOME_CONFIGURE_FILE(YACS_version.h.in YACS_version.h INSTALL ${SALOME_INSTALL_HEADERS}) # Configuration export diff --git a/src/yacsorb/CMakeLists.txt b/src/yacsorb/CMakeLists.txt index 5963d864f..a205a760c 100644 --- a/src/yacsorb/CMakeLists.txt +++ b/src/yacsorb/CMakeLists.txt @@ -26,3 +26,4 @@ SET(_python_SCRIPTS # --- rules --- SALOME_INSTALL_SCRIPTS("${_python_SCRIPTS}" ${SALOME_INSTALL_PYTHON}) +SALOME_CONFIGURE_FILE(__init__.py __init__.py INSTALL ${SALOME_INSTALL_PYTHON}/salome/yacs) diff --git a/src/yacsorb/__init__.py b/src/yacsorb/__init__.py new file mode 100644 index 000000000..b4adfd541 --- /dev/null +++ b/src/yacsorb/__init__.py @@ -0,0 +1,21 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2006-2021 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# 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 +# + +__version__ = "@SALOMEYACS_GIT_SHA1@" -- 2.39.2