1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
From 2f3da2ef25943d468d6d992589979f1c92f3fb92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes@kyriasis.com>
Date: Sun, 29 Mar 2020 05:54:00 +0200
Subject: [PATCH 2/5] Remove bad build steps from makefiles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
Makefile | 2 +-
pylib/Makefile | 4 ++--
qt/Makefile | 2 +-
rslib/Makefile | 2 +-
rspy/Makefile | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index d99e115a..cffa2e30 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ buildhash:
fi
.PHONY: develop
-develop: pyenv buildhash prepare
+develop: pyenv buildhash
@set -eu -o pipefail ${SHELLFLAGS}; \
. "${ACTIVATE_SCRIPT}"; \
for dir in $(DEVEL); do \
diff --git a/pylib/Makefile b/pylib/Makefile
index 5cb14e09..8d8388c3 100644
--- a/pylib/Makefile
+++ b/pylib/Makefile
@@ -41,7 +41,7 @@ all: check
PROTODEPS := ../proto/backend.proto ../proto/fluent.proto
-.build/py-proto: .build/dev-deps $(PROTODEPS)
+.build/py-proto: $(PROTODEPS)
protoc --proto_path=../proto --python_out=anki --mypy_out=anki $(PROTODEPS)
perl -i'' -pe 's/from fluent_pb2/from anki.fluent_pb2/' anki/backend_pb2.pyi
perl -i'' -pe 's/import fluent_pb2/import anki.fluent_pb2/' anki/backend_pb2.py
@@ -54,7 +54,7 @@ PROTODEPS := ../proto/backend.proto ../proto/fluent.proto
python -m black -t py36 anki/hooks.py
@touch $@
-BUILD_STEPS := .build/vernum .build/run-deps .build/dev-deps anki/buildinfo.py .build/py-proto .build/hooks
+BUILD_STEPS := .build/vernum .build/run-deps .build/dev-deps anki/buildinfo.py .build/py-proto
# Checking
######################
diff --git a/qt/Makefile b/qt/Makefile
index 4fc6b482..b50d1868 100644
--- a/qt/Makefile
+++ b/qt/Makefile
@@ -64,7 +64,7 @@ TSDEPS := $(wildcard ts/src/*.ts) $(wildcard ts/scss/*.scss)
python -m black aqt/gui_hooks.py
@touch $@
-BUILD_STEPS := .build/vernum .build/run-deps .build/dev-deps .build/js .build/ui aqt/buildinfo.py .build/hooks .build/i18n
+BUILD_STEPS := .build/vernum .build/js .build/ui aqt/buildinfo.py .build/i18n
# Checking
######################
diff --git a/rslib/Makefile b/rslib/Makefile
index 7a18b53e..aa42c712 100644
--- a/rslib/Makefile
+++ b/rslib/Makefile
@@ -25,7 +25,7 @@ fix:
clean:
rm -rf .build target
-develop: .build/vernum ftl/repo
+develop: .build/vernum
ftl/repo:
(cd ftl && ./scripts/fetch-latest-translations)
diff --git a/rspy/Makefile b/rspy/Makefile
index 5eb9ea8f..ed401be9 100644
--- a/rspy/Makefile
+++ b/rspy/Makefile
@@ -52,7 +52,7 @@ all: develop
develop: .build/develop
-DEPS := .build/tools .build/vernum ../meta/buildhash \
+DEPS := .build/vernum ../meta/buildhash \
$(wildcard $(QT_FTL_TEMPLATES)/*.ftl) \
$(wildcard $(QT_FTL_LOCALES)/*/*.ftl) \
$(shell "${FIND}" ../rslib/src -name '*.rs' -or -name '*.sql') $(wildcard ../proto/*) \
--
2.29.2
|