fix broken js building

- deps need to be defined before used
- incremental builds were not working properly
This commit is contained in:
Damien Elmes 2019-12-18 17:56:58 +10:00
parent aab765292a
commit c15f71071e
2 changed files with 6 additions and 8 deletions

View File

@ -66,6 +66,12 @@ REQS := .build/pyrunreqs .build/pydevreqs .build/jsreqs
(cd ts && npm i)
touch $@
# Typescript source
######################
TSDEPS := $(wildcard ts/src/*.ts)
JSDEPS := $(patsubst ts/src/%.ts, web/%.js, $(TSDEPS))
# Building
######################
@ -128,12 +134,6 @@ pytest: .build/pytest
pylint: .build/pylint
pytype: .build/pytype
# Typescript source
######################
TSDEPS := $(wildcard ts/src/*.ts)
JSDEPS := $(patsubst ts/src/%.ts, web/%.js, $(TSDEPS))
# Checking typescript
######################

View File

@ -8,8 +8,6 @@
],
"rootDir": "src",
"outDir": "../web",
"incremental": true,
"tsBuildInfoFile": "./.buildinfo",
"strict": true,
/* Enable all strict type-checking options. */
"noImplicitAny": false,