|
@@ -4,7 +4,7 @@ PROFILE ?= dev |
|
@@ -4,7 +4,7 @@ PROFILE ?= dev |
|
4
|
ifeq "$(PROFILE)" "release"
|
4
|
ifeq "$(PROFILE)" "release"
|
|
5
|
CARGO_PROFILE = --release
|
5
|
CARGO_PROFILE = --release
|
|
6
|
WASM_PROFILE = --release
|
6
|
WASM_PROFILE = --release
|
|
7
|
-WASM_EXTRA = --no-default-features
|
7
|
+WASM_EXTRA = --no-default-features --features wee_alloc
|
|
8
|
else
|
8
|
else
|
|
9
|
CARGO_PROFILE =
|
9
|
CARGO_PROFILE =
|
|
10
|
WASM_PROFILE = --dev
|
10
|
WASM_PROFILE = --dev
|
|
@@ -17,20 +17,20 @@ endef |
|
@@ -17,20 +17,20 @@ endef |
|
17
|
|
17
|
|
|
18
|
start:
|
18
|
start:
|
|
19
|
systemfd --no-pid -s 0.0.0.0:3000 -- \
|
19
|
systemfd --no-pid -s 0.0.0.0:3000 -- \
|
|
20
|
- cargo watch -i static/ -s "make run"
|
20
|
+ cargo watch -i static/ -s "PROFILE=$(PROFILE) make run"
|
|
21
|
|
21
|
|
|
22
|
wasm:
|
22
|
wasm:
|
|
23
|
$(call msg,BUILD WASM UI)
|
23
|
$(call msg,BUILD WASM UI)
|
|
24
|
- @wasm-pack build $(WASM_PROFILE) -d ../static/ui -t web ./ui -- \
|
|
|
|
25
|
- $(WASM_EXTRA)
|
24
|
+ @PROFILE=$(PROFILE) wasm-pack build $(WASM_PROFILE) -d ../static/ui \
|
|
|
|
25
|
+ -t web ./ui -- $(WASM_EXTRA)
|
|
26
|
|
26
|
|
|
27
|
build:
|
27
|
build:
|
|
28
|
$(call msg,BUILD SERVER)
|
28
|
$(call msg,BUILD SERVER)
|
|
29
|
- @cargo build $(CARGO_PROFILE) --bin artshop-server
|
29
|
+ @PROFILE=$(PROFILE) cargo build $(CARGO_PROFILE) --bin artshop-server
|
|
30
|
|
30
|
|
|
31
|
run: build wasm
|
31
|
run: build wasm
|
|
32
|
$(call msg,RUN SERVER)
|
32
|
$(call msg,RUN SERVER)
|
|
33
|
- @cargo run $(CARGO_PROFILE) --bin artshop-server
|
33
|
+ @PROFILE=$(PROFILE) cargo run $(CARGO_PROFILE) --bin artshop-server
|
|
34
|
|
34
|
|
|
35
|
release:
|
35
|
release:
|
|
36
|
docker build -t artshop -f build/Dockerfile .
|
36
|
docker build -t artshop -f build/Dockerfile .
|