tor

commit c6c0af403c9b8dccba96677b60d86670a651893d
parent da8577bb7579af1355688d459b2774f995c43b53
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 11 Aug 2020 12:37:08 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

Diffstat:
M
.gitlab-ci.yml
 | 
5
+++--
M
scripts/ci/ci-driver.sh
 | 
27
++++++++++++++++++++++++++-

2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -105,12 +105,13 @@ debian-distcheck:
   script:
     - ./scripts/ci/ci-driver.sh
 
+# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
   variables:
-    DOXYGEN: "no"
-    ASCIIDOC: "no"
+    DOXYGEN: "yes"
+    ASCIIDOC: "yes"
     CHECK: "no"
   script:
     - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
@@ -256,7 +256,9 @@ fi
 # Tell the user about our versions of different tools and packages.
 
 uname -a
+printf "python: "
 python -V || echo "no 'python' binary."
+printf "python3: "
 python3 -V || echo "no 'python3' binary."
 
 show_git_version Tor "${CI_SRCDIR}"
@@ -268,6 +270,29 @@ if [[ "${CHUTNEY}" = "yes" ]]; then
 fi
 
 #############################################################################
+# Determine the version of Tor.
+
+TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;')
+
+# Use variables like these when we need to behave differently depending on
+# Tor version.  Only create the variables we need.
+TOR_VER_AT_LEAST_043=no
+
+# These are the currently supported Tor versions; no need to work with anything
+# ancient in this script.
+case "$TOR_VERSION" in
+    0.3.*)
+        TOR_VER_AT_LEAST_043=no
+        ;;
+    0.4.[012].*)
+        TOR_VER_AT_LEAST_043=no
+        ;;
+    *)
+        TOR_VER_AT_LEAST_043=yes
+        ;;
+esac
+
+#############################################################################
 # Make sure the directories are all there.
 
 # Make sure CI_SRCDIR exists and has a file we expect.
@@ -362,7 +387,7 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
     start_section Doxygen
     if runcmd make doxygen; then
 	hooray "make doxygen has succeeded."