include generated js in aqt_data

This commit is contained in:
Damien Elmes 2020-06-29 13:47:54 +10:00
parent 4cc9e2a780
commit 1f4f5b8c45
4 changed files with 7 additions and 5 deletions

2
qt/.gitignore vendored
View file

@ -20,6 +20,8 @@ aqt_data/web/reviewer-bottom.js
aqt_data/web/reviewer.js aqt_data/web/reviewer.js
aqt_data/web/webview.js aqt_data/web/webview.js
aqt_data/web/toolbar.js aqt_data/web/toolbar.js
aqt_data/web/graphs*
aqt_data/web/*.css
dist dist
aqt.egg-info aqt.egg-info
build build

View file

@ -134,14 +134,16 @@ CHECKDEPS := $(shell "${FIND}" aqt tests -name '*.py' | grep -v buildinfo.py)
.PHONY: build .PHONY: build
build: .build/build build: .build/build
.build/build: $(BUILD_STEPS) $(CHECKDEPS) .build/build: $(BUILD_STEPS) $(CHECKDEPS) $(wildcard ../ts/dist/*)
rm -rf dist build rm -rf dist build
rsync -a ../ts/dist/ aqt_data/web/
python setup.py -q bdist_wheel python setup.py -q bdist_wheel
rsync -a dist/*.whl ../dist/ rsync -a dist/*.whl ../dist/
touch $@ touch $@
.PHONY: develop .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 aqt/buildinfo.py: ../meta/version ../meta/buildhash
echo "buildhash='$$(cat ../meta/buildhash)'" > $@ echo "buildhash='$$(cat ../meta/buildhash)'" > $@

View file

@ -1,2 +0,0 @@
*.css

View file

@ -37,7 +37,7 @@ build: .build/build
PHONY: develop PHONY: develop
develop: .build/build 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 npm run build
@touch $@ @touch $@