a little experimentation with adiabatic circuitry, a little bit of cl…

…eanup
broccolimicro · Sep 20, 2024 · 6fec24e · 6fec24e
1 parent 0c2ad57
commit 6fec24e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
@@ -61,22 +61,19 @@ 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
 
       - name: Build binary on Windows
         if: matrix.os == 'windows-latest'
         shell: msys2 {0}
         run: |
-          make lib
           make windows
 
       - name: Upload Release Asset

diff --git 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
diff --git a/lib/interpret_prs b/lib/interpret_prs
diff --git a/lib/parse_prs b/lib/parse_prs
diff --git a/lib/prs b/lib/prs
+51 −26		src/build.cpp
+15 −9		src/main.cpp
+0 −7		src/plot.h
+4 −4		src/show.cpp
+7 −0		src/show.h
+12 −202		src/sim.cpp
+173 −0		src/vcd.cpp
+27 −0		src/vcd.h
+185 −0		src/verify.cpp
+7 −0		src/verify.h
+4 −1		interpret_prs/export.cpp
+3 −0		interpret_prs/import.cpp
+14 −1		parse_prs/production_rule.cpp
+1 −0		parse_prs/production_rule.h
+57 −52		prs/production_rule.cpp
+7 −1		prs/production_rule.h
+11 −1		prs/simulator.cpp
+2 −0		prs/simulator.h
+1 −2		prs/synthesize.cpp