mirror of https://github.com/CGAL/cgal
Add support for USE_LATEST_UNZIPPED in autotest_cgal
That was already in autotest_cgal_using_cmake
This commit is contained in:
parent
43cc745311
commit
8e2ce1e7ca
|
|
@ -398,12 +398,13 @@ copy_old_stuff()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
if [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
# update symbolic links
|
# update symbolic links
|
||||||
rm ${OLD_CGAL_DIR}
|
rm ${OLD_CGAL_DIR}
|
||||||
ln -s `basename ${CGAL_DIR}` ${OLD_CGAL_DIR}
|
ln -s `basename ${CGAL_DIR}` ${OLD_CGAL_DIR}
|
||||||
rm ${CURRENT_CGAL_DIR}
|
rm ${CURRENT_CGAL_DIR}
|
||||||
ln -s `basename ${CGAL_DIR}` ${CURRENT_CGAL_DIR}
|
ln -s `basename ${CGAL_DIR}` ${CURRENT_CGAL_DIR}
|
||||||
|
fi
|
||||||
|
|
||||||
log_done ${ACTUAL_LOGFILE}
|
log_done ${ACTUAL_LOGFILE}
|
||||||
fi
|
fi
|
||||||
|
|
@ -463,72 +464,80 @@ if [ "${CRITICAL}" = "y" ]; then
|
||||||
error "COULD NOT DETERMINE MYSHELL!"
|
error "COULD NOT DETERMINE MYSHELL!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# that line makes the script remove the lock file in case of unwanted exit
|
||||||
|
trap "rm -f $LOCK_FILE" EXIT HUP INT TERM
|
||||||
|
|
||||||
|
|
||||||
lockfile -r 5 $LOCK_FILE;
|
lockfile -r 5 $LOCK_FILE;
|
||||||
if [ ${?} != 0 ]; then
|
if [ ${?} != 0 ]; then
|
||||||
echo "COULD NOT AQUIRE LOCK!";
|
echo "COULD NOT AQUIRE LOCK!";
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -r "LATEST" ]; then
|
if [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
rm -rf LATEST
|
if [ -r "LATEST" ]; then
|
||||||
fi
|
rm -rf LATEST
|
||||||
log ${ACTUAL_LOGFILE} "getting LATEST"
|
fi
|
||||||
if [ -n "${USE_CURL}" ]; then
|
log ${ACTUAL_LOGFILE} "getting LATEST"
|
||||||
${CURL} ${CURL_OPTS} ${LATEST_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
if [ -n "${USE_CURL}" ]; then
|
||||||
else
|
${CURL} ${CURL_OPTS} ${LATEST_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
||||||
${WGET} ${WGET_OPTS} ${LATEST_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
else
|
||||||
fi
|
${WGET} ${WGET_OPTS} ${LATEST_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
||||||
if [ ! -f "LATEST" ]; then
|
fi
|
||||||
error "COULD NOT DOWNLOAD LATEST!"
|
if [ ! -f "LATEST" ]; then
|
||||||
fi
|
error "COULD NOT DOWNLOAD LATEST!"
|
||||||
if [ -r "RELEASE_NR" ]; then
|
fi
|
||||||
cmp LATEST RELEASE_NR > ${ACTUAL_LOGFILE}
|
if [ -r "RELEASE_NR" ]; then
|
||||||
if [ ! ${?} != 0 ]; then
|
cmp LATEST RELEASE_NR > ${ACTUAL_LOGFILE}
|
||||||
rm -f $LOCK_FILE;
|
if [ ! ${?} != 0 ]; then
|
||||||
exit 1;
|
rm -f $LOCK_FILE;
|
||||||
fi
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for i in `cat LATEST`
|
|
||||||
do
|
|
||||||
CGAL_LOCATION="${CGAL_URL}/${i}";
|
|
||||||
CGAL_ZIPFILE="${i}";
|
|
||||||
done
|
|
||||||
|
|
||||||
CGAL_RELEASE_ID=`echo $CGAL_ZIPFILE | sed "s/.tar.gz//"`
|
|
||||||
if [ ! "${CGAL_RELEASE_ID}" = "${CGAL_ZIPFILE}" ]; then
|
|
||||||
USE_TARGZ="y"
|
|
||||||
else
|
|
||||||
CGAL_RELEASE_ID=`echo $CGAL_ZIPFILE | sed "s/.tar.bz2//"`
|
|
||||||
if [ ! "${CGAL_RELEASE_ID}" = "${CGAL_ZIPFILE}" ]; then
|
|
||||||
USE_TARBZ="y"
|
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
CGAL_CURRENT_RELEASE_ID=`echo $CGAL_RELEASE_ID | sed -e 's/-I.*//'`-I
|
for i in `cat LATEST`
|
||||||
|
do
|
||||||
|
CGAL_LOCATION="${CGAL_URL}/${i}";
|
||||||
|
CGAL_ZIPFILE="${i}";
|
||||||
|
done
|
||||||
|
|
||||||
# dir for the actual release
|
CGAL_RELEASE_ID=`echo $CGAL_ZIPFILE | sed "s/.tar.gz//"`
|
||||||
CGAL_DIR=${CGAL_ROOT}/${CGAL_RELEASE_ID}
|
if [ ! "${CGAL_RELEASE_ID}" = "${CGAL_ZIPFILE}" ]; then
|
||||||
|
USE_TARGZ="y"
|
||||||
|
else
|
||||||
|
CGAL_RELEASE_ID=`echo $CGAL_ZIPFILE | sed "s/.tar.bz2//"`
|
||||||
|
if [ ! "${CGAL_RELEASE_ID}" = "${CGAL_ZIPFILE}" ]; then
|
||||||
|
USE_TARBZ="y"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# dir of the previous release
|
CGAL_CURRENT_RELEASE_ID=`echo $CGAL_RELEASE_ID | sed -e 's/-I.*//'`-I
|
||||||
# HAS TO exist !
|
|
||||||
# (used to copy config/install files and evt. gmp stuff)
|
|
||||||
OLD_CGAL_DIR=${CGAL_ROOT}/CGAL-I
|
|
||||||
CURRENT_CGAL_DIR=${CGAL_ROOT}/${CGAL_CURRENT_RELEASE_ID}
|
|
||||||
|
|
||||||
# you will guess it :)
|
# dir for the actual release
|
||||||
CGAL_INCL_DIR=${CGAL_DIR}/include
|
CGAL_DIR=${CGAL_ROOT}/${CGAL_RELEASE_ID}
|
||||||
OLD_CGAL_INCL_DIR=${OLD_CGAL_DIR}/include
|
|
||||||
CGAL_LIB_DIR=${CGAL_DIR}/lib
|
|
||||||
OLD_CGAL_LIB_DIR=${OLD_CGAL_DIR}/lib
|
|
||||||
CGAL_MAKE_DIR=${CGAL_DIR}/make
|
|
||||||
CGAL_TEST_DIR=${CGAL_DIR}/test
|
|
||||||
CGAL_RUN_TEST=${CGAL_TEST_DIR}/run_testsuite
|
|
||||||
CGAL_COLLECT_TEST=${CGAL_TEST_DIR}/collect_cgal_testresults
|
|
||||||
|
|
||||||
# variables used to copy cmake stuffs
|
# dir of the previous release
|
||||||
OLD_CGAL_BINARY_DIR_BASE=${OLD_CGAL_DIR}/cmake/platforms
|
# HAS TO exist !
|
||||||
CGAL_BINARY_DIR_BASE=${CGAL_DIR}/cmake/platforms
|
# (used to copy config/install files and evt. gmp stuff)
|
||||||
|
OLD_CGAL_DIR=${CGAL_ROOT}/CGAL-I
|
||||||
|
CURRENT_CGAL_DIR=${CGAL_ROOT}/${CGAL_CURRENT_RELEASE_ID}
|
||||||
|
else
|
||||||
|
CGAL_DIR=${CGAL_ROOT}/CGAL-I
|
||||||
|
fi
|
||||||
|
|
||||||
|
# you will guess it :)
|
||||||
|
CGAL_INCL_DIR=${CGAL_DIR}/include
|
||||||
|
OLD_CGAL_INCL_DIR=${OLD_CGAL_DIR}/include
|
||||||
|
CGAL_LIB_DIR=${CGAL_DIR}/lib
|
||||||
|
OLD_CGAL_LIB_DIR=${OLD_CGAL_DIR}/lib
|
||||||
|
CGAL_MAKE_DIR=${CGAL_DIR}/make
|
||||||
|
CGAL_TEST_DIR=${CGAL_DIR}/test
|
||||||
|
CGAL_RUN_TEST=${CGAL_TEST_DIR}/run_testsuite
|
||||||
|
CGAL_COLLECT_TEST=${CGAL_TEST_DIR}/collect_cgal_testresults
|
||||||
|
|
||||||
|
# variables used to copy cmake stuffs
|
||||||
|
OLD_CGAL_BINARY_DIR_BASE=${OLD_CGAL_DIR}/cmake/platforms
|
||||||
|
CGAL_BINARY_DIR_BASE=${CGAL_DIR}/cmake/platforms
|
||||||
|
|
||||||
|
|
||||||
# ----------------------------------------------------
|
# ----------------------------------------------------
|
||||||
|
|
@ -536,26 +545,28 @@ fi
|
||||||
#
|
#
|
||||||
|
|
||||||
# remove old logfile
|
# remove old logfile
|
||||||
rm -f ${ACTUAL_LOGFILE}
|
rm -f ${ACTUAL_LOGFILE}
|
||||||
|
|
||||||
# check, if OLD_CGAL_DIR exists and is a symbolic link
|
if [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
if [ ! -r ${OLD_CGAL_DIR} -o ! -d ${OLD_CGAL_DIR} ]; then
|
# check, if OLD_CGAL_DIR exists and is a symbolic link
|
||||||
error "directory ${OLD_CGAL_DIR} does not exist"
|
if [ ! -r ${OLD_CGAL_DIR} -o ! -d ${OLD_CGAL_DIR} ]; then
|
||||||
fi
|
error "directory ${OLD_CGAL_DIR} does not exist"
|
||||||
if [ ! -h ${OLD_CGAL_DIR} ]; then
|
fi
|
||||||
error "${OLD_CGAL_DIR} has to be a symbolic link"
|
if [ ! -h ${OLD_CGAL_DIR} ]; then
|
||||||
fi
|
error "${OLD_CGAL_DIR} has to be a symbolic link"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -r ${LOGS_DIR} ]; then
|
if [ ! -r ${LOGS_DIR} ]; then
|
||||||
mkdir $LOGS_DIR
|
mkdir $LOGS_DIR
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ ! "${MAIL_ADDRESS}" = "must_be_set_in_.autocgalrc" ]; then
|
if [ ! "${MAIL_ADDRESS}" = "must_be_set_in_.autocgalrc" ]; then
|
||||||
for i in ${MAIL_ADDRESS}; do
|
for i in ${MAIL_ADDRESS}; do
|
||||||
printf "subject says it all\n" | \
|
printf "subject says it all\n" | \
|
||||||
${SENDMAIL} -s "Started autotest" ${i}
|
${SENDMAIL} -s "Started autotest" ${i}
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -581,9 +592,11 @@ main_procedure()
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
get_cgal
|
if [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
unzip_cgal
|
get_cgal
|
||||||
copy_old_stuff
|
unzip_cgal
|
||||||
|
copy_old_stuff
|
||||||
|
fi
|
||||||
build_cgal
|
build_cgal
|
||||||
if [ -z "${DO_NOT_TEST}" ]; then
|
if [ -z "${DO_NOT_TEST}" ]; then
|
||||||
run_test
|
run_test
|
||||||
|
|
@ -595,9 +608,11 @@ if [ "${BUILD_HOSTS}" = "localhost" ]; then
|
||||||
TEXT="`value_of COMPILERS_localhost`"
|
TEXT="`value_of COMPILERS_localhost`"
|
||||||
if [ -z "${TEXT}" ]; then
|
if [ -z "${TEXT}" ]; then
|
||||||
# printf "\nWARNING: Only installing on localhost\n";
|
# printf "\nWARNING: Only installing on localhost\n";
|
||||||
get_cgal
|
if [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
unzip_cgal
|
get_cgal
|
||||||
copy_old_stuff
|
unzip_cgal
|
||||||
|
copy_old_stuff
|
||||||
|
fi
|
||||||
build_cgal;
|
build_cgal;
|
||||||
else
|
else
|
||||||
main_procedure;
|
main_procedure;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue