From 07e34b27736f231e71ed8056c445be39e7cf6254 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 17 Jul 2017 17:42:50 +0200 Subject: [PATCH] Try to be more robust on errors The objective is to always have a working http://doc.cgal.org/master --- Documentation/doc/scripts/test_doxygen_versions.sh | 3 +++ Scripts/developer_scripts/run_doxygen_testsuite | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/doc/scripts/test_doxygen_versions.sh b/Documentation/doc/scripts/test_doxygen_versions.sh index fdba1082fbd..b8e3082d7db 100644 --- a/Documentation/doc/scripts/test_doxygen_versions.sh +++ b/Documentation/doc/scripts/test_doxygen_versions.sh @@ -1,4 +1,7 @@ #!/bin/bash + +set -e + if [ "$1" == '--help' ]; then echo "Usage: $0 [doxygen_2] [publish_dir]" echo "Compares the output of doxygen_1 and doxygen_2 of this CGAL version, " diff --git a/Scripts/developer_scripts/run_doxygen_testsuite b/Scripts/developer_scripts/run_doxygen_testsuite index f533e2d5f36..c7b00d94abf 100755 --- a/Scripts/developer_scripts/run_doxygen_testsuite +++ b/Scripts/developer_scripts/run_doxygen_testsuite @@ -65,7 +65,7 @@ export PATH cd "$PWD/doc/scripts" bash ./test_doxygen_versions.sh /home/cgal-testsuite/local/bin/doxygen '' /srv/CGAL/www/Members/Manual_doxygen_test case "$CGAL_RELEASE_ID" in - *-I-*) ln -snf "../Manual_doxygen_test/$CGAL_RELEASE_ID/output" /srv/CGAL/www/doc/master + *-I-*) rsync -a --delete "../Manual_doxygen_test/$CGAL_RELEASE_ID/output/" /srv/CGAL/www/doc/master/ ;; esac rm -rf "${CGAL_DOC_BUILD}"