diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index a214c2e..ab3da7e 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -61,14 +61,12 @@ jobs: - name: Build binary on Linux if: matrix.os == 'ubuntu-latest' run: | - make lib make linux shell: bash - name: Build binary on macOS if: matrix.os == 'macos-latest' run: | - make lib make macos shell: bash @@ -76,7 +74,6 @@ jobs: if: matrix.os == 'windows-latest' shell: msys2 {0} run: | - make lib make windows - name: Upload Release Asset diff --git a/Makefile b/Makefile index b8add13..28a0524 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ LIBS = \ all: lib -linux: +linux: lib mkdir -p lm-linux/usr/local/bin cp bin/ckt/lm lm-linux/usr/local/bin mkdir -p lm-linux/DEBIAN @@ -55,14 +55,16 @@ linux: echo "Description: Loom" >> lm-linux/DEBIAN/control echo " A programming language for quasi-delay insensitive asynchronous circuits" >> lm-linux/DEBIAN/control dpkg-deb --build --root-owner-group lm-linux + rm -rf debian lm-linux -windows: +windows: lib mkdir -p lm-windows cp bin/ckt/lm.exe lm-windows ldd lm-windows/lm.exe | grep "mingw64" | sed 's/.*\/mingw64/\/mingw64/g' | sed 's/ (.*$$//g' | xargs -I{} cp {} lm-windows zip -r lm-windows.zip lm-windows + rm -rf lm-windows -macos: +macos: lib cp bin/ckt/lm lm-macos lib: gdstk diff --git a/bin/ckt b/bin/ckt index 8600e6c..c0e8b2a 160000 --- a/bin/ckt +++ b/bin/ckt @@ -1 +1 @@ -Subproject commit 8600e6c6ab25e8613a997a07ec599c4b9b18baee +Subproject commit c0e8b2a68afee19d25470093974bfa7cd662b2e1 diff --git a/lib/interpret_prs b/lib/interpret_prs index 43a2d3e..81f07a0 160000 --- a/lib/interpret_prs +++ b/lib/interpret_prs @@ -1 +1 @@ -Subproject commit 43a2d3e49c539bddc78e2c25dd3f2c2c170b0f3b +Subproject commit 81f07a062a0e2624bfcf25da8c6753573a1571fa diff --git a/lib/parse_prs b/lib/parse_prs index a93e783..cfc2f6a 160000 --- a/lib/parse_prs +++ b/lib/parse_prs @@ -1 +1 @@ -Subproject commit a93e783e579ee9f6bf2ee8cf480379f598efbffc +Subproject commit cfc2f6ad300d34ccfb9922c764ca08c69f03aaca diff --git a/lib/prs b/lib/prs index d5d1ab7..c4ff247 160000 --- a/lib/prs +++ b/lib/prs @@ -1 +1 @@ -Subproject commit d5d1ab7476a32636505e345ce01648ba365fcd50 +Subproject commit c4ff2475c9b86d6bbd5ec816d494900ead991089