From 288f0577f19721bb5589efea068a241a97217eda Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Fri, 22 Dec 2023 13:48:46 +0100 Subject: [PATCH] updates setup and scc --- .envrc | 8 ++++++++ .gitignore | 1 + Modulefile | 3 ++- requirements.txt | 1 + scc | 2 +- 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .envrc create mode 100644 requirements.txt diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..de09571 --- /dev/null +++ b/.envrc @@ -0,0 +1,8 @@ +module load ./Modulefile +distro=`/bin/lsb_release -i -s` +if [ $distro == "CentOS" ]; then + . /opt/rh/devtoolset-8/enable + . /opt/rh/rh-python38/enable +fi +layout python3 +[ -f .envrc.$USER ] && . .envrc.$USER diff --git a/.gitignore b/.gitignore index 5bae3aa..67d8511 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /.pydevproject /*.fst /*.gtkw +/.envrc.* diff --git a/Modulefile b/Modulefile index aea43b5..c81f3b1 100644 --- a/Modulefile +++ b/Modulefile @@ -12,5 +12,6 @@ if { $distro == "CentOS" && ![info exists ::env(PROJECT)] && ![info exists ::env puts stderr "Don't forget to execute 'scl enable devtoolset-7 llvm-toolset-7 bash'" } +module load tools/utilities module load tools/cmake - +module load tools/clang/14.0 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..f5ad00c --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +conan<2.0 diff --git a/scc b/scc index 94569ea..ffa0f2f 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 94569eac10c4b8b5e3be6f8bcea7412b6e91396b +Subproject commit ffa0f2f7ef98790984fa3786c36b8778c5b52237