Bump siliconcompiler from 55a8350 to 6f85985

.github/workflows/bin/install_surelog_linux.sh

@@ -1,5 +1,5 @@
 # Get directory of setup scripts
-src_path=$(cd -- "$(dirname "$0")/../../../siliconcompiler" >/dev/null 2>&1 ; pwd -P)
+src_path=$(cd -- "$(dirname "$0")/../../../siliconcompiler/siliconcompiler/toolscripts" >/dev/null 2>&1 ; pwd -P)
 
 yum install -y libuuid-devel java-11-openjdk-devel python3 zlib-static
 
@@ -11,9 +11,9 @@ export ADDITIONAL_CMAKE_OPTIONS="-DPython3_ROOT_DIR=$PYTHON_ROOT -DPython3_FIND_
 mkdir build
 
 # Build surelog (install prefix defined outside file)
-git clone $(python3 ${src_path}/setup/_tools.py --tool surelog --field git-url) build/Surelog
+git clone $(python3 ${src_path}/_tools.py --tool surelog --field git-url) build/Surelog
 cd build/Surelog
-git checkout $(python3 ${src_path}/setup/_tools.py --tool surelog --field git-commit)
+git checkout $(python3 ${src_path}/_tools.py --tool surelog --field git-commit)
 git submodule update --init --recursive
 
 export LDFLAGS="-lrt"

.github/workflows/bin/install_surelog_macos.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Get directory of setup scripts
-src_path=$(cd -- "$(dirname "$0")/../../../siliconcompiler" >/dev/null 2>&1 ; pwd -P)
+src_path=$(cd -- "$(dirname "$0")/../../../siliconcompiler/siliconcompiler/toolscripts" >/dev/null 2>&1 ; pwd -P)
 
 # Install dependencies
 pip3 install orderedmultidict
@@ -10,9 +10,9 @@ pip3 install cmake
 mkdir build
 
 # Install Surelog
-git clone $(python3 ${src_path}/setup/_tools.py --tool surelog --field git-url) build/Surelog
+git clone $(python3 ${src_path}/_tools.py --tool surelog --field git-url) build/Surelog
 cd build/Surelog
-git checkout $(python3 ${src_path}/setup/_tools.py --tool surelog --field git-commit)
+git checkout $(python3 ${src_path}/_tools.py --tool surelog --field git-commit)
 git submodule update --init --recursive
 
 cmake --version # must be >=3.20

.github/workflows/bin/install_surelog_win.bat

@@ -32,8 +32,8 @@ pip3 install psutil
 
 git config --global core.autocrlf input
 
-for /f "tokens=* USEBACKQ" %%i in (`python3 siliconcompiler/setup/_tools.py --tool surelog --field git-url`) do set GITURL=%%i
-for /f "tokens=* USEBACKQ" %%i in (`python3 siliconcompiler/setup/_tools.py --tool surelog --field git-commit`) do set GITCOMMIT=%%i
+for /f "tokens=* USEBACKQ" %%i in (`python3 siliconcompiler/siliconcompiler/toolscripts/_tools.py --tool surelog --field git-url`) do set GITURL=%%i
+for /f "tokens=* USEBACKQ" %%i in (`python3 siliconcompiler/siliconcompiler/toolscripts/_tools.py --tool surelog --field git-commit`) do set GITCOMMIT=%%i
 
 mkdir build
 cd build

pyproject.toml

@@ -15,5 +15,5 @@ markers = [
 ]
 testpaths = "tests"
 pythonpath = [
-  "siliconcompiler/setup"
+  "siliconcompiler/siliconcompiler/toolscripts"
 ]