GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit c6c0af40 authored by Nick Mathewson's avatar Nick Mathewson 🐛

Merge branch 'maint-0.3.5' into maint-0.4.2

parents da8577bb adb72682
Pipeline #787 passed with stage
in 11 minutes and 10 seconds
......@@ -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
......@@ -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}"
......@@ -267,6 +269,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 +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."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment