From b549b2014407408282e69142e5137911f80200e3 Mon Sep 17 00:00:00 2001 From: Andrew Pennebaker Date: Fri, 5 Jan 2024 21:31:50 -0600 Subject: [PATCH] update rust; update unmake --- .tool-versions | 2 +- README.md | 2 +- install.mk | 2 +- makefile | 1 + procedural/asm/gas/riscv64/hello/GNUmakefile | 34 +++++++--------- procedural/asm/gas/x86/hello/GNUmakefile | 41 ++++++++++---------- rtl/systemverilog/fulladder_chain/makefile | 2 +- scripting/shell/unix/tcsh/makefile | 18 ++++----- 8 files changed, 48 insertions(+), 54 deletions(-) diff --git a/.tool-versions b/.tool-versions index 07d6a792..93cc707d 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ golang 1.21.5 nodejs 20.10.0 python 3.12.1 -rust 1.68.2 +rust 1.75.0 diff --git a/README.md b/README.md index dd4a9cb8..379cf8f2 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ BSD-2-Clause * [Go](https://go.dev/) 1.21.5+ * [Node.js](https://www.npmjs.com/) 20.10.0+ * [Python](https://www.python.org/) 3.12.1+ -* [Rust](https://www.rust-lang.org/en-US/) 1.68.2+ +* [Rust](https://www.rust-lang.org/en-US/) 1.75.0+ * [GNU findutils](https://www.gnu.org/software/findutils/) * [GNU grep](https://www.gnu.org/software/grep/) * a POSIX compliant [make](https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html) implementation (e.g. GNU make, BSD make, etc.) diff --git a/install.mk b/install.mk index 640d13b3..04bc7394 100644 --- a/install.mk +++ b/install.mk @@ -3,7 +3,7 @@ .PHONY: all all: - cargo install --force unmake@0.0.12 + cargo install --force unmake@0.0.14 go install github.com/mcandre/slick/cmd/slick@v0.0.6 go install github.com/mcandre/stank/...@v0.0.24 diff --git a/makefile b/makefile index adc3fc22..f9b11c22 100644 --- a/makefile +++ b/makefile @@ -53,6 +53,7 @@ slick: unmake: unmake . + unmake -n . yamllint: yamllint -s .yamllint . diff --git a/procedural/asm/gas/riscv64/hello/GNUmakefile b/procedural/asm/gas/riscv64/hello/GNUmakefile index 86539e1b..bf7f5414 100644 --- a/procedural/asm/gas/riscv64/hello/GNUmakefile +++ b/procedural/asm/gas/riscv64/hello/GNUmakefile @@ -1,4 +1,9 @@ -.PHONY: all lint test clean +.PHONY: \ + all \ + lint \ + test \ + unmake \ + clean HOST_ARCH=$(shell uname -m) @@ -14,28 +19,19 @@ OBJ=hello.o all: test test: $(BIN) - @$(BIN) + $(BIN) $(BIN): $(OBJ) - @mkdir -p bin - @$(TOOLCHAIN_PREFIX)ld -o $(BIN) $(OBJ) + mkdir -p bin + $(TOOLCHAIN_PREFIX)ld -o $(BIN) $(OBJ) $(OBJ): hello.s - @$(TOOLCHAIN_PREFIX)as -o $(OBJ) hello.s - -checkmake: - @find . \ - -type f \ - \( \ - -iname Makefile -o \ - -iname GNUmakefile -o \ - -iname '*.mk' -o \ - -iname '*.make' \ - \) \ - -print0 | \ - xargs -0 -n 1 checkmake - -lint: checkmake + $(TOOLCHAIN_PREFIX)as -o $(OBJ) hello.s + +unmake: + unmake . + +lint: unmake clean: -rm -rf bin diff --git a/procedural/asm/gas/x86/hello/GNUmakefile b/procedural/asm/gas/x86/hello/GNUmakefile index 67654f84..aa8af474 100644 --- a/procedural/asm/gas/x86/hello/GNUmakefile +++ b/procedural/asm/gas/x86/hello/GNUmakefile @@ -1,4 +1,12 @@ -.PHONY: all lint test clean +.POSIX: +.SILENT: +.IGNORE: clean +.PHONY: \ + all \ + lint \ + test \ + unmake \ + clean # Linux defaults BIN=bin/hello @@ -7,29 +15,20 @@ OBJ=hello.o all: test test: $(BIN) - @$(BIN) + $(BIN) $(BIN): $(OBJ) - @mkdir -p bin - @ld -o $(BIN) $(OBJ) + mkdir -p bin + ld -o $(BIN) $(OBJ) $(OBJ): hello.s - @as -o $(OBJ) hello.s - -checkmake: - @find . \ - -type f \ - \( \ - -iname Makefile -o \ - -iname GNUmakefile -o \ - -iname '*.mk' -o \ - -iname '*.make' \ - \) \ - -print0 | \ - xargs -0 -n 1 checkmake - -lint: checkmake + as -o $(OBJ) hello.s + +unmake: + unmake . + +lint: unmake clean: - -rm -rf bin - -rm $(OBJ) + rm -rf bin + rm $(OBJ) diff --git a/rtl/systemverilog/fulladder_chain/makefile b/rtl/systemverilog/fulladder_chain/makefile index 2361a2d7..4f214f70 100644 --- a/rtl/systemverilog/fulladder_chain/makefile +++ b/rtl/systemverilog/fulladder_chain/makefile @@ -9,7 +9,7 @@ ARTIFACT=obj_dir/Vfulladder_chain all: test -$(ARTIFACT): Makefile main.cpp fulladder_chain.sv fulladder.sv +$(ARTIFACT): main.cpp fulladder_chain.sv fulladder.sv verilator \ -Wall \ -Wno-UNOPTFLat \ diff --git a/scripting/shell/unix/tcsh/makefile b/scripting/shell/unix/tcsh/makefile index 50cc778a..00929a85 100644 --- a/scripting/shell/unix/tcsh/makefile +++ b/scripting/shell/unix/tcsh/makefile @@ -1,18 +1,16 @@ .POSIX: -.PHONY: all lint funk unmake test clean +.PHONY: \ + all \ + lint \ + funk \ + unmake all: lint funk: - @funk . + funk . unmake: - @unmake . + unmake . -lint: funk checkmake - -test: - @echo "nothing to do" - -clean: - @echo "nothing to do" +lint: funk unmake