Merge pull request #47800 from fastly/jkarneges/src-plain-makefile

convert rust build from qmake project to plain makefile
fastly · Nov 27, 2023 · 5c0a42b · 5c0a42b
2 parents 5942abe + f981156
commit 5c0a42b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 84 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,11 +21,9 @@ vendor
 /conf.log
 /conf.pri
 /Makefile
-/src/Makefile
 /src/cpp/Makefile
 /src/cpp/cpp/Makefile
 /src/cpp/tests/Makefile
-/src/rust/Makefile
 /src/runner/certs/*.crt
 /src/runner/certs/*.key
 /postbuild/Makefile

diff --git a/postbuild/postbuild.pro b/postbuild/postbuild.pro
@@ -1,17 +1,16 @@
 TEMPLATE = aux
-CONFIG -= debug_and_release debug
 
 include($$OUT_PWD/../target/postbuild_conf.pri)
 
 root_dir = $$PWD/..
 bin_dir = $$root_dir/bin
 
-CONFIG(debug, debug|release) {
-	cargo_flags =
-	target_dir = $$root_dir/target/debug
-} else {
-	cargo_flags = --release
+RELEASE = $$(RELEASE)
+
+!isEmpty(RELEASE) {
 	target_dir = $$root_dir/target/release
+} else {
+	target_dir = $$root_dir/target/debug
 }
 
 # copy bin files

diff --git a/src/Makefile b/src/Makefile
@@ -0,0 +1,18 @@
+ifdef RELEASE
+cargo_flags = --offline --release
+else
+cargo_flags =
+endif
+
+all: build
+
+build:
+	cd .. && cargo build $(cargo_flags)
+
+clean:
+	cd .. && cargo clean
+
+distclean: clean
+
+check:
+	cd .. && cargo test $(cargo_flags)
diff --git a/src/rust/rust.pro b/src/rust/rust.pro
diff --git a/src/src.pro b/src/src.pro