diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml deleted file mode 100644 index c23ff16..0000000 --- a/.github/workflows/appimage.yml +++ /dev/null @@ -1,31 +0,0 @@ -on: - push: - tags: - - "*" - -name: AppImage - -jobs: - build_appimage: - name: Build AppImage - runs-on: ubuntu-20.04 - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Get the version - id: get_version - run: | - export VERSION_NUM=$(ruby -e "print '$GITHUB_REF'.split('/')[2]") - echo ::set-output name=value::${VERSION_NUM} - - name: Build - run: | - cd appimage - export FAULT_IMAGE_NAME=ghcr.io/aucohl/fault:${{ steps.get_version.outputs.value }} - make - - name: Copy AppImage - run: | - cp ./appimage/Fault-x86_64.AppImage /tmp/Fault-${{ steps.get_version.outputs.value }}-x86_64.AppImage - - name: Upload Release Asset - uses: softprops/action-gh-release@v1 - with: - files: /tmp/Fault-${{ steps.get_version.outputs.value }}-x86_64.AppImage diff --git a/Dockerfile b/Dockerfile index c2b1b33..0e6332c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,9 +60,6 @@ WORKDIR / COPY requirements.txt /requirements.txt RUN python3 -m pip install --target /build/lib/pythonpath --upgrade -r ./requirements.txt -ENV PYTHONPATH=/build/lib/pythonpath - -# Copy Libraries for AppImage RUN cp /lib64/libtinfo.so.5 /build/lib RUN cp /lib64/libffi.so.6 /build/lib RUN cp /lib64/libz.so.1 /build/lib @@ -75,8 +72,18 @@ COPY . . ENV CC=clang ENV CXX=clang++ RUN swift build --static-swift-stdlib -c release -RUN swift test RUN cp /fault/.build/x86_64-unknown-linux-gnu/release/Fault /build/bin/fault + +## Tests +ENV PATH=/build/bin:$PATH\ + PYTHON_LIBRARY=/build/lib/libpython3.6m.so\ + PYTHONPATH=/build/lib/pythonpath\ + LD_LIBRARY_PATH=/build/lib\ + FAULT_IVL_BASE=/build/lib/ivl\ + FAULT_IVERILOG=/build/bin/iverilog\ + FAULT_VVP=/build/bin/vvp +RUN swift test + WORKDIR / # --- diff --git a/OSAcknowledgements b/OSAcknowledgements index 7763732..56a1f45 100644 --- a/OSAcknowledgements +++ b/OSAcknowledgements @@ -202,19 +202,6 @@ Pyverilog, Tensorflow for Swift/PythonKit, CommandLineKit, OpenLane WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ---- -Magic (AppImage Build Files) - -Copyright (C) 2022 R. Timothy Edwards - -Permission to use, copy, modify, and distribute this -software and its documentation for any purpose and without -fee is hereby granted, provided that the above copyright -notice appear in all copies. The University of California -makes no representations about the suitability of this -software for any purpose. It is provided "as is" without -express or implied warranty. Export of this software outside -of the United States of America may require an export license. --- Python Lex-Yacc @@ -226,4 +213,4 @@ Redistribution and use in source and binary forms, with or without modification, Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of the David Beazley or Dabeaz LLC may be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Readme.md b/Readme.md index f74ec70..2f80d0b 100644 --- a/Readme.md +++ b/Readme.md @@ -1,5 +1,5 @@ # 🧪 Fault -![Swift 5.4+](https://img.shields.io/badge/Swift-5.4-orange?logo=swift) ![Docker Image Available for x86-64](https://img.shields.io/static/v1?logo=docker&label=docker&message=x86_64) ![AppImage Available for Linux x86-64](https://img.shields.io/static/v1?label=appimage&message=x86_64&color=blue) +![Swift 5.4+](https://img.shields.io/badge/Swift-5.4-orange?logo=swift) ![Docker Image Available for x86-64](https://img.shields.io/static/v1?logo=docker&label=docker&message=x86_64) Fault is a complete open source design for testing (DFT) Solution that includes automatic test pattern generation for netlists, scan chain stitching, synthesis scripts and a number of other convenience features. diff --git a/Sources/Fault/Entries/main.swift b/Sources/Fault/Entries/main.swift index 4c1c44f..6e7eea3 100644 --- a/Sources/Fault/Entries/main.swift +++ b/Sources/Fault/Entries/main.swift @@ -21,7 +21,7 @@ import Foundation import PythonKit import Yams -let VERSION = "0.6.2" +let VERSION = "0.7.0" var env = ProcessInfo.processInfo.environment let iverilogBase = env["FAULT_IVL_BASE"] ?? "/usr/local/lib/ivl" diff --git a/appimage/.gitignore b/appimage/.gitignore deleted file mode 100644 index d6ae932..0000000 --- a/appimage/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -*.tar.gz -build/ -*.AppImage -appimagetool -squashfs-root \ No newline at end of file diff --git a/appimage/Makefile b/appimage/Makefile deleted file mode 100644 index cc8c45e..0000000 --- a/appimage/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -RESOURCES = $(shell find rsc/ -type f) -ARCH = $(shell uname -m) -APPIMAGE = Fault-$(ARCH).AppImage -FAULT_IMAGE_NAME ?= aucohl/fault:latest - -all: $(APPIMAGE) - -.PHONY: squashfs-root/build/bin/fault -squashfs-root/build/bin/fault: ../Dockerfile Makefile - rm -rf squashfs-root - mkdir -p ./squashfs-root/lib ;\ - id=$$(docker create $(FAULT_IMAGE_NAME)) ; \ - docker cp $$id:/build ./squashfs-root/build ; \ - docker rm -v $$id - -appimagetool: - curl -L https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage > ./appimagetool - chmod +x ./appimagetool - -$(APPIMAGE): squashfs-root/build/bin/fault appimagetool $(RESOURCES) - cp $(RESOURCES) ./squashfs-root - mkdir -p ./squashfs-root/test - cp ../Tests/RTL/spm/spm.v ./squashfs-root/test/spm.v - cp -r ../Tech/osu035 ./squashfs-root/test/osu035 - ./appimagetool ./squashfs-root - -PREFIX ?= /usr/local -install: - install $(APPIMAGE) $(PREFIX)/bin/fault - -.PHONY: clean -clean: - rm -f *.AppImage - rm -rf squashfs-root - rm -rf build diff --git a/appimage/README.md b/appimage/README.md deleted file mode 100644 index 2b5b151..0000000 --- a/appimage/README.md +++ /dev/null @@ -1,20 +0,0 @@ -This is an AppImage that runs on all GNU/Linux platforms with: - -* FUSE - * This excludes non-privileged Docker containers unfortunately, unless pre-extracted. -* GLIBC 2.17+ - -That's most Linux distributions released in 2016 or later. - -Circuit icon by Icons8 - -# Building Requirements -* A reasonably recent GNU/Linux host -* Docker 20+ -* curl - -# Build Instructions -`make` - -# Installation Instructions -`make install` diff --git a/appimage/rsc/AppRun b/appimage/rsc/AppRun deleted file mode 100755 index d732fa9..0000000 --- a/appimage/rsc/AppRun +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -export CURDIR=$(dirname $(readlink -f "${0}")) -export PATH="${CURDIR}/build/bin:${CURDIR}/usr/bin:$PATH" -export LD_LIBRARY_PATH="${CURDIR}/build/lib:${CURDIR}/usr/lib:$LD_LIBRARY_PATH" -export FAULT_IVL_BASE="${CURDIR}/build/lib/ivl" -export FAULT_IVERILOG="${CURDIR}/build/bin/iverilog" -export FAULT_VVP="${CURDIR}/build/bin/vvp" -export PYTHON_LIBRARY="${CURDIR}/build/lib/libpython3.6m.so" -export PYTHONPATH="${CURDIR}/build/lib/pythonpath" - -if [ "$1" = "smoke-test" ]; then - python3 ${CURDIR}/test/smoke_test.py -else - exec "${CURDIR}/build/bin/fault" $@ -fi \ No newline at end of file diff --git a/appimage/rsc/fault.desktop b/appimage/rsc/fault.desktop deleted file mode 100644 index b9525c0..0000000 --- a/appimage/rsc/fault.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Fault -Icon=fault -Exec=fault -Comment=Fault, a full open source DFT solution -Categories=Development; -Terminal=true \ No newline at end of file diff --git a/appimage/rsc/fault.svg b/appimage/rsc/fault.svg deleted file mode 100644 index 392cc47..0000000 --- a/appimage/rsc/fault.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - -