output into dist/

This commit is contained in:
Damien Elmes 2020-01-03 14:32:26 +10:00
parent 253d429a8b
commit e2ede3af0e
6 changed files with 9 additions and 7 deletions

2
.gitignore vendored
View file

@ -6,7 +6,7 @@
.build .build
.coverage .coverage
.DS_Store .DS_Store
build dist
pyenv pyenv
.mypy_cache .mypy_cache
__pycache__ __pycache__

View file

2
clean
View file

@ -4,6 +4,8 @@ set -e
. scripts.inc . scripts.inc
rm -rf dist
for dir in $DEVEL; do for dir in $DEVEL; do
echo $dir echo $dir
(cd $dir && make clean) (cd $dir && make clean)

View file

@ -9,7 +9,7 @@ RUNARGS :=
BLACKARGS := -t py36 anki tests --exclude='backend_pb2|buildhash' BLACKARGS := -t py36 anki tests --exclude='backend_pb2|buildhash'
ISORTARGS := anki tests ISORTARGS := anki tests
$(shell mkdir -p .build ../build) $(shell mkdir -p .build ../dist)
PHONY: all PHONY: all
all: check all: check
@ -80,7 +80,7 @@ build: $(BUILD_STEPS) $(CHECKDEPS)
rm -rf dist rm -rf dist
echo "build='$$(git rev-parse --short HEAD)'" > anki/buildhash.py echo "build='$$(git rev-parse --short HEAD)'" > anki/buildhash.py
python setup.py bdist_wheel python setup.py bdist_wheel
rsync -a dist/*.whl ../build/ rsync -a dist/*.whl ../dist/
# prepare code for running in place # prepare code for running in place
.PHONY: develop .PHONY: develop

View file

@ -9,7 +9,7 @@ MAKEFLAGS += --no-builtin-rules
BLACKARGS := -t py36 aqt tests --exclude=aqt/forms BLACKARGS := -t py36 aqt tests --exclude=aqt/forms
ISORTARGS := aqt tests ISORTARGS := aqt tests
$(shell mkdir -p .build ../build) $(shell mkdir -p .build ../dist)
PHONY: all PHONY: all
all: check all: check
@ -103,7 +103,7 @@ CHECKDEPS := $(shell find aqt tests -name '*.py')
build: $(BUILD_STEPS) build: $(BUILD_STEPS)
rm -rf dist rm -rf dist
python setup.py bdist_wheel python setup.py bdist_wheel
rsync -a dist/*.whl ../build/ rsync -a dist/*.whl ../dist/
.PHONY: develop .PHONY: develop
develop: $(BUILD_STEPS) develop: $(BUILD_STEPS)

View file

@ -4,9 +4,9 @@ SHELL := bash
MAKEFLAGS += --warn-undefined-variables MAKEFLAGS += --warn-undefined-variables
MAKEFLAGS += --no-builtin-rules MAKEFLAGS += --no-builtin-rules
$(shell mkdir -p .build ../build) $(shell mkdir -p .build ../dist)
OUTDIR := ../build OUTDIR := ../dist
BUILDFLAGS := --release --strip BUILDFLAGS := --release --strip
.PHONY: all develop build check fix clean .PHONY: all develop build check fix clean