mirror of https://github.com/CGAL/cgal
remove trailing whitespaces
This commit is contained in:
parent
657ba50904
commit
a774f53ada
|
|
@ -659,7 +659,7 @@ EOF
|
||||||
cat >> "$file" <<EOF
|
cat >> "$file" <<EOF
|
||||||
echo 'COLLECTING RESULTS';
|
echo 'COLLECTING RESULTS';
|
||||||
./collect_cgal_testresults_from_cmake;
|
./collect_cgal_testresults_from_cmake;
|
||||||
if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
|
if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
|
||||||
echo 'COLLECTING DEMOS BINARIES';
|
echo 'COLLECTING DEMOS BINARIES';
|
||||||
tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll
|
tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll
|
||||||
fi
|
fi
|
||||||
|
|
@ -797,7 +797,7 @@ put_on_web()
|
||||||
# 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"
|
||||||
|
|
@ -843,7 +843,7 @@ LIST_TEST_PACKAGES="${CGAL_ROOT}/list_test_packages"
|
||||||
ACTUAL_LOGFILE="${CGAL_ROOT}/`basename ${0}`.log"
|
ACTUAL_LOGFILE="${CGAL_ROOT}/`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}"
|
||||||
|
|
||||||
# Sanity checks
|
# Sanity checks
|
||||||
if [ "${REFERENCE_PLATFORMS_DIR}" = "must_be_set_in_.autocgalrc" ]; then
|
if [ "${REFERENCE_PLATFORMS_DIR}" = "must_be_set_in_.autocgalrc" ]; then
|
||||||
|
|
@ -871,11 +871,11 @@ fi
|
||||||
# Detects cygwin
|
# Detects cygwin
|
||||||
if uname | grep -q "CYGWIN"; then
|
if uname | grep -q "CYGWIN"; then
|
||||||
JOM="`which jom`"
|
JOM="`which jom`"
|
||||||
if [ -e "$JOM" ]; then
|
if [ -e "$JOM" ]; then
|
||||||
CMAKE_GENERATOR='-GNMake Makefiles JOM'
|
CMAKE_GENERATOR='-GNMake Makefiles JOM'
|
||||||
MAKE_CMD='jom'
|
MAKE_CMD='jom'
|
||||||
log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom"
|
log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom"
|
||||||
else
|
else
|
||||||
CMAKE_GENERATOR='-GNMake Makefiles'
|
CMAKE_GENERATOR='-GNMake Makefiles'
|
||||||
MAKE_CMD='nmake'
|
MAKE_CMD='nmake'
|
||||||
log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
|
log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
|
||||||
|
|
@ -892,7 +892,7 @@ if [ -z "$IS_CYGWIN" ]; then
|
||||||
lockfile -r 1 "$LOCK_FILE";
|
lockfile -r 1 "$LOCK_FILE";
|
||||||
if [ ${?} != 0 ]; then
|
if [ ${?} != 0 ]; then
|
||||||
PID=`cat "$LOCK_FILE"`
|
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";
|
log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK! LOCKING PROCESS PID=$PID";
|
||||||
exit 1;
|
exit 1;
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue