Skip to content

Commit

Permalink
Merge pull request #769 from davidgiven/ab
Browse files Browse the repository at this point in the history
Update ab.
  • Loading branch information
davidgiven authored Sep 11, 2024
2 parents 241878b + 0e83b2e commit fb05b6a
Show file tree
Hide file tree
Showing 16 changed files with 623 additions and 577 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: CXXFLAGS="-Wp,-D_GLIBCXX_ASSERTIONS" make -j`nproc` -C fluxengine

build-macos-current:
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ all: +all README.md
binaries: all
tests: all

README.md: $(OBJ)/scripts/+mkdocindex/+mkdocindex$(EXT)
README.md: $(OBJ)/scripts/+mkdocindex/mkdocindex$(EXT)
@echo MKDOC $@
@csplit -s -f$(OBJ)/README. README.md '/<!-- FORMATSSTART -->/' '%<!-- FORMATSEND -->%'
@(cat $(OBJ)/README.00 && $< && cat $(OBJ)/README.01) > README.md
Expand Down
7 changes: 3 additions & 4 deletions build/ab.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ EXT ?=

include $(OBJ)/build.mk

MAKEFLAGS += -r
MAKEFLAGS += -r -j$(shell nproc)
.DELETE_ON_ERROR:

.PHONY: update-ab
Expand All @@ -50,6 +50,5 @@ build-files = $(shell find . -name 'build.py') $(wildcard build/*.py) $(wildcard
$(OBJ)/build.mk: Makefile $(build-files)
@echo "AB"
@mkdir -p $(OBJ)
$(hide) $(PYTHON) -X pycache_prefix=$(OBJ) build/ab.py $(patsubst %,-t %,$(TARGETS)) -o $@ \
build.py || rm -f $@

$(hide) $(PYTHON) -X pycache_prefix=$(OBJ) build/ab.py -o $@ build.py \
|| rm -f $@
Loading

0 comments on commit fb05b6a

Please sign in to comment.