mirror of https://github.com/CGAL/cgal
Merge pull request #5557 from lrineau/Scripts-fix_doc_testsuite-GF
Change the URL to internal releases
This commit is contained in:
commit
854fa38f11
|
|
@ -60,7 +60,7 @@ WGET="wget"
|
|||
WGET_OPTS="--no-check-certificate --no-verbose"
|
||||
CURL="curl"
|
||||
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"
|
||||
TAR="tar"
|
||||
GZIP="gzip"
|
||||
|
|
@ -653,7 +653,7 @@ EOF
|
|||
cat >> "$file" <<EOF
|
||||
echo 'COLLECTING RESULTS';
|
||||
./collect_cgal_testresults_from_cmake;
|
||||
if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
|
||||
if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
|
||||
echo 'COLLECTING DEMOS BINARIES';
|
||||
tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll
|
||||
fi
|
||||
|
|
@ -791,7 +791,7 @@ put_on_web()
|
|||
# Parse command line arguments
|
||||
for arg in "$@"
|
||||
do
|
||||
case "$arg" in
|
||||
case "$arg" in
|
||||
"-c")
|
||||
echo "Using latest unzipped release instead of getting a new one from the server"
|
||||
USE_LATEST_UNZIPPED="y"
|
||||
|
|
@ -837,7 +837,7 @@ LIST_TEST_PACKAGES="${CGAL_ROOT}/list_test_packages"
|
|||
ACTUAL_LOGFILE="${CGAL_ROOT}/`basename ${0}`.log"
|
||||
rm -f "${ACTUAL_LOGFILE}"
|
||||
|
||||
echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
|
||||
echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
|
||||
|
||||
# Sanity checks
|
||||
if [ "${REFERENCE_PLATFORMS_DIR}" = "must_be_set_in_.autocgalrc" ]; then
|
||||
|
|
@ -865,11 +865,11 @@ fi
|
|||
# Detects cygwin
|
||||
if uname | grep -q "CYGWIN"; then
|
||||
JOM="`which jom`"
|
||||
if [ -e "$JOM" ]; then
|
||||
if [ -e "$JOM" ]; then
|
||||
CMAKE_GENERATOR='-GNMake Makefiles JOM'
|
||||
MAKE_CMD='jom'
|
||||
log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom"
|
||||
else
|
||||
else
|
||||
CMAKE_GENERATOR='-GNMake Makefiles'
|
||||
MAKE_CMD='nmake'
|
||||
log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
|
||||
|
|
@ -886,7 +886,7 @@ if [ -z "$IS_CYGWIN" ]; then
|
|||
lockfile -r 1 "$LOCK_FILE";
|
||||
if [ ${?} != 0 ]; then
|
||||
PID=`cat "$LOCK_FILE"`
|
||||
if kill -0 "$PID"; then
|
||||
if kill -0 "$PID"; then
|
||||
log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK! LOCKING PROCESS PID=$PID";
|
||||
exit 1;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ export WGET="wget"
|
|||
export WGET_OPTS="--no-check-certificate --no-verbose"
|
||||
export CURL="curl"
|
||||
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 LATEST_LOCATION="${CGAL_URL}/LATEST"
|
||||
export TAR="tar"
|
||||
|
|
@ -190,7 +190,7 @@ unzip_cgal()
|
|||
# Parse command line arguments
|
||||
for arg in "$@"
|
||||
do
|
||||
case "$arg" in
|
||||
case "$arg" in
|
||||
"-c")
|
||||
echo "Using latest unzipped release instead of getting a new one from the server"
|
||||
USE_LATEST_UNZIPPED="y"
|
||||
|
|
@ -237,7 +237,7 @@ LOCK_FILE="${CGAL_HOME}/autotest_cgal_with_cmake.lock"
|
|||
ACTUAL_LOGFILE="${CGAL_HOME}/`basename ${0}`.log"
|
||||
rm -f "${ACTUAL_LOGFILE}"
|
||||
|
||||
echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
|
||||
echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
|
||||
|
||||
cd "$CGAL_HOME"
|
||||
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ function error() {
|
|||
exit 1
|
||||
}
|
||||
|
||||
CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases"
|
||||
CURL_OPTS="--remote-name --silent -n"
|
||||
CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases"
|
||||
CURL_OPTS="--remote-name --silent --location --netrc"
|
||||
LATEST_LOCATION="${CGAL_URL}/LATEST"
|
||||
CGAL_DOC_BUILD="/home/cgal-testsuite/cgal_doc_build"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue