Skip to content
This repository was archived by the owner on Feb 29, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
# Project-wide dockerignore file
#
# SPDX-FileCopyrightText: 2017 Institute for Automation of Complex Power Systems, EONERC
# SPDX-License-Identifier: Apache-2.0

*
!thirdparty/criterion/
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# EditorConfig is awesome: http://EditorConfig.org
#
# SPDX-FileCopyrightText: 2017 Institute for Automation of Complex Power Systems, EONERC
# SPDX-License-Identifier: Apache-2.0

# top-most EditorConfig file
root = true
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Project-wide gitignore file
#
# SPDX-FileCopyrightText: 2017 Institute for Automation of Complex Power Systems, EONERC
# SPDX-License-Identifier: Apache-2.0

build/
.vscode/

Expand Down
43 changes: 30 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,30 @@
# GitLab CI configuration
#
# SPDX-FileCopyrightText: 2017 Institute for Automation of Complex Power Systems, EONERC
# SPDX-License-Identifier: Apache-2.0

variables:
GIT_SUBMODULE_STRATEGY: recursive
PREFIX: /usr/
DOCKER_TAG_DEV: ${CI_BUILD_REF_SLUG}
DOCKER_IMAGE_DEV: villas/fpga-dev

stages:
- prepare
- build
- test
- lint
- prepare
- build
- test

# Stage: lint
##############################################################################

reuse:
stage: lint
image:
name: fsfe/reuse:latest
entrypoint: [""]
script:
- reuse lint

# Stage: prepare
##############################################################################
Expand All @@ -16,33 +33,33 @@ stages:
docker-dev:
stage: prepare
script:
- docker build -t ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} .
- docker build -t ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV} .
tags:
- docker
- docker

# Stage: build
##############################################################################

build:source:
stage: build
script:
- mkdir build && cd build && cmake3 .. && make -j8
- mkdir build && cd build && cmake3 .. && make -j8
artifacts:
expire_in: 1 week
name: ${CI_PROJECT_NAME}-${CI_BUILD_REF}
paths:
- build/
- build/
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
tags:
- docker
- docker

# Stage: test
##############################################################################

test:unit:
stage: test
tags:
- docker
- docker
allow_failure: true
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
script: |
Expand All @@ -59,7 +76,7 @@ test:unit:
test:cppcheck:
stage: test
script:
- cppcheck -j $(nproc)
- cppcheck -j $(nproc)
--max-configs=32
--error-exitcode=1
--quiet
Expand All @@ -77,11 +94,11 @@ test:cppcheck:
-igpu/thirdparty | tee cppcheck.log
image: ${DOCKER_IMAGE_DEV}:${DOCKER_TAG_DEV}
dependencies:
- build:source
- build:source
tags:
- docker
- docker
artifacts:
when: on_failure
paths:
- cppcheck.log
- cppcheck.log
expose_as: cppcheck
5 changes: 5 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Git submodule list
#
# SPDX-FileCopyrightText: 2017 Institute for Automation of Complex Power Systems, EONERC
# SPDX-License-Identifier: Apache-2.0

[submodule "common"]
path = common
url = https://github.com/VILLASframework/common.git
Expand Down
8 changes: 8 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: VILLASfpga
Upstream-Contact: Steffen Vogel <post@steffenvogel.de>
Source: https://fein-aachen.org/en/projects/villas-fpga/

Files: .vscode/* doc/pictures/* etc/**.json
Copyright: 2018-2022, Institute for Automation of Complex Power Systems, EONERC
License: Apache-2.0
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Sourcecode import from VILLASnode project:
http://git.rwth-aachen.de/VILLASframework/VILLASnode

## License

SPDX-FileCopyrightText: 2017 Institute for Automation of Complex Power Systems, EONERC
SPDX-License-Identifier: Apache-2.0
25 changes: 5 additions & 20 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
## CMakeLists.txt
#
# @author Daniel Krebs <github@daniel-krebs.net>
# @copyright 2018-2022, Institute for Automation of Complex Power Systems, EONERC
# @license GNU General Public License (version 3)
#
# VILLASfpga
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# any later version.
#
# This program 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Author: Daniel Krebs <github@daniel-krebs.net>
# SPDX-FileCopyrightText: 2018 Institute for Automation of Complex Power Systems, EONERC
# SPDX-License-Identifier: Apache-2.0
##############################################################################

cmake_minimum_required(VERSION 3.5)
Expand Down Expand Up @@ -91,7 +76,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libvillas-fpga.pc" DESTINATION "${CMA
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${PROJECT_DESCRIPTION})
set(CPACK_PACKAGE_VENDOR ${PROJECT_VENDOR})
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.md")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSES/Apache-2.0.txt")
set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")

set(CPACK_PACKAGE_NAME "villas-fpga")
Expand All @@ -106,7 +91,7 @@ set(CPACK_SOURCE_IGNORE_FILES "/build/;/.git/;~$;${CPACK_SOURCE_IGNORE_FILES}")

set(CPACK_RPM_PACKAGE_RELEASE ${PROJECT_RELEASE})
set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0")
set(CPACK_RPM_PACKAGE_URL ${PROJECT_URL})
set(CPACK_RPM_PACKAGE_REQUIRES "libxil")
set(CPACK_RPM_PACKAGE_GROUP "Development/Libraries")
Expand Down
Loading