OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-atomspace-storage commits / cfd80c0

Rework the versioning system for this package
cfd80c003e3b3ce42ae93b35b53cfc8ca1284507
by Linas Vepštas <linasvepstas@gmail.com> · 2025-12-16T00:48:18.000Z

Changed files (3) +8 -14

CMakeLists.txt +5 -9
……@@ -23,7 +23,7 @@ IF(CMAKE_VERSION VERSION_GREATER 3.31)
2323 CMAKE_POLICY(SET CMP0177 NEW)
2424ENDIF(CMAKE_VERSION VERSION_GREATER 3.31)
2525
26PROJECT(atomspace-storage)
26PROJECT(atomspace-storage VERSION 4.3.0)
2727
2828# ----------------------------------------------------------
2929# User-modifiable options. Feel free to change these!
……@@ -62,7 +62,7 @@ ADD_DEFINITIONS(-DPROJECT_SOURCE_DIR="${CMAKE_SOURCE_DIR}"
6262list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/lib/")
6363
6464# Cogutil
65FIND_PACKAGE(CogUtil 2.0.1 CONFIG REQUIRED)
65FIND_PACKAGE(CogUtil 2.2.1 CONFIG REQUIRED)
6666IF (COGUTIL_FOUND)
6767 MESSAGE(STATUS "CogUtil version ${COGUTIL_VERSION} found.")
6868 ADD_DEFINITIONS(-DHAVE_COGUTIL)
……@@ -180,10 +180,6 @@ STRING(TIMESTAMP UTC_DATE %Y%m%d UTC)
180180# that it is owned by the builder thus avoiding 'Permission denied' error when
181181# packaging.
182182FILE(WRITE "${PROJECT_BINARY_DIR}/install_manifest.txt")
183## It doesn't have a header-file declaring the version similar to cogutil and
184## atomspace.
185# SEMANTIC_VERSION is set in `lib/AtomSpaceRocksConfig.cmake.in`
186# SET(SEMANTIC_VERSION 1.3.0)
187183
188184## Cpack configuration
189185SET(CPACK_GENERATOR "DEB")
……@@ -193,7 +189,7 @@ SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/packages")
193189SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The AtomSpace RocksDB Storage Backend")
194190SET(CPACK_PACKAGE_NAME "atomspace-storage-dev")
195191SET(CPACK_PACKAGE_VENDOR "opencog.org")
196SET(CPACK_PACKAGE_VERSION "${SEMANTIC_VERSION}-${UTC_DATE}")
192SET(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}-${UTC_DATE}")
197193SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
198194SET(CPACK_PACKAGE_FILE_NAME
199195 "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${PACKAGE_ARCHITECTURE}")
……@@ -203,8 +199,8 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
203199SET(DEPENDENCY_LIST
204200 "guile-3.0-dev (>= 3.0.0)"
205201 "libstdc++6 (>= 7.0)"
206 "libcogutil-dev (>= 2.0.2)"
207 "atomspace-dev (>= 5.0.3)"
202 "libcogutil-dev (>= 2.2.1)"
203 "atomspace-dev (>= 5.2.0)"
208204)
209205
210206STRING(REPLACE ";" ", " MAIN_DEPENDENCIES "${DEPENDENCY_LIST}")
cmake/AtomSpaceStorageConfig.cmake.in +1 -1
……@@ -22,5 +22,5 @@ set(ATOMSPACE_STORAGE_LIBRARIES
2222
2323set(ATOMSPACE_STORAGE_DATA_DIR "@CMAKE_INSTALL_PREFIX@/share/opencog")
2424set(ATOMSPACE_STORAGE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/")
25set(ATOMSPACE_STORAGE_VERSION "@SEMANTIC_VERSION@")
25set(ATOMSPACE_STORAGE_VERSION "@PROJECT_VERSION@")
2626set(ATOMSPACE_STORAGE_FOUND 1)
cmake/CMakeLists.txt +2 -4
……@@ -1,5 +1,5 @@
11
2# CMake boilerplate that allows users to do
2# CMake boilerplate
33# find_package(AtomspaceStorage REQUIRED 4.3.0)
44# and have it work.
55
……@@ -12,8 +12,6 @@ install(EXPORT AtomSpaceStorageTargets
1212 DESTINATION ${ConfigPackageLocation}
1313)
1414
15SET(SEMANTIC_VERSION 4.3.0)
16
1715configure_package_config_file(AtomSpaceStorageConfig.cmake.in
1816 ${CMAKE_CURRENT_BINARY_DIR}/AtomSpaceStorageConfig.cmake
1917 INSTALL_DESTINATION ${ConfigPackageLocation}
……@@ -22,7 +20,7 @@ configure_package_config_file(AtomSpaceStorageConfig.cmake.in
2220
2321write_basic_package_version_file(
2422 "${CMAKE_CURRENT_BINARY_DIR}/AtomSpaceStorageConfigVersion.cmake"
25 VERSION ${SEMANTIC_VERSION}
23 VERSION ${PROJECT_VERSION}
2624 COMPATIBILITY SameMajorVersion
2725)
2826