Skip to content

Commit 10d6cac

Browse files
authored
Prepare release v2.2.0 (#38)
- update cmake package info - remove deprecated gitlab-ci file - move Dockerfile into devcontainer folder
2 parents cc8c976 + 506c2d8 commit 10d6cac

File tree

7 files changed

+24
-32
lines changed

7 files changed

+24
-32
lines changed

.devcontainer/Dockerfile.dev

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM fedora:36
2+
3+
RUN dnf -y update
4+
5+
# Toolchain
6+
RUN dnf -y install \
7+
git \
8+
gcc-c++ \
9+
make \
10+
cmake \
11+
doxygen \
12+
graphviz \
13+
python3-pip \
14+
rpmdevtools \
15+
libxml2-devel

.devcontainer/devcontainer.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"name": "libcimpp",
3-
//"image": "",
43
"build": {
5-
"dockerfile": "../Dockerfile"
4+
"dockerfile": "Dockerfile.dev"
65
},
76
"customizations": {
87
"vscode": {
@@ -13,4 +12,4 @@
1312
]
1413
}
1514
}
16-
}
15+
}

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ else()
2727
endif()
2828

2929
set(libcimpp_MAJOR_VERSION 2)
30-
set(libcimpp_MINOR_VERSION 1)
30+
set(libcimpp_MINOR_VERSION 2)
3131
set(libcimpp_PATCH_VERSION 0)
3232
set(libcimpp_VERSION ${libcimpp_MAJOR_VERSION}.${libcimpp_MINOR_VERSION}.${libcimpp_PATCH_VERSION})
3333

Dockerfile

-21
This file was deleted.

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# libcimpp
22

3-
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.
3+
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.
44
It is part of the CIM++ project. More on CIM++ can be found [here](http://rdcu.be/vOop).
55

66
Supported CIM / CGMES versions:

cmake/CIMppPackaging.cmake

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
set(CPACK_PACKAGE_NAME "libcimpp_${USE_CIM_VERSION}")
2-
set(CPACK_PACKAGE_VENDOR "Institute for Automation of Complex Power Systems, RWTH Aachen University")
3-
set(CPACK_PACKAGE_CONTACT "Lukas Razik <[email protected]>")
4-
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CIM++ is deserialiser library for C++ objects from XML/RDF documents based on CIM standards")
2+
set(CPACK_PACKAGE_CONTACT "[email protected]")
3+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libcimpp is a serialiser & deserialiser library for C++ objects from XML/RDF documents based on CIM standards")
54
set(CPACK_PACKAGE_VERSION_MAJOR ${libcimpp_MAJOR_VERSION})
65
set(CPACK_PACKAGE_VERSION_MINOR ${libcimpp_MINOR_VERSION})
76
set(CPACK_PACKAGE_VERSION_PATCH ${libcimpp_PATCH_VERSION})
87

98
set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
10-
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/sogno-platform/libcimpp")
9+
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://sogno.energy/libcimpp/" )
1110
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
1211

1312
set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0")
14-
set(CPACK_RPM_PACKAGE_URL "https://github.com/sogno-platform/libcimpp")
13+
set(CPACK_RPM_PACKAGE_URL "https://sogno.energy/libcimpp/")
1514
set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
1615

1716
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")

package/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM ubuntu:latest
22

33
LABEL \
4-
org.label-schema.schema-version = "2.1.0" \
4+
org.label-schema.schema-version = "2.2.0" \
55
org.label-schema.name = "libcimpp" \
66
org.label-schema.license = "Apache-2.0" \
77
org.label-schema.vcs-url = "https://github.com/sogno-platform/libcimpp"

0 commit comments

Comments
 (0)