Store upstream commit and Tor browser version in tor-versions.json

prebuild_tor_macos.py

@@ -4,14 +4,19 @@ from shutil import copytree, rmtree
 from subprocess import check_call
 
 import utils
-from utils import get_output_dir
+from utils import get_output_dir, get_version, get_build_versions
 from pathlib import Path
 
 BUILD_DIR = "tor-browser-build"
-VERSION = 'b1b4bf77'
 
 
 def prepare():
+    # get Tor version from command or show usage information
+    version = get_version()
+
+    # get versions of upstream repository and Tor browser for comparison
+    versions = get_build_versions(version)
+
     # remove output from previous build
     output_dir = get_output_dir("macos")
     print(output_dir)
@@ -23,8 +28,8 @@ def prepare():
     check_call(['touch', '/dev/console'])
 
     # clone tor-browser-build repo
-    check_call(['git', 'clone', 'https://gitlab.torproject.org/tpo/applications/tor-browser-build.git', 'tor-browser-build'])
-    check_call(['git', 'checkout', VERSION], cwd=Path(BUILD_DIR))
+    check_call(['git', 'clone', versions['upstream']['url'], BUILD_DIR])
+    check_call(['git', 'checkout', versions['upstream']['commit']], cwd=Path(BUILD_DIR))
     check_call(['git', 'submodule', 'init'], cwd=Path(BUILD_DIR))
     check_call(['git', 'submodule', 'update'], cwd=Path(BUILD_DIR))
 

tor-versions.json

@@ -29,6 +29,11 @@
       "revision": "21.4.7075529",
       "sha256": "ad7ce5467e18d40050dc51b8e7affc3e635c85bd8c59be62de32352328ed467e"
     },
+    "upstream": {
+      "url": "https://gitlab.torproject.org/tpo/applications/tor-browser-build.git",
+      "commit": "b1b4bf77",
+      "tor-browser": "12.0.6"
+    },
     "timestamp": "201001010000.00"
   },
   "0.4.7.13-1": {