From 1f4f5b8c458f18eaf58edddb2c5d001279a8df30 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 29 Jun 2020 13:47:54 +1000 Subject: [PATCH] include generated js in aqt_data --- qt/.gitignore | 2 ++ qt/Makefile | 6 ++++-- qt/aqt_data/web/.gitignore | 2 -- ts/Makefile | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 qt/aqt_data/web/.gitignore diff --git a/qt/.gitignore b/qt/.gitignore index 3b37d2cc5..43f4d25ac 100644 --- a/qt/.gitignore +++ b/qt/.gitignore @@ -20,6 +20,8 @@ aqt_data/web/reviewer-bottom.js aqt_data/web/reviewer.js aqt_data/web/webview.js aqt_data/web/toolbar.js +aqt_data/web/graphs* +aqt_data/web/*.css dist aqt.egg-info build diff --git a/qt/Makefile b/qt/Makefile index c6d367064..e4800d8f5 100644 --- a/qt/Makefile +++ b/qt/Makefile @@ -134,14 +134,16 @@ CHECKDEPS := $(shell "${FIND}" aqt tests -name '*.py' | grep -v buildinfo.py) .PHONY: build build: .build/build -.build/build: $(BUILD_STEPS) $(CHECKDEPS) +.build/build: $(BUILD_STEPS) $(CHECKDEPS) $(wildcard ../ts/dist/*) rm -rf dist build + rsync -a ../ts/dist/ aqt_data/web/ python setup.py -q bdist_wheel rsync -a dist/*.whl ../dist/ touch $@ .PHONY: develop -develop: $(BUILD_STEPS) +develop: $(BUILD_STEPS) $(wildcard ../ts/dist/*) + rsync -a ../ts/dist/ aqt_data/web/ aqt/buildinfo.py: ../meta/version ../meta/buildhash echo "buildhash='$$(cat ../meta/buildhash)'" > $@ diff --git a/qt/aqt_data/web/.gitignore b/qt/aqt_data/web/.gitignore deleted file mode 100644 index 93d402b95..000000000 --- a/qt/aqt_data/web/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.css - diff --git a/ts/Makefile b/ts/Makefile index 96444a900..adb8bee89 100644 --- a/ts/Makefile +++ b/ts/Makefile @@ -37,7 +37,7 @@ build: .build/build PHONY: develop develop: .build/build -.build/build: .build/proto $(BUILDDEPS) $(wildcard src/*/*.svelte src/*/*.ts) +.build/build: .build/proto $(BUILDDEPS) $(wildcard src/*/*.svelte src/*/*.ts src/*/*.css) npm run build @touch $@