[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/master] CI: Only run doxygen on 0.4.3 and later.



commit 9eb316de4295086d534a7576cc13606a42544c9f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Aug 11 12:22:35 2020 -0400

    CI: Only run doxygen on 0.4.3 and later.
---
 scripts/ci/ci-driver.sh | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index a675335115..20193e6b2a 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,6 +267,29 @@ if [[ "${CHUTNEY}" = "yes" ]]; then
     show_git_version Chutney "${CHUTNEY_PATH}"
 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.
 
@@ -362,7 +385,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."



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits