Merge remote-tracking branch 'cgal/master' into CGAL-CMake_testsuite-maxGimeno
This commit is contained in:
Maxime Gimeno
@@ -490,13 +490,7 @@ build_cgal_on_host()
|
||||
|
||||
CGAL_BINARY_DIR="${CGAL_BINARY_DIR_BASE}/${PLATFORM}"
|
||||
|
||||
if [ -d "${REFERENCE_PLATFORMS_DIR}/${PLATFORM}" ] ; then
|
||||
CGAL_REFERENCE_CACHE_DIR="${REFERENCE_PLATFORMS_DIR}/${PLATFORM}"
|
||||
else
|
||||
CGAL_REFERENCE_CACHE_DIR=""
|
||||
fi
|
||||
|
||||
log "${ACTUAL_LOGFILE}" "Building cgal libs on host ${HOST} and platform ${PLATFORM}\nUnder ${CGAL_BINARY_DIR}\nUsing reference cache directory ${CGAL_REFERENCE_CACHE_DIR}"
|
||||
log "${ACTUAL_LOGFILE}" "Building cgal libs on host ${HOST} and platform ${PLATFORM}\nUnder ${CGAL_BINARY_DIR}\n"
|
||||
|
||||
if [ -f "${CGAL_BINARY_DIR}/localbuildscript" ] ; then
|
||||
log "${ACTUAL_LOGFILE}" "WARNING! Already built on platform ${PLATFORM}."
|
||||
@@ -514,19 +508,12 @@ if [ -z "\$CMAKE_GENERATOR" ]; then
|
||||
CMAKE_GENERATOR='${CMAKE_GENERATOR}';
|
||||
fi
|
||||
MAKE_CMD='${MAKE_CMD}';
|
||||
if [ -n "${IS_CYGWIN}" ]; then
|
||||
CGAL_REFERENCE_CACHE_DIR=\$( cygpath -w '${CGAL_REFERENCE_CACHE_DIR}' );
|
||||
else
|
||||
CGAL_REFERENCE_CACHE_DIR='${CGAL_REFERENCE_CACHE_DIR}';\
|
||||
fi
|
||||
|
||||
export CMAKE_GENERATOR;
|
||||
export MAKE_CMD;
|
||||
export CGAL_BINARY_DIR;
|
||||
export CGAL_REFERENCE_CACHE_DIR;
|
||||
cd '${CGAL_BINARY_DIR}';
|
||||
cmake \${INIT_FILE:+"-C\${INIT_FILE}"} '${CMAKE_GENERATOR}' -DRUNNING_CGAL_AUTO_TEST=TRUE \\
|
||||
-DCGAL_REFERENCE_CACHE_DIR="\$CGAL_REFERENCE_CACHE_DIR" \\
|
||||
VERBOSE=1 \\
|
||||
../../..;
|
||||
${MAKE_CMD} VERBOSE=ON -k -fMakefile ;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# DESTINATION the path where the release is created, default is /tmp
|
||||
# PUBLIC=[ON/OFF] indicates if a public release should be built, default is OFF
|
||||
# VERBOSE=[ON/OFF] makes the script more verbose, default is OFF
|
||||
# CGAL_VERSION=release id used to update version.h, VERSION and the release directory. Can be 4.12-Ic-33, 4.12-I-32, 4.12, ...
|
||||
# CGAL_VERSION=release id used to update version.h, VERSION and the release directory. Can be 4.12-Ic-33, 4.12-I-32, 4.12, ...
|
||||
# Must be followed by -beta<beta_number> if the release is a beta.
|
||||
# CGAL_VERSION_NR=release string used to update version.h. Must be something like 1041200033 , or 10412009<beta number>0
|
||||
# TESTSUITE=indicate if the release is meant to be used by the testsuite, default if OFF
|
||||
@@ -182,6 +182,8 @@ string(REPLACE "CGAL_VERSION ${CGAL_VERSION_INPUT}" "CGAL_VERSION ${CGAL_VERSION
|
||||
# update CGAL_VERSION_NR
|
||||
if (CGAL_VERSION_NR)
|
||||
string(REGEX REPLACE "CGAL_VERSION_NR 10[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]" "CGAL_VERSION_NR ${CGAL_VERSION_NR}" file_content "${file_content}")
|
||||
math(EXPR CGAL_BUILD_VERSION "${CGAL_VERSION_NR} % 10000")
|
||||
file(WRITE ${release_dir}/lib/cmake/CGAL/CGALConfigBuildVersion.cmake "set(CGAL_BUILD_VERSION ${CGAL_BUILD_VERSION})")
|
||||
endif()
|
||||
file(WRITE ${release_dir}/include/CGAL/version.h "${file_content}")
|
||||
|
||||
|
||||
@@ -22,7 +22,7 @@ SOURCES_DIR="$PWD" # Directory containing the sources, default is "$PWD"
|
||||
VERBOSE="" # Verbose mode (displays log to standard err)
|
||||
BETA="" #If set, will change the release number and version number accordingly.
|
||||
DESTINATION="$PWD"
|
||||
IS_MASTER="y"
|
||||
INTEGRATION=""
|
||||
|
||||
SOURCES_DIR_HAS_BEEN_SET=
|
||||
|
||||
@@ -45,10 +45,10 @@ usage() {
|
||||
printerr ' --no-testsuite : when used with --do-it, the tag is made, files are published,'
|
||||
printerr ' but the LATEST file is not updated.'
|
||||
printerr ' --verbose : print log to standard output, instead of the log file'
|
||||
printerr ' --beta <n> : followed by a number. When used with --public, will modify
|
||||
printerr ' --beta <n> : followed by a number. When used with --public, will modify
|
||||
the release number and the release version name to include beta<n>'
|
||||
printerr ' --dest : followed by the path to where the release should be created. Default is /tmp.'
|
||||
printerr ' --is_master : replace the Ic in the name by I.'
|
||||
printerr ' --integration : replace the I in the name by Ic.'
|
||||
printerr ' <packages dir> : the directory containing the packages [default is trunk]'
|
||||
}
|
||||
|
||||
@@ -99,26 +99,26 @@ while [ $1 ]; do
|
||||
continue
|
||||
;;
|
||||
--dest)
|
||||
shift
|
||||
shift
|
||||
DESTINATION=$1
|
||||
shift;continue
|
||||
;;
|
||||
--is_master)
|
||||
IS_MASTER="y"
|
||||
--integration)
|
||||
INTEGRATION="y"
|
||||
shift;continue
|
||||
;;
|
||||
-*)
|
||||
printerr "Unrecognized option : $1"
|
||||
exit
|
||||
;;
|
||||
*)
|
||||
*)
|
||||
if [ -z "$SOURCES_DIR_HAS_BEEN_SET" ]; then
|
||||
SOURCES_DIR="$1"
|
||||
SOURCES_DIR_HAS_BEEN_SET=y
|
||||
shift; continue
|
||||
elif [ -n "$IS_MASTER" ]; then
|
||||
elif [ -z "$INTEGRATION" ]; then
|
||||
# Compatibility with the old syntax with candidates
|
||||
IS_MASTER=""
|
||||
INTEGRATION="y"
|
||||
shift; continue
|
||||
else
|
||||
printerr "Unrecognized option : $1"
|
||||
@@ -159,7 +159,7 @@ if [ -z "$VERBOSE" ]; then
|
||||
exec 3>&1 >> ${LOGFILE}
|
||||
fi
|
||||
|
||||
# Verbose: displays all executed commands
|
||||
# Verbose: displays all executed commands
|
||||
#PS4='[${LINENO}]+ '
|
||||
#set -x
|
||||
|
||||
@@ -189,7 +189,7 @@ else
|
||||
fi
|
||||
|
||||
# Do not show the bugfix number if it is 0.
|
||||
if [ x"$BUGFIX_NUMBER" != "x0" ]; then
|
||||
if [ x"$BUGFIX_NUMBER" != "x0" ]; then
|
||||
BUGFIX_STRING=".$BUGFIX_NUMBER"
|
||||
else
|
||||
BUGFIX_STRING=""
|
||||
@@ -206,7 +206,7 @@ if [ -z "$INTERNAL_NUMBER" ]; then
|
||||
INTERNAL_NUMBER=1
|
||||
fi
|
||||
|
||||
if [ -z "${IS_MASTER}" ]; then
|
||||
if [ -n "${INTEGRATION}" ]; then
|
||||
INTERNAL_STRING="-Ic-${INTERNAL_NUMBER}"
|
||||
else
|
||||
INTERNAL_STRING="-I-${INTERNAL_NUMBER}"
|
||||
|
||||
@@ -155,7 +155,7 @@ fi
|
||||
|
||||
#check no file contains non-utf8 characters
|
||||
echo '.. Checking if non utf-8 characters are used...'
|
||||
txt_not_utf8=$(git ls-files -z --stage | awk -F"\t" 'BEGIN { RS="\0" }; { printf "%s\0", $2; }' | xargs -0 file -N | grep "text" | egrep -v "UTF-8|ASCII|XML|EPS|FIG|assembler source|Perl script|from flex")
|
||||
txt_not_utf8=$(git ls-files -z --stage | awk -F"\t" 'BEGIN { RS="\0" }; { printf "%s\0", $2; }' | xargs -0 file -N | grep "text" | egrep -v "UTF-8|ASCII|CSV|XML|EPS|FIG|assembler source|Perl script|from flex")
|
||||
if [ -n "${txt_not_utf8}" ]; then
|
||||
echo "The following files have non utf-8 characters:"
|
||||
echo ${txt_not_utf8}
|
||||
|
||||
Reference in New Issue
Block a user