Finetune the cmd/update-release.py script so the Python venv is in its own folder

Author: xor-gate

.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
-venv
+cmd/update-release/venv*
 *.xcodeproj/xcuserdata
 *.xcodeproj/project.xcworkspace

Makefile

@@ -14,7 +14,7 @@ release:
 release-dmg:
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme Pods-syncthing
 	xcodebuild -workspace "syncthing.xcworkspace" -derivedDataPath $(PWD) -configuration Release -scheme syncthing-dmg
-release-update:
-	source ./venv/bin/activate && ./cmd/update-release.py
+update-release:
+	$(MAKE) -C cmd/update-release run
 clean:
 	rm -Rf Build Index Logs ModuleCache.noindex info.plist

README.md

@@ -263,7 +263,7 @@ See also the Apple Developer documentation at <https://developer.apple.com/docum
 
 ## Release management
 
-Activate the Python virtual environment with `semver` module installed. E.g `source venv/bin/activate`.
+Run `make update-release` from the toplevel Makefile to bundle latest Syncthing from GitHub.
 
 To update the bundled syncthing the `make release-update` must be run from the main folder which does
 basicly these steps automatically:

cmd/update-release/Makefile

@@ -0,0 +1,20 @@
+VENV_PATH=$(shell python3 -c "import sys; print(f'venv{sys.version_info.major}{sys.version_info.minor}')")
+
+# Define the path to the Python executable within the virtual environment
+PYTHON_EXEC = $(VENV_PATH)/bin/python
+
+# Define the Python script to run
+SCRIPT_NAME = update-release.py
+
+run: $(VENV_PATH)
+	$(PYTHON_EXEC) $(SCRIPT_NAME)
+
+clean:
+	rm -rf $(VENV_PATH)
+
+$(VENV_PATH):
+	python3 -m venv create $(VENV_PATH)
+	$(PYTHON_EXEC) -m pip install --upgrade pip
+	$(PYTHON_EXEC) -m pip install semver
+
+.PHONY: run clean

cmd/update-release.py cmd/update-release/update-release.pycmd/update-release.py renamed to cmd/update-release/update-release.py

@@ -7,6 +7,7 @@
 # 4. Update the syncthing/Scripts/syncthing-resource.sh
 #
 ###
+import os
 import sys
 import json
 import semver
@@ -16,9 +17,9 @@
 
 distVersion   = 1
 latest_url    = "https://api.github.com/repos/syncthing/syncthing/releases/latest"
-infoPlist     = 'syncthing/Info.plist'
-infoPlistTmpl = 'syncthing/Info.plist.tmpl'
-syncthingResourceScript = "syncthing/Scripts/syncthing-resource.sh"
+infoPlist     = '../../syncthing/Info.plist'
+infoPlistTmpl = '../../syncthing/Info.plist.tmpl'
+syncthingResourceScript = "../../syncthing/Scripts/syncthing-resource.sh"
 
 ###
 # Download latest tag from github