diff --git a/Documentation/doc/biblio/cgal_manual.bib b/Documentation/doc/biblio/cgal_manual.bib index 25bb729e33d..6250c6e6e50 100644 --- a/Documentation/doc/biblio/cgal_manual.bib +++ b/Documentation/doc/biblio/cgal_manual.bib @@ -1545,17 +1545,6 @@ @book{ cgal:l-lscsd-96 ,update = "97.04 kettner" } -@article{cgal:l-lsqp-82, - title={Least squares quantization in PCM}, - author={Lloyd, Stuart}, - journal={IEEE transactions on information theory}, - volume={28}, - number={2}, - pages={129--137}, - year={1982}, - publisher={IEEE} -} - @InProceedings{ cgal:lprm-lscm-02, author = {Bruno L{\'e}vy and Sylvain Petitjean and Nicolas Ray and J{\'e}rome Maillot}, @@ -2778,7 +2767,7 @@ @incollection{msri52:liu-snoeyink-05 editor = "Jacob E. Goodman, J\'anos Pach and Emo Welzl", year = {2005}, pages = {439-458}, - URL = {http://library.slmath.org/books/Book52/files/23liu.pdf}, + URL = {https://library.slmath.org/books/Book52/files/23liu.pdf}, publisher = {MSRI Publications} } diff --git a/Installation/include/CGAL/version.h b/Installation/include/CGAL/version.h index 6840e2546e3..8a5f4d052b0 100644 --- a/Installation/include/CGAL/version.h +++ b/Installation/include/CGAL/version.h @@ -17,12 +17,12 @@ #define CGAL_VERSION_H #ifndef SWIG -#define CGAL_VERSION 6.0-beta2 +#define CGAL_VERSION 6.0 #define CGAL_GIT_HASH abcdef #endif -#define CGAL_VERSION_NR 1060000920 +#define CGAL_VERSION_NR 1060001000 #define CGAL_SVN_REVISION 99999 -#define CGAL_RELEASE_DATE 20240701 +#define CGAL_RELEASE_DATE 20240925 #include diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake index df15f9e3108..310f88038da 100644 --- a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake +++ b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake @@ -2,7 +2,7 @@ set(CGAL_MAJOR_VERSION 6) set(CGAL_MINOR_VERSION 0) set(CGAL_BUGFIX_VERSION 0) include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake) -set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0-beta2") +set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0") set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}") if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgal_with_cmake_rc b/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgal_with_cmake_rc deleted file mode 100644 index 4f6e7b4a2de..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgal_with_cmake_rc +++ /dev/null @@ -1,26 +0,0 @@ -# -*- mode: shell-script -*- -source $HOME/.autocgalrc - -CGAL_ROOT=/home/lrineau/CGAL/releases-and-testsuites-with-cmake -LOGS_DIR="${CGAL_ROOT}/AUTOTEST_LOGS" -LOCK_FILE="${CGAL_ROOT}/autotest_cgal_with_cmake.lock" - -REFERENCE_PLATFORMS_DIR=/home/lrineau/CGAL/releases-and-testsuites-with-cmake/reference-platforms - -COMPILERS_localhost="" -#COMPILERS_localhost="$COMPILERS_localhost i686_Linux-2.6_g++-3.4.6_CentOS-5.1-O2" -#COMPILERS_localhost="$COMPILERS_localhost i686_Linux-2.6_g++-4.1.2_CentOS-5.1" -#COMPILERS_localhost="$COMPILERS_localhost i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O2" -#COMPILERS_localhost="$COMPILERS_localhost i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3" -#COMPILERS_localhost="$COMPILERS_localhost i686_Linux-2.6_g++-4.3.3_CentOS-5.1" -#COMPILERS_localhost="$COMPILERS_localhost i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O2-NO-DEPRECATED" -#COMPILERS_localhost="$COMPILERS_localhost i686_Linux-2.6_g++-4.3.3_CentOS-5.1-O3" -# Ignored: i686_Linux-2.6_g++-4.1.2_CentOS-5.1-NOGMP -#COMPILERS_localhost="$COMPILERS_localhost x86_64_Linux-x.y_IntelCompiler-15.0_CentOS-7.x" - -# ignore COMPILERS_localhost and use all ref platformes: -USE_REFERENCE_PLATFORMS=yes - -# TAUCS -#CGAL_TAUCS_DIR=$HOME/CGAL/taucs_full -#export CGAL_TAUCS_DIR diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgalrc b/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgalrc deleted file mode 100644 index 34bbd7db808..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/.autocgalrc +++ /dev/null @@ -1,40 +0,0 @@ -# -*- mode: shell-script -*- -BUILD_HOSTS="localhost" -PROCESSORS_localhost=4 -#PROCESSORS_localhost=2 -#COMPILERS_localhost="i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3 i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O2 i686_Linux-2.6_g++-4.1.2_CentOS-5.1 i686_Linux-2.6_g++-4.3.2_CentOS-5.1-O3 i686_Linux-2.6_g++-4.3.2_CentOS-5.1" -COMPILERS_localhost="i686_Linux-2.6_g++-4.3.2_CentOS-5.1" -CGAL_TESTER="lrineau" -CGAL_TESTER_NAME="cgal (GF)" -CGAL_TESTER_ADDRESS=Laurent.Rineau__cgal_testsuite@normalesup.org - -CGAL_ROOT=/home/lrineau/CGAL/releases-and-testsuites -LOGS_DIR="${CGAL_ROOT}/AUTOTEST_LOGS" -LOCK_FILE="${CGAL_ROOT}/autotest_cgal_with_cmake.lock" - -# Do not output anything on console (otherwise crond sens emails) -CONSOLE_OUTPUT="" - -# QTDIR -source /etc/profile.d/qt.sh - -# set locale -LC_ALL=C -LANG=C -export LC_ALL -export LANG - -# pass QTDIR and locale to the shell -MYSHELL="QTDIR=$QTDIR LC_ALL=C LANG=C /bin/sh -c" - -# Prevent core files : -# ulimit -c 0 -# 3 hours maximum per process. -# ulimit -t 10800 -# Maximum memory to be used : 2GB -# ulimit -v 2000000 -# Maximum files size : 500MB -ULIMIT_OPTIONS="-H -c 0 -t 10800 -v 2000000 -t 500000" - - -UPLOAD_RESULT_DESTINATION="cgaltest@cgaltest.geometryfactory.com:incoming" diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/.cgal_create_new_release_rc b/Maintenance/infrastructure/cgal.geometryfactory.com/.cgal_create_new_release_rc deleted file mode 100644 index a4701211aab..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/.cgal_create_new_release_rc +++ /dev/null @@ -1,5 +0,0 @@ -#TMPDIR=$HOME/CGAL/create_internal_release -HTML_DIR=/srv/CGAL/www/Members/Releases -#MAKENSIS=$HOME/CGAL/NSIS-3.4/makensis.exe -#WINE=wine -CGAL_MANUAL=$HOME/bin/cgal_manual diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/.cgalmanualrc b/Maintenance/infrastructure/cgal.geometryfactory.com/.cgalmanualrc deleted file mode 100644 index 0e4fc5e8ec3..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/.cgalmanualrc +++ /dev/null @@ -1,24 +0,0 @@ -export TEXINPUTS=".:$HOME/CGAL/Manual_tools-installed/sty:$HOME/CGAL/last-release-branch/Manual/doc_tex:$TEXINPUTS" -export BIBINPUTS="$HOME/CGAL/last-release-branch/Manual/doc_tex:$BIBINPUTS" -export LATEX_CONV_CONFIG=$HOME/CGAL/Manual_tools-installed/latex_conv_config -export LATEX_CONV_INPUTS=$LATEX_CONV_CONFIG/html:$HOME/CGAL/last-release-branch/Manual/doc_tex: - -# Use makeindex from Fedora 10: -# kpathsea-2007-35.fc10.i386 -# texlive-2007-35.fc10.i386 -export PATH=$HOME/bin:$PATH -export LD_PRELOAD=$HOME/bin/libkpathsea.so.4 - -# Selects the different output formats supported -MakePS=0 -MakePDF=1 -MakeHTML=1 - -# Number of older test-suite results kept. Test-suite results beyond this -# number are deleted. -TestSuiteHistory=20 - -# Number of older test-suites for which the full results will be kept. Older -# test suites will have their manuals removed to save space. -TestSuiteFullHistory=10 - diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results deleted file mode 100755 index ba09b59b185..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_diff_results +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/zsh - -cd /srv/CGAL/www/testsuite - -if [ -z "$1" -o -z "$2" ]; then - printf "Example usage: %s 4.5-I-149 4.6-Ic-30 [DIFF_OPTION]...\n" "$0" - exit 1 -fi - -from="CGAL-$1" -to="CGAL-$2" -pager=${PAGER:-less} - -shift -shift - -if ! [ -e "./$from" ]; then - printf "The CGAL release %s was not tested!\n" "$from" - exit 1 -fi -if ! [ -e "./$to" ]; then - printf "The CGAL release %s was not tested!\n" "$to" - exit 1 -fi - -for f in ${from}/results*txt; do diff -U0 ${1+"$@"} $f ${f/$from/$to}; done |& less -p '^\+[^\+].* [^y]|CGAL-.*|diff' diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py deleted file mode 100644 index daa87aa614a..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py +++ /dev/null @@ -1,87 +0,0 @@ -"""Python module to create and publish CGAL releases from a branch""" - -import os - - -class Release: - """class to create a CGAL release from a branch - optionally, the release can be internal - """ - - def __init__(self, branch, internal=False): - self.branch = branch - self.internal = internal - self.cwd = f"$HOME/CGAL/create_internal_release-{self.branch}-branch" - self.repo = f"$HOME/CGAL/branches/CGAL-{self.branch}-branch.git" - self.extra_options = " --public" - - def command(self): - """return the command to create and publish the release""" - return ( - f"PATH=/home/lrineau/bin-cmake3:/bin:/usr/bin:/home/lrineau/bin; cd {self.cwd} &&" - + " /usr/bin/time -v bash -x " - + f"$HOME/bin/create_release {self.repo}{self.extra_options} --do-it" - ) - - def __str__(self): - msg = ( - f"{'internal ' if self.internal else ''}release from {self.branch}\n" - f"cwd: {self.cwd}\nrepo: {self.repo}\n" - f"command:\n{self.command()}" - ) - return msg - - def __call__(self): - if os.system(self.command()) != 0: - raise RuntimeError( - "Error while creating " + - f"{'internal ' if self.internal else ''}release from {self.branch}" - ) - - INTERNAL = True - - -class InternalRelease(Release): - """class to create an internal CGAL release from a branch""" - - def __init__(self, branch): - super().__init__(branch, Release.INTERNAL) - self.extra_options = " --integration" - - -class BetaRelease(Release): - """class to create an internal CGAL release from a branch""" - - def __init__(self, branch, beta_number): - super().__init__(branch, Release.INTERNAL) - self.extra_options = f" --public --beta {beta_number}" - - -integration = InternalRelease("integration") -integration.repo = "$HOME/CGAL/branches/integration.git" -integration.cwd = "$HOME/CGAL/create_internal_release" -master = Release("master") -master.repo = "$HOME/CGAL/branches/master.git" -master.cwd = "$HOME/CGAL/create_internal_release" - - -def beta_release_from_master(beta_number): - """Convenience function to create a beta release from master""" - rel = BetaRelease("master", beta_number) - rel.repo = "$HOME/CGAL/branches/master.git" - rel.cwd = "$HOME/CGAL/create_internal_release" - return rel - -def beta_release(branch, beta_number): - """Convenience function to create a beta release from a branch""" - return BetaRelease(branch, beta_number) - -def release(branch): - """Convenience function to create a release from a branch""" - return Release(branch) - - -if __name__ == "__main__": - print( - "This file is a Python module. Use create_internal_release_of_the_day.py instead." - ) diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/collect_data_directories b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/collect_data_directories deleted file mode 100755 index d3f3cdc237b..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/collect_data_directories +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/zsh - -set -e - -setopt extendedglob - -[ -d ./data ] || mkdir data - -for d in (examples|demo)/*/data(/); do - example_or_demo=${d%%/*} - pkg_plus_data=${d#*/} - pkg=${pkg_plus_data%/data} - [ "$d" = "${example_or_demo}/${pkg}/data" ] || echo WRONG $d - ls -d --color "${example_or_demo}/${pkg}/data" - echo example_or_demo=${example_or_demo} - echo pkg=${pkg} - dest_dir=data/data-${pkg} - [ -d "$dest_dir" ] || mkdir "$dest_dir" - ls -d --color "$dest_dir" - cp -a "$d"/* "${dest_dir}/" -done -cd data -zip -r ../data.zip * diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py deleted file mode 100644 index 8448203c673..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/python3 - -"""This script is called by a cron job every day. - It creates and publish a release tarball. -""" - -import os -import datetime -import locale -import argparse -from cgal_release import release, integration, master, beta_release, beta_release_from_master - -# Define a dictionary that maps day of the week to an action -actions = { - "Monday": integration, - "Tuesday": integration, - "Wednesday": integration, - "Thursday": integration, - "Friday": release("5.5"), - "Saturday": release("5.6"), - "Sunday": master, -} - - -def main(): - """Entry point of the script.""" - # Get the current day of the week, or get it from the command line - locale.setlocale(locale.LC_ALL, "en_US.UTF-8") - - day_help = f"Day of the week (default: {datetime.datetime.now().strftime('%A')})" - day_help += f" possible values: ({', '.join(actions.keys())})" - parser = argparse.ArgumentParser() - parser.add_argument( - "day", help=day_help, nargs="?", default=datetime.datetime.now().strftime("%A") - ) - parser.add_argument("-n", "--dry-run", action="store_true") - args = parser.parse_args() - - # Look up the action for the current day of the week in the dictionary - create_release = actions[args.day] - - if args.dry_run: - print(create_release) - return - - # Then create the release tarball - if os.system(create_release.command()) != 0: - raise RuntimeError("ERROR while creating release tarball") - - -if __name__ == "__main__": - main() diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_release b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_release deleted file mode 100755 index 7657e924bef..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_release +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -LC_ALL=POSIX; -export LC_ALL - -# Returns an error once a command returns an error -set -e - -DRY_RUN= -QUIET=--quiet - -if [ "x$1" = "x--dry-run" -o "x$1" = "x-n" ]; then - DRY_RUN=--dry-run - shift -fi - -if [ -n "DRY_RUN" ]; then - QUIET= -fi - -pushd "$1" > /dev/null -branch=`git rev-parse --abbrev-ref HEAD` -remote=`git config branch.${branch}.remote` -git fetch $DRY_RUN $QUIET -p --all -[ -z "$DRY_RUN" ] && git reset $QUIET --hard "$remote/$branch" -git clean $DRY_RUN $QUIET -f -d -x - -ln -s -n -f "$1" $HOME/latest-internal-release-branch - -# Hard-reset integration "every day", if today's "$branch" is integration -# and create testsuite-Monday, testsuite-Tuesday, and so on... -if [ x"$branch" = "xintegration" ]; then - git push $DRY_RUN $QUIET -f cgal-dev "$remote/$branch:refs/heads/`date '+testsuite-%A'`" cgal/master:integration -elif [ x"$branch" = "xintegration-4.5" ]; then - git push $DRY_RUN $QUIET -f cgal-dev "$remote/$branch:refs/heads/`date '+testsuite-%A'`" cgal/releases/CGAL-4.5-branch:integration-4.5 -else - git push $DRY_RUN $QUIET -f cgal-dev "$remote/$branch:refs/heads/`date '+testsuite-%A'`" -fi - -popd > /dev/null - -# Update the symbolic links, using $1 and $2 -rm "$HOME/CGAL/last-release-branch" - -ln -s "$1" "$HOME/CGAL/last-release-branch" - -## That was for LaTeX documentation -#rm "$HOME/CGAL/last-manual_tools-branch" -#rm "$HOME/CGAL/last-manual-branch" - - -## That was for LaTeX documentation -# # Search the Manual and Manual_tools package in candidates, if any. -# # Else use the main branch. -# if [ -d "$2" -a -d "$2/Manual_tools" ]; then -# ln -s "$2" "$HOME/CGAL/last-manual_tools-branch"; -# else -# ln -s "$1" "$HOME/CGAL/last-manual_tools-branch"; -# fi -# if [ -d "$2" -a -d "$2/Manual" ]; then -# ln -s "$2" "$HOME/CGAL/last-manual-branch"; -# else -# ln -s "$1" "$HOME/CGAL/last-manual-branch"; -# fi - -## That was for LaTeX documentation -# # Update the manual tools -# # They are used in create_new_release to build the installation manual. -# "$HOME/bin/update_manual_tools" - -# Launch create_new_release, from the branch itself -[ -z "$DRY_RUN" ] && exec bash -$- "$HOME/CGAL/last-release-branch/Scripts/developer_scripts/create_new_release" --no-scm-update "$@" -# --no-scm-update because branches have already been updated diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/dump_crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/dump_crontab deleted file mode 100755 index 478770cf106..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/dump_crontab +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/zsh - -cd $HOME/infrastructure -crontab -l >| crontab -if [ -d ../../../.git ]; then - git pull --ff-only --quiet || exit $? - git diff --cached --quiet || exit $? - git add crontab - if git commit -m 'updated crontab (automated commit)' > /dev/null; then - git push cgal master - else - true - fi -else - svn add -q crontab - [ -n "`svn st crontab`" ] && svn ci -m 'updated crontab (automated commit)' crontab -fi diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/update_manual_tools b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/update_manual_tools deleted file mode 100755 index d7185498bfd..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/update_manual_tools +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -LC_ALL=POSIX; -export LC_ALL - -rm -rf "$HOME/CGAL/Manual_tools-src" -cp -a "$HOME/CGAL/last-manual_tools-branch/Manual_tools" "$HOME/CGAL/Manual_tools-src" -cp -a "$HOME/CGAL/last-manual-branch/Manual/developer_scripts/cgal_manual" "$HOME/bin" - -pushd "$HOME/CGAL/Manual_tools-src" - -cat > install.config <<'EOF' -export LATEX_CONV_BIN=$HOME/bin -MANUAL_TOOLS_PREFIX=$HOME/CGAL/Manual_tools-installed -export LATEX_CONV_CONFIG=$MANUAL_TOOLS_PREFIX/latex_conv_config -export STYLE_FILES=$MANUAL_TOOLS_PREFIX/sty -EOF - -sh install.sh - -popd diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab b/Maintenance/infrastructure/cgal.geometryfactory.com/crontab deleted file mode 100644 index ff33e80a3b1..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/crontab +++ /dev/null @@ -1,120 +0,0 @@ -# For details see man 4 crontabs - -# Example of job definition: -# .---------------- minute (0 - 59) -# | .------------- hour (0 - 23) -# | | .---------- day of month (1 - 31) -# | | | .------- month (1 - 12) OR jan,feb,mar,apr ... -# | | | | .---- day of week (0 - 6) (Sunday=0 or 7) OR sun,mon,tue,wed,thu,fri,sat -# | | | | | -# * * * * * command to be executed - -PATH=/home/lrineau/bin-cmake3:/bin:/usr/bin:/home/lrineau/bin -LC_CTYPE=en_US.UTF-8 -DOCKER_HOST=unix:///run/podman/podman.sock -CONTAINER_HOST=unix:///run/podman/podman.sock - -# Update testsuite result pages -5,15,25,35,45,55 * * * * cd $HOME/CGAL/collect_and_public_testresults; ./treat_result_collection || echo ERROR - -# Create internal release -#0 21 * * * python3 /home/lrineau/CGAL/branches/local-master.git/Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py -0 21 * * * python3 /home/lrineau/CGAL/cgal-testsuite-cgal-gf.git/bin/create_internal_release_of_the_day.py - - -30 16 * * * echo ESSAI; false -## Older stuff - -## "master" alone -#0 21 * * Sun cd $HOME/CGAL/create_internal_release && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/master.git --do-it --public || echo ERROR -## "integration" -#0 21 * * Mon,Tue,Wed cd $HOME/CGAL/create_internal_release && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/integration.git $HOME/CGAL/branches/empty-dir --do-it || echo ERROR -## from branch 5.5 -#0 21 * * Fri cd $HOME/CGAL/create_internal_release-5.5-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-5.5-branch.git --public --do-it || echo ERROR -## from branch 5.4 -#0 21 * * Sat,Thu cd $HOME/CGAL/create_internal_release-5.4-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-5.4-branch.git --public --do-it || echo ERROR - -# from branch 5.3 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-5.3-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-5.3-branch.git --public --do-it || echo ERROR -# from branch 5.2 -#0 21 * * Fri cd $HOME/CGAL/create_internal_release-5.2-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-5.2-branch.git --public --do-it || echo ERROR -# from branch 5.1 -#0 21 * * Fri cd $HOME/CGAL/create_internal_release-5.1-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-5.1-branch.git --public --do-it || echo ERROR -# from branch 5.0 -#0 21 * * Fri cd $HOME/CGAL/create_internal_release-5.0-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-5.0-branch.git --public --do-it || echo ERROR -# from branch 4.14 -#0 21 * * Fri cd $HOME/CGAL/create_internal_release-4.14-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.14-branch.git --public --do-it || echo ERROR -# from branch 4.13 -#0 21 * * Fri cd $HOME/CGAL/create_internal_release-4.13-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.13-branch.git --public --do-it || echo ERROR -# from branch 4.12 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-4.12-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.12-branch.git --public --do-it || echo ERROR -# from branch 4.11 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-4.11-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.11-branch.git --public --do-it || echo ERROR -# from branch 4.10 -#0 21 * * Mon,Tue cd $HOME/CGAL/create_internal_release-4.10-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.10-branch.git --public --do-it || echo ERROR -# from branch 4.9 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-4.9-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.9-branch.git --public --do-it -# from branch 4.8 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-4.8-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.8-branch.git --public --do-it -# from branch 4.7 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-4.7-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.7-branch.git --public --do-it -# from branch 4.6 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-4.6-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.6-branch.git --public --do-it -# from branch 4.5 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-4.5-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.5-branch.git --public --do-it - -# Launch our Docker testsuite , at 21:36, -# after a pull of all new images at 20:23. -06 20 * * * for i in $(cat /home/lrineau/.config/CGAL/test_cgal_docker_images); do docker pull $i; done; docker rmi $(docker images | awk '// {print $3}') -36 21 * * * cd /home/lrineau/Git/cgal-testsuite-dockerfiles && /usr/bin/time ./test_cgal.py --use-fedora-selinux-policy --force-rm --max-cpus 20 --container-cpus 8 --jobs 10 --upload-results --images $($HOME/bin/docker_images_to_test_today) - - -# Dump the crontab to SVN every hour at minute 18 -18 * * * * $HOME/bin/dump_crontab - -# Docker check every hour -#0 * * * * docker inspect --format='{{json .State.Health.Status}}' cgal-mediawiki-docker_wiki_1 | grep -q '"healthy"' || docker logs cgal-mediawiki-docker_wiki_1 - -# cgal->cgal2 with git-multimail -#*/5 * * * * cd $HOME/Git/cgal-dev-pusher.git && $HOME/bin/git-fetch-and-push-to-multimail cgal-dev cgal-dev-receiver -#*/5 * * * * cd $HOME/Git/cgal-pusher.git && $HOME/bin/git-fetch-and-push-to-multimail cgal cgal-receiver -#*/5 * * * * cd $HOME/Git/cgal-students-pusher.git && $HOME/bin/git-fetch-and-push-to-multimail cgal-public-dev cgal-students-receiver -#*/5 * * * * cd $HOME/Git/cgal-web-pusher.git && $HOME/bin/git-fetch-and-push-to-multimail cgal-web cgal-web-receiver - -#################################### -# Old stuff -#################################### - -## Manual Test suite, at 9:40pm -#40 21 * * * cd $HOME/CGAL/releases-and-testsuites-with-cmake/CGAL-I/doc_tex; nice -19 $HOME/bin/cgal_manual -testsuite || true -## Doxygen Test suite, at 9:05pm -#20 21 * * * time $HOME/CGAL/python-3.3/bin/python3 $HOME/CGAL/doxy-port-pmoeller/Documentation/testsuite.py --doxyassist $HOME/CGAL/doxyassist/doxyassist.py --doxygen $HOME/Git/doxygen-fixes/bin/doxygen --documentation $HOME/CGAL/doxy-port-pmoeller/Documentation --publish /var/CGAL/www/Members/Doxygen_test/ --do-update --do-purge-rebuild - -# "next" alone -#0 21 * * Sat cd $HOME/CGAL/create_internal_release && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/next.svn --public --do-it -# "next" + candidates -#0 21 * * Mon,Tue,Wed,Thu,Fri cd $HOME/CGAL/create_internal_release && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/next.svn $HOME/CGAL/candidate-packages --public --do-it -# from branch 4.1 -#0 21 * * Sun cd $HOME/CGAL/create_internal_release-4.1-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/CGAL-4.1-branch --public --do-it -# from branch 4.4 -#0 21 * * Sun cd $HOME/CGAL/create_internal_release-4.4-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/CGAL-4.4-branch.git --public --do-it -# "integration-4.5" -#0 21 * * Sat,Mon cd $HOME/CGAL/create_internal_release-4.5-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/branches/integration-4.5.git $HOME/CGAL/branches/empty-dir --do-it --public - -# - from branch 3.4 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-3.4-branch; scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/CGAL-3.4-branch --public --do-it -# - from branch 3.7 -#0 21 * * Fri cd $HOME/CGAL/create_internal_release-3.7-branch; scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/CGAL-3.7-branch --public --do-it -# - from branch 3.9 -#0 21 * * Sat cd $HOME/CGAL/create_internal_release-3.9-branch; scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/CGAL-3.9-branch --public --do-it -# - from branch 4.0 -#0 21 * * Sun cd $HOME/CGAL/create_internal_release-4.0-branch && /usr/bin/time scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/CGAL-4.0-branch --public --do-it -# - on trunk -#0 21 * * Sat cd $HOME/CGAL/create_internal_release; scl enable rh-git29 -- $HOME/bin/create_release $HOME/CGAL/trunk --public --do-it - -# Check the links of http://www.cgal.org/projects.html every sunday at 17:42 -#42 17 * * Sun linklint -host www.cgal.org -http /projects.html -net -no_anchors -quiet -silent -error - -# A test that does not work -#30 21 * * * grep 'conflicts with' $HOME/CGAL/create_internal_release/create_release.log.`date '+%Y-%m-%d'`* --no-filename - diff --git a/Maintenance/infrastructure/cgal.geometryfactory.com/partition-table-sda.txt b/Maintenance/infrastructure/cgal.geometryfactory.com/partition-table-sda.txt deleted file mode 100644 index 7ba18c16b03..00000000000 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/partition-table-sda.txt +++ /dev/null @@ -1,12 +0,0 @@ -# partition table of /dev/sda -unit: sectors - -/dev/sda1 : start= 63, size= 20482812, Id=fd, bootable -/dev/sda2 : start= 20482875, size= 16383174, Id=fd -/dev/sda3 : start= 36866049, size=2893406016, Id= f -/dev/sda4 : start= 0, size= 0, Id= 0 -/dev/sda5 : start= 36866050, size=2893406015, Id=fd -# -# Restore with: -# sfdisk --force /dev/sda < partition-table-sda.txt -# diff --git a/Stream_support/include/CGAL/IO/Color.h b/Stream_support/include/CGAL/IO/Color.h index daee2d37b40..4345c3dd9d9 100644 --- a/Stream_support/include/CGAL/IO/Color.h +++ b/Stream_support/include/CGAL/IO/Color.h @@ -151,13 +151,13 @@ class Color /*! returns the \f$i^{th}\f$ component of the rgb color (the - \f$0^{th}\f$ is red, the \f$1^{st}\f$ is blue, etc.). + \f$0^{th}\f$ is red, the \f$1^{st}\f$ is green, the \f$2^{nd}\f$ is blue and the \f$3^{rd}\f$ is alpha). */ unsigned char operator[] (std::size_t i) const { return m_data[i]; } /*! - returns a reference on the \f$i^{th}\f$ component of `c` (the - \f$0^{th}\f$ is red, the \f$1^{st}\f$ is blue, etc.). + returns a reference on the \f$i^{th}\f$ component of the rgb color (the + \f$0^{th}\f$ is red, the \f$1^{st}\f$ is green, the \f$2^{nd}\f$ is blue and the \f$3^{rd}\f$ is alpha). */ unsigned char& operator[] (std::size_t i) { return m_data[i]; } diff --git a/Three/include/CGAL/Three/Scene_item.h b/Three/include/CGAL/Three/Scene_item.h index b517a9c9108..4fbe0558392 100644 --- a/Three/include/CGAL/Three/Scene_item.h +++ b/Three/include/CGAL/Three/Scene_item.h @@ -64,25 +64,25 @@ class SCENE_ITEM_EXPORT Scene_item : public QObject{ */ enum OpenGL_program_IDs { - ROGRAM_WITH_LIGHT = 0, //! Used to render a surface or an edge affected by the light. It uses a per fragment lighting model, and renders the selected item brighter. - PROGRAM_WITHOUT_LIGHT, //! Used to render a polyhedron edge or points. It renders in a uniform color and is not affected by light. \attention It renders the selected item in black. - PROGRAM_NO_SELECTION, //! Used to render a polyline or a surface that is not affected by light, like a cutting plane. It renders in a uniform color that does not change with selection. - PROGRAM_WITH_TEXTURE, //! Used to render a textured polyhedron. Affected by light. - PROGRAM_PLANE_TWO_FACES, //! Used to render a two-faced plane. The two faces have a different color. Not affected by light. - PROGRAM_WITH_TEXTURED_EDGES, //! Used to render the edges of a textured polyhedron. Not affected by light. - PROGRAM_INSTANCED, //! Used to display instanced rendered spheres.Affected by light. - PROGRAM_INSTANCED_WIRE, //! Used to display instanced rendered wired spheres. Not affected by light. - PROGRAM_C3T3, //! Used to render a c3t3_item. It discards any fragment on a side of a plane, meaning that nothing is displayed on this side of the plane. Affected by light. - PROGRAM_C3T3_EDGES, //! Used to render the edges of a c3t3_item. It discards any fragment on a side of a plane, meaning that nothing is displayed on this side of the plane. Not affected by light. - PROGRAM_CUTPLANE_SPHERES, //! Used to render the spheres of an item with a cut plane. - PROGRAM_SPHERES, //! Used to render one or several spheres. - PROGRAM_DARK_SPHERES, //! Used to render one or several spheres without light (for picking for example). - PROGRAM_FLAT, /** Used to render flat shading without pre computing normals*/ - PROGRAM_OLD_FLAT, /** Used to render flat shading without pre computing normals without geometry shader*/ - PROGRAM_SOLID_WIREFRAME, //! Used to render edges with width superior to 1. - PROGRAM_NO_INTERPOLATION, //! Used to render faces without interpolating their color. - PROGRAM_HEAT_INTENSITY, //! Used to render special item in Heat_method_plugin - NB_OF_PROGRAMS //! Holds the number of different programs in this enum. + ROGRAM_WITH_LIGHT = 0, //!< Used to render a surface or an edge affected by the light. It uses a per fragment lighting model, and renders the selected item brighter. + PROGRAM_WITHOUT_LIGHT, //!< Used to render a polyhedron edge or points. It renders in a uniform color and is not affected by light. \attention It renders the selected item in black. + PROGRAM_NO_SELECTION, //!< Used to render a polyline or a surface that is not affected by light, like a cutting plane. It renders in a uniform color that does not change with selection. + PROGRAM_WITH_TEXTURE, //!< Used to render a textured polyhedron. Affected by light. + PROGRAM_PLANE_TWO_FACES, //!< Used to render a two-faced plane. The two faces have a different color. Not affected by light. + PROGRAM_WITH_TEXTURED_EDGES, //!< Used to render the edges of a textured polyhedron. Not affected by light. + PROGRAM_INSTANCED, //!< Used to display instanced rendered spheres.Affected by light. + PROGRAM_INSTANCED_WIRE, //!< Used to display instanced rendered wired spheres. Not affected by light. + PROGRAM_C3T3, //!< Used to render a c3t3_item. It discards any fragment on a side of a plane, meaning that nothing is displayed on this side of the plane. Affected by light. + PROGRAM_C3T3_EDGES, //!< Used to render the edges of a c3t3_item. It discards any fragment on a side of a plane, meaning that nothing is displayed on this side of the plane. Not affected by light. + PROGRAM_CUTPLANE_SPHERES, //!< Used to render the spheres of an item with a cut plane. + PROGRAM_SPHERES, //!< Used to render one or several spheres. + PROGRAM_DARK_SPHERES, //!< Used to render one or several spheres without light (for picking for example). + PROGRAM_FLAT, //!< Used to render flat shading without pre computing normals + PROGRAM_OLD_FLAT, //!< Used to render flat shading without pre computing normals without geometry shader + PROGRAM_SOLID_WIREFRAME, //!< Used to render edges with width superior to 1. + PROGRAM_NO_INTERPOLATION, //!< Used to render faces without interpolating their color. + PROGRAM_HEAT_INTENSITY, //!< Used to render special item in Heat_method_plugin + NB_OF_PROGRAMS //!< Holds the number of different programs in this enum. }; typedef CGAL::Bbox_3 Bbox; typedef CGAL::qglviewer::ManipulatedFrame ManipulatedFrame; diff --git a/Three/include/CGAL/Three/Viewer_interface.h b/Three/include/CGAL/Three/Viewer_interface.h index 2bdba0aadd3..63d6824d613 100644 --- a/Three/include/CGAL/Three/Viewer_interface.h +++ b/Three/include/CGAL/Three/Viewer_interface.h @@ -53,26 +53,26 @@ class VIEWER_EXPORT Viewer_interface : public CGAL::QGLViewer{ */ enum OpenGL_program_IDs { - PROGRAM_WITH_LIGHT = 0, //! Used to render a surface or an edge affected by the light. It uses a per fragment lighting model, and renders the selected item brighter. - PROGRAM_WITHOUT_LIGHT, //! Used to render a polyhedron edge or points. It renders in a uniform color and is not affected by light. \attention It renders the selected item in black. - PROGRAM_NO_SELECTION, //! Used to render a polyline or a surface that is not affected by light, like a cutting plane. It renders in a uniform color that does not change with selection. - PROGRAM_WITH_TEXTURE, //! Used to render a textured polyhedron. Affected by light. - PROGRAM_PLANE_TWO_FACES, //! Used to render a two-faced plane. The two faces have a different color. Not affected by light. - PROGRAM_WITH_TEXTURED_EDGES, //! Used to render the edges of a textured polyhedron. Not affected by light. - PROGRAM_INSTANCED, //! Used to display instanced rendered spheres.Affected by light. - PROGRAM_INSTANCED_WIRE, //! Used to display instanced rendered wired spheres. Not affected by light. - PROGRAM_C3T3, //! Used to render a c3t3_item. It discards any fragment on a side of a plane, meaning that nothing is displayed on this side of the plane. Affected by light. - PROGRAM_C3T3_EDGES, //! Used to render the edges of a c3t3_item. It discards any fragment on a side of a plane, meaning that nothing is displayed on this side of the plane. Not affected by light. - PROGRAM_CUTPLANE_SPHERES, //! Used to render the spheres of an item with a cut plane. - PROGRAM_SPHERES, //! Used to render one or several spheres. - PROGRAM_DARK_SPHERES, //! Used to render one or several spheres without light (for picking for example). - PROGRAM_FLAT, /** Used to render flat shading without pre computing normals*/ - PROGRAM_OLD_FLAT, /** Used to render flat shading without pre computing normals without geometry shader*/ - PROGRAM_SOLID_WIREFRAME, //! Used to render edges with width superior to 1. - PROGRAM_NO_INTERPOLATION, //! Used to render faces without interpolating their color. - PROGRAM_HEAT_INTENSITY, //! Used to render special item in Heat_method_plugin - PROGRAM_TETRA_FILTERING, //! Used in Scene_tetrahedra_item with Tetrahedra_filtering_plugin - NB_OF_PROGRAMS //! Holds the number of different programs in this enum. + PROGRAM_WITH_LIGHT = 0, //!< Used to render a surface or an edge affected by the light. It uses a per fragment lighting model, and renders the selected item brighter. + PROGRAM_WITHOUT_LIGHT, //!< Used to render a polyhedron edge or points. It renders in a uniform color and is not affected by light. \attention It renders the selected item in black. + PROGRAM_NO_SELECTION, //!< Used to render a polyline or a surface that is not affected by light, like a cutting plane. It renders in a uniform color that does not change with selection. + PROGRAM_WITH_TEXTURE, //!< Used to render a textured polyhedron. Affected by light. + PROGRAM_PLANE_TWO_FACES, //!< Used to render a two-faced plane. The two faces have a different color. Not affected by light. + PROGRAM_WITH_TEXTURED_EDGES, //!< Used to render the edges of a textured polyhedron. Not affected by light. + PROGRAM_INSTANCED, //!< Used to display instanced rendered spheres.Affected by light. + PROGRAM_INSTANCED_WIRE, //!< Used to display instanced rendered wired spheres. Not affected by light. + PROGRAM_C3T3, //!< Used to render a c3t3_item. It discards any fragment on a side of a plane, meaning that nothing is displayed on this side of the plane. Affected by light. + PROGRAM_C3T3_EDGES, //!< Used to render the edges of a c3t3_item. It discards any fragment on a side of a plane, meaning that nothing is displayed on this side of the plane. Not affected by light. + PROGRAM_CUTPLANE_SPHERES, //!< Used to render the spheres of an item with a cut plane. + PROGRAM_SPHERES, //!< Used to render one or several spheres. + PROGRAM_DARK_SPHERES, //!< Used to render one or several spheres without light (for picking for example). + PROGRAM_FLAT, //!< Used to render flat shading without pre computing normals + PROGRAM_OLD_FLAT, //!< Used to render flat shading without pre computing normals without geometry shader + PROGRAM_SOLID_WIREFRAME, //!< Used to render edges with width superior to 1. + PROGRAM_NO_INTERPOLATION, //!< Used to render faces without interpolating their color. + PROGRAM_HEAT_INTENSITY, //!< Used to render special item in Heat_method_plugin + PROGRAM_TETRA_FILTERING, //!< Used in Scene_tetrahedra_item with Tetrahedra_filtering_plugin + NB_OF_PROGRAMS //!< Holds the number of different programs in this enum. }; //! \brief The viewer's QPainter