use proper version number in build outputs

meta/.gitignore

@@ -0,0 +1 @@
+buildhash

meta/version

@@ -0,0 +1 @@
+2.1.17

pylib/Makefile

@@ -78,7 +78,7 @@ CHECKDEPS := $(shell find anki tests -name '*.py' | grep -v buildhash.py)
 .PHONY: build
 build: $(BUILD_STEPS) $(CHECKDEPS)
 	rm -rf dist
-	echo "build='$$(git rev-parse --short HEAD)'" > anki/buildhash.py
+	echo "build='$$(cat ../meta/buildhash)'" > anki/buildhash.py
 	python setup.py bdist_wheel
 	rsync -a dist/*.whl ../dist/
 

pylib/setup.py

@@ -3,6 +3,9 @@ import setuptools, sys
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
+with open("../meta/version") as fh:
+    version = fh.read().strip()
+
 platform_reqs = []
 if sys.platform == "win32":
     platform_reqs.append("psutil")
@@ -11,7 +14,7 @@ if sys.platform != "win32" and sys.platform != "darwin":
 
 setuptools.setup(
     name="anki",
-    version="0.1.0",
+    version=version,
     author="Ankitects Pty Ltd",
     description="Anki's library code",
     long_description=long_description,

qt/setup.py

@@ -3,6 +3,9 @@ import setuptools, sys, os
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
+with open("../meta/version") as fh:
+    version = fh.read().strip()
+
 platform_reqs = []
 if sys.platform == "win32":
     platform_reqs.append("psutil")
@@ -17,7 +20,7 @@ extra_files = package_files('aqt_data')
 
 setuptools.setup(
     name="aqt",
-    version="0.1.0",
+    version=version,
     author="Ankitects Pty Ltd",
     description="Anki's Qt GUI code",
     long_description=long_description,

rspy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ankirspy"
-version = "0.1.0"
+version = "2.1.17" # automatically updated
 edition = "2018"
 authors = ["Ankitects Pty Ltd and contributors"]
 

rspy/Makefile

@@ -13,10 +13,10 @@ BUILDFLAGS := --release --strip
 
 all: develop
 
-develop: .build/tools
+develop: .build/tools .build/vernum
 	maturin develop $(BUILDFLAGS)
 
-build: .build/tools
+build: .build/tools .build/vernum
 	rm -rf $(OUTDIR)/ankirspy*
 	maturin build -i $(shell which python3) -o $(OUTDIR) $(BUILDFLAGS)
 
@@ -42,3 +42,8 @@ RUST_TOOLCHAIN := $(shell cat rust-toolchain)
 	cargo fmt -- --check
 	cargo clippy -- -D warnings
 	@touch $@
+
+VER := $(shell cat ../meta/version)
+.build/vernum: ../meta/version
+	sed -i '' 's/.*automatically updated.*/version = "$(VER)" # automatically updated/' Cargo.toml
+	@touch $@

scripts.inc

@@ -20,6 +20,12 @@ else
     . pyenv/bin/activate
 fi
 
-
 # add qt if missing
 python -c 'import PyQt5' 2>/dev/null || pip install -r qt/requirements.qt
+
+# update build hash
+oldhash=$(test -f meta/buildhash && cat meta/buildhash || true)
+newhash=$(git rev-parse --short HEAD)
+if [ "$oldhash" != "$newhash" ]; then
+    echo $newhash > meta/buildhash
+fi