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,12 +464,17 @@ 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 [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
if [ -r "LATEST" ]; then
|
if [ -r "LATEST" ]; then
|
||||||
rm -rf LATEST
|
rm -rf LATEST
|
||||||
fi
|
fi
|
||||||
|
|
@ -515,6 +521,9 @@ fi
|
||||||
# (used to copy config/install files and evt. gmp stuff)
|
# (used to copy config/install files and evt. gmp stuff)
|
||||||
OLD_CGAL_DIR=${CGAL_ROOT}/CGAL-I
|
OLD_CGAL_DIR=${CGAL_ROOT}/CGAL-I
|
||||||
CURRENT_CGAL_DIR=${CGAL_ROOT}/${CGAL_CURRENT_RELEASE_ID}
|
CURRENT_CGAL_DIR=${CGAL_ROOT}/${CGAL_CURRENT_RELEASE_ID}
|
||||||
|
else
|
||||||
|
CGAL_DIR=${CGAL_ROOT}/CGAL-I
|
||||||
|
fi
|
||||||
|
|
||||||
# you will guess it :)
|
# you will guess it :)
|
||||||
CGAL_INCL_DIR=${CGAL_DIR}/include
|
CGAL_INCL_DIR=${CGAL_DIR}/include
|
||||||
|
|
@ -538,6 +547,7 @@ fi
|
||||||
# remove old logfile
|
# remove old logfile
|
||||||
rm -f ${ACTUAL_LOGFILE}
|
rm -f ${ACTUAL_LOGFILE}
|
||||||
|
|
||||||
|
if [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
# check, if OLD_CGAL_DIR exists and is a symbolic link
|
# check, if OLD_CGAL_DIR exists and is a symbolic link
|
||||||
if [ ! -r ${OLD_CGAL_DIR} -o ! -d ${OLD_CGAL_DIR} ]; then
|
if [ ! -r ${OLD_CGAL_DIR} -o ! -d ${OLD_CGAL_DIR} ]; then
|
||||||
error "directory ${OLD_CGAL_DIR} does not exist"
|
error "directory ${OLD_CGAL_DIR} does not exist"
|
||||||
|
|
@ -545,6 +555,7 @@ fi
|
||||||
if [ ! -h ${OLD_CGAL_DIR} ]; then
|
if [ ! -h ${OLD_CGAL_DIR} ]; then
|
||||||
error "${OLD_CGAL_DIR} has to be a symbolic link"
|
error "${OLD_CGAL_DIR} has to be a symbolic link"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -r ${LOGS_DIR} ]; then
|
if [ ! -r ${LOGS_DIR} ]; then
|
||||||
mkdir $LOGS_DIR
|
mkdir $LOGS_DIR
|
||||||
|
|
@ -581,9 +592,11 @@ main_procedure()
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
if [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
get_cgal
|
get_cgal
|
||||||
unzip_cgal
|
unzip_cgal
|
||||||
copy_old_stuff
|
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";
|
||||||
|
if [ -z "${USE_LATEST_UNZIPPED}" ]; then
|
||||||
get_cgal
|
get_cgal
|
||||||
unzip_cgal
|
unzip_cgal
|
||||||
copy_old_stuff
|
copy_old_stuff
|
||||||
|
fi
|
||||||
build_cgal;
|
build_cgal;
|
||||||
else
|
else
|
||||||
main_procedure;
|
main_procedure;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue