Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare release v2.2.0 #38

Merged
merged 4 commits into from
Jan 2, 2025
Merged

Prepare release v2.2.0 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44cd1ea
Remove vendor from CIMppPackaging.cmake and update homepage
tom-hg57 Jan 1, 2025
006ea2d
Prepare release of version 2.2.0
tom-hg57 Jan 1, 2025
b63ffbe
Set SOGNO mailinglist as contact in CIMppPackaging.cmake and update d…
tom-hg57 Jan 2, 2025
506c2d8
Remove .gitlab-ci.yml (no longer used), move Dockerfile to .devcontai…
tom-hg57 Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .devcontainer/Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
FROM fedora:36

RUN dnf -y update

# Toolchain
RUN dnf -y install \
git \
gcc-c++ \
make \
cmake \
doxygen \
graphviz \
python3-pip \
rpmdevtools \
libxml2-devel
5 changes: 2 additions & 3 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"name": "libcimpp",
//"image": "",
"build": {
"dockerfile": "../Dockerfile"
"dockerfile": "Dockerfile.dev"
},
"customizations": {
"vscode": {
Expand All @@ -13,4 +12,4 @@
]
}
}
}
}
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ else()
endif()

set(libcimpp_MAJOR_VERSION 2)
set(libcimpp_MINOR_VERSION 1)
set(libcimpp_MINOR_VERSION 2)
set(libcimpp_PATCH_VERSION 0)
set(libcimpp_VERSION ${libcimpp_MAJOR_VERSION}.${libcimpp_MINOR_VERSION}.${libcimpp_PATCH_VERSION})

Expand Down
21 changes: 0 additions & 21 deletions Dockerfile
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# libcimpp

libcimpp is a deserialiser library for C++ objects from XML/RDF documents based on the Common Information Model (CIM) standards (i.e. IEC61970/61968/62325) and CGMES for the energy sector.
libcimpp is a serialiser & deserialiser library for C++ objects from XML/RDF documents based on the Common Information Model (CIM) standards (i.e. IEC61970/61968/62325) and CGMES for the energy sector.
It is part of the CIM++ project. More on CIM++ can be found [here](http://rdcu.be/vOop).

Supported CIM / CGMES versions:
Expand Down
9 changes: 4 additions & 5 deletions cmake/CIMppPackaging.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
set(CPACK_PACKAGE_NAME "libcimpp_${USE_CIM_VERSION}")
set(CPACK_PACKAGE_VENDOR "Institute for Automation of Complex Power Systems, RWTH Aachen University")
set(CPACK_PACKAGE_CONTACT "Lukas Razik <[email protected]>")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CIM++ is deserialiser library for C++ objects from XML/RDF documents based on CIM standards")
set(CPACK_PACKAGE_CONTACT "[email protected]")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libcimpp is a serialiser & deserialiser library for C++ objects from XML/RDF documents based on CIM standards")
set(CPACK_PACKAGE_VERSION_MAJOR ${libcimpp_MAJOR_VERSION})
set(CPACK_PACKAGE_VERSION_MINOR ${libcimpp_MINOR_VERSION})
set(CPACK_PACKAGE_VERSION_PATCH ${libcimpp_PATCH_VERSION})

set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/sogno-platform/libcimpp")
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://sogno.energy/libcimpp/" )
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")

set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0")
set(CPACK_RPM_PACKAGE_URL "https://github.com/sogno-platform/libcimpp")
set(CPACK_RPM_PACKAGE_URL "https://sogno.energy/libcimpp/")
set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")

set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
Expand Down
2 changes: 1 addition & 1 deletion package/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:latest

LABEL \
org.label-schema.schema-version = "2.1.0" \
org.label-schema.schema-version = "2.2.0" \
org.label-schema.name = "libcimpp" \
org.label-schema.license = "Apache-2.0" \
org.label-schema.vcs-url = "https://github.com/sogno-platform/libcimpp"
Expand Down