diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 994abc41..1b1276a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,7 +109,7 @@ build_scala_tapasco_centos_8: - ./gradlew buildRPM artifacts: paths: - - toolflow/scala/build/distributions/tapasco-2019-10.x86_64.rpm + - toolflow/scala/build/distributions/tapasco-2020-04.x86_64.rpm build_scala_tapasco_fedora_30: image: fedora:30 @@ -136,7 +136,7 @@ build_scala_tapasco_fedora_31: - ./gradlew buildDEB artifacts: paths: - - toolflow/scala/build/distributions/tapasco_2019-10_amd64.deb + - toolflow/scala/build/distributions/tapasco_2020-04_amd64.deb build_scala_tapasco_ubuntu_16_04: image: ubuntu:xenial @@ -357,7 +357,7 @@ tapasco_compose_ubuntu: - source $XILINX_VIVADO/settings64.sh - apt-get -y update - apt-get -y install libtinfo5 build-essential - - apt -y install ./toolflow/scala/build/distributions/tapasco_2019-10_amd64.deb + - apt -y install ./toolflow/scala/build/distributions/tapasco_2020-04_amd64.deb - /opt/tapasco/tapasco-init-toolflow.sh - source tapasco-setup-toolflow.sh - tapasco -v hls counter -p pynq @@ -384,7 +384,7 @@ tapasco_compose_ubuntu: - source $XILINX_VIVADO/settings64.sh - which vivado - which vivado_hls - - dnf -y install toolflow/scala/build/distributions/tapasco-2019-10.x86_64.rpm + - dnf -y install toolflow/scala/build/distributions/tapasco-2020-04.x86_64.rpm - /opt/tapasco/tapasco-init-toolflow.sh - source tapasco-setup-toolflow.sh - tapasco hls counter -p $PLATFORM --skipEvaluation diff --git a/README.md b/README.md index 8091deda..5923281d 100644 --- a/README.md +++ b/README.md @@ -176,27 +176,27 @@ We provided pre-compiled packages for many popular Linux distributions. All pack ### Ubuntu 16.04 [Kernel Driver](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_16_04) [Kernel Driver Debug](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_16_04_debug) -[Runtime (DEB)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2019.10.0-Linux.deb?job=build_tapasco_ubuntu_16_04) -[Runtime Debug (DEB)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2019.10.0-Linux.deb?job=build_tapasco_ubuntu_16_04_debug) -[Toolflow](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2019-10_amd64.deb?job=build_scala_tapasco_ubuntu_16_04) +[Runtime (DEB)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2020.04.0-Linux.deb?job=build_tapasco_ubuntu_16_04) +[Runtime Debug (DEB)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2020.04.0-Linux.deb?job=build_tapasco_ubuntu_16_04_debug) +[Toolflow](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2020-04_amd64.deb?job=build_scala_tapasco_ubuntu_16_04) ### Ubuntu 18.04 [Kernel Driver](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04) [Kernel Driver Debug](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_ubuntu_18_04_debug) -[Runtime (DEB)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2019.10.0-Linux.deb?job=build_tapasco_ubuntu_18_04) -[Runtime Debug (DEB)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2019.10.0-Linux.deb?job=build_tapasco_ubuntu_18_04_debug) -[Toolflow](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2019-10_amd64.deb?job=build_scala_tapasco_ubuntu_18_04) +[Runtime (DEB)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2020.04.0-Linux.deb?job=build_tapasco_ubuntu_18_04) +[Runtime Debug (DEB)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2020.04.0-Linux.deb?job=build_tapasco_ubuntu_18_04_debug) +[Toolflow](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco_2020-04_amd64.deb?job=build_scala_tapasco_ubuntu_18_04) ### Fedora 30 [Kernel Driver](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_30) [Kernel Driver Debug](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_30_debug) -[Runtime (RPM)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2019.10.0-Linux.rpm?job=build_tapasco_fedora_30) -[Runtime Debug (RPM)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2019.10.0-Linux.rpm?job=build_tapasco_fedora_30_debug) -[Toolflow](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2019-10.x86_64.rpm?job=build_scala_tapasco_fedora_30) +[Runtime (RPM)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2020.04.0-Linux.rpm?job=build_tapasco_fedora_30) +[Runtime Debug (RPM)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2020.04.0-Linux.rpm?job=build_tapasco_fedora_30_debug) +[Toolflow](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2020-04.x86_64.rpm?job=build_scala_tapasco_fedora_30) ### Fedora 31 [Kernel Driver](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_31) [Kernel Driver Debug](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/runtime/kernel/tlkm.ko?job=build_kernel_fedora_31_debug) -[Runtime (RPM)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2019.10.0-Linux.rpm?job=build_tapasco_fedora_31) -[Runtime Debug (RPM)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2019.10.0-Linux.rpm?job=build_tapasco_fedora_31_debug) -[Toolflow](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2019-10.x86_64.rpm?job=build_scala_tapasco_fedora_31) +[Runtime (RPM)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2020.04.0-Linux.rpm?job=build_tapasco_fedora_31) +[Runtime Debug (RPM)](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/build/tapasco-2020.04.0-Linux.rpm?job=build_tapasco_fedora_31_debug) +[Toolflow](https://git.esa.informatik.tu-darmstadt.de/tapasco/tapasco/-/jobs/artifacts/master/raw/toolflow/scala/build/distributions/tapasco-2020-04.x86_64.rpm?job=build_scala_tapasco_fedora_31) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 591e067c..8f66de7b 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -22,8 +22,8 @@ project(tapasco VERSION 1.0 LANGUAGES C CXX) SET(CPACK_GENERATOR "RPM" "DEB" "TGZ" "ZIP" "STGZ" "TBZ2") SET(CPACK_PACKAGE_CONTACT "tapasco@esa.tu-darmstadt.de") -SET(CPACK_PACKAGE_VERSION_MAJOR 2019) -SET(CPACK_PACKAGE_VERSION_MINOR 10) +SET(CPACK_PACKAGE_VERSION_MAJOR 2020) +SET(CPACK_PACKAGE_VERSION_MINOR 04) SET(CPACK_PACKAGE_VERSION_PATCH 0) INCLUDE(CPack) diff --git a/toolflow/os-package/tapasco-init-toolflow.sh b/toolflow/os-package/tapasco-init-toolflow.sh index 99753749..5cc0d251 100755 --- a/toolflow/os-package/tapasco-init-toolflow.sh +++ b/toolflow/os-package/tapasco-init-toolflow.sh @@ -1,3 +1,22 @@ +# Copyright (c) 2014-2020 Embedded Systems and Applications, TU Darmstadt. +# +# This file is part of TaPaSCo +# (see https://github.com/esa-tu-darmstadt/tapasco). +# +# This program 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 3 of the License, or +# (at your option) 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 Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# + if [ -f "tapasco-setup-toolflow.sh" ]; then echo "tapasco-setup-toolflow.sh already exists." else diff --git a/toolflow/scala/build.gradle b/toolflow/scala/build.gradle index 3d723de8..e657b923 100644 --- a/toolflow/scala/build.gradle +++ b/toolflow/scala/build.gradle @@ -71,8 +71,8 @@ application { ospackage { packageName = "tapasco" - version = "2019" - release = "10" + version = "2020" + release = "04" license = "GNU Lesser General Public License v3.0" vendor = "Embedded Systems and Applications Group, TU Darmstadt" url = "https://github.com/esa-tu-darmstadt/tapasco" diff --git a/toolflow/vivado/common/common.tcl b/toolflow/vivado/common/common.tcl index 973c016f..eba35ab2 100644 --- a/toolflow/vivado/common/common.tcl +++ b/toolflow/vivado/common/common.tcl @@ -105,7 +105,7 @@ namespace eval tapasco { # Returns the Tapasco version. proc get_tapasco_version {} { - return "2019.10" + return "2020.4" } # Returns the interface pin groups for all AXI MM interfaces on cell.