Merge branch '5.2.x-branch'

This commit is contained in:
Laurent Rineau 2021-03-31 15:07:31 +02:00
commit ef771049b1
3 changed files with 6 additions and 6 deletions

View File

@ -60,7 +60,7 @@ WGET="wget"
WGET_OPTS="--no-check-certificate --no-verbose" WGET_OPTS="--no-check-certificate --no-verbose"
CURL="curl" CURL="curl"
CURL_OPTS="-k --remote-name --silent --location-trusted" CURL_OPTS="-k --remote-name --silent --location-trusted"
CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases" CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases"
LATEST_LOCATION="${CGAL_URL}/LATEST" LATEST_LOCATION="${CGAL_URL}/LATEST"
TAR="tar" TAR="tar"
GZIP="gzip" GZIP="gzip"

View File

@ -16,7 +16,7 @@ export WGET="wget"
export WGET_OPTS="--no-check-certificate --no-verbose" export WGET_OPTS="--no-check-certificate --no-verbose"
export CURL="curl" export CURL="curl"
export CURL_OPTS="-k --remote-name --silent --location-trusted" export CURL_OPTS="-k --remote-name --silent --location-trusted"
export CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases" export CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases"
export UPLOAD_RESULT_DESTINATION="cgaltest@cgaltest.geometryfactory.com:incoming" export UPLOAD_RESULT_DESTINATION="cgaltest@cgaltest.geometryfactory.com:incoming"
export LATEST_LOCATION="${CGAL_URL}/LATEST" export LATEST_LOCATION="${CGAL_URL}/LATEST"
export TAR="tar" export TAR="tar"
@ -216,7 +216,7 @@ unzip_cgal()
# Parse command line arguments # Parse command line arguments
for arg in "$@" for arg in "$@"
do do
case "$arg" in case "$arg" in
"-c") "-c")
echo "Using latest unzipped release instead of getting a new one from the server" echo "Using latest unzipped release instead of getting a new one from the server"
USE_LATEST_UNZIPPED="y" USE_LATEST_UNZIPPED="y"
@ -263,7 +263,7 @@ LOCK_FILE="${CGAL_HOME}/autotest_cgal_with_cmake.lock"
ACTUAL_LOGFILE="${CGAL_HOME}/`basename ${0}`.log" ACTUAL_LOGFILE="${CGAL_HOME}/`basename ${0}`.log"
rm -f "${ACTUAL_LOGFILE}" rm -f "${ACTUAL_LOGFILE}"
echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}" echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
cd "$CGAL_HOME" cd "$CGAL_HOME"

View File

@ -22,8 +22,8 @@ function error() {
exit 1 exit 1
} }
CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases" CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases"
CURL_OPTS="--remote-name --silent -n" CURL_OPTS="--remote-name --silent --location --netrc"
LATEST_LOCATION="${CGAL_URL}/LATEST" LATEST_LOCATION="${CGAL_URL}/LATEST"
CGAL_DOC_BUILD="/home/cgal-testsuite/cgal_doc_build" CGAL_DOC_BUILD="/home/cgal-testsuite/cgal_doc_build"