From 6567d54ca39a8524405bf3cfd59ff6f301f594ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?= Date: Fri, 19 Sep 2025 16:08:27 +0200 Subject: [PATCH] master > main across scripts and documentation --- .github/workflows/delete_doc.yml | 2 +- Documentation/doc/resources/1.14.0/menu_version.js | 10 +++++----- Documentation/doc/resources/1.8.13/menu_version.js | 10 +++++----- Documentation/doc/resources/1.9.6/menu_version.js | 10 +++++----- README.md | 4 ++-- Scripts/developer_scripts/cgal-show-testsuites | 4 ++-- .../cgal_create_release_with_cmake.cmake | 4 ++-- .../developer_scripts/cgal_git_update_hooks_for_client | 4 ++-- Scripts/developer_scripts/git-show-content | 4 ++-- Scripts/developer_scripts/run_doxygen_testsuite | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/delete_doc.yml b/.github/workflows/delete_doc.yml index 00fd3bac27a..cf260094bda 100644 --- a/.github/workflows/delete_doc.yml +++ b/.github/workflows/delete_doc.yml @@ -38,5 +38,5 @@ jobs: fi # `git diff --quiet` exits with 1 if there is a diff if ! git diff --quiet; then - git commit -a --amend -m"base commit" && git push -f -u origin master + git commit -a --amend -m"base commit" && git push -f -u origin main fi diff --git a/Documentation/doc/resources/1.14.0/menu_version.js b/Documentation/doc/resources/1.14.0/menu_version.js index 5a33e8c8f23..9abec9bff93 100644 --- a/Documentation/doc/resources/1.14.0/menu_version.js +++ b/Documentation/doc/resources/1.14.0/menu_version.js @@ -1,11 +1,11 @@ (function() { 'use strict'; - var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; + var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(main|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; var url_local = /.*\/doc_output\//; - var current_version_local = 'master' + var current_version_local = 'main' var all_versions = [ - 'master', + 'main', '6.1-beta2', '6.0.2', 'latest', @@ -31,12 +31,12 @@ ]; function build_select(current_version) { - if( current_version == 'master') { + if( current_version == 'main') { let top_elt = document.getElementById("top"); let first_element = top_elt.childNodes[0]; let new_div = document.createElement("p"); - new_div.innerHTML = '⚠️ This documentation corresponds to the master development branch of CGAL. It might diverge from the official releases.'; + new_div.innerHTML = '⚠️ This documentation corresponds to the main development branch of CGAL. It might diverge from the official releases.'; new_div.style.cssText = "background-color: #ff9800; margin: 1ex auto 1ex 1em; padding: 1ex; border-radius: 1ex; display: inline-block;" let OK = top_elt.insertBefore(new_div, first_element); } diff --git a/Documentation/doc/resources/1.8.13/menu_version.js b/Documentation/doc/resources/1.8.13/menu_version.js index 5a33e8c8f23..9abec9bff93 100644 --- a/Documentation/doc/resources/1.8.13/menu_version.js +++ b/Documentation/doc/resources/1.8.13/menu_version.js @@ -1,11 +1,11 @@ (function() { 'use strict'; - var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; + var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(main|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; var url_local = /.*\/doc_output\//; - var current_version_local = 'master' + var current_version_local = 'main' var all_versions = [ - 'master', + 'main', '6.1-beta2', '6.0.2', 'latest', @@ -31,12 +31,12 @@ ]; function build_select(current_version) { - if( current_version == 'master') { + if( current_version == 'main') { let top_elt = document.getElementById("top"); let first_element = top_elt.childNodes[0]; let new_div = document.createElement("p"); - new_div.innerHTML = '⚠️ This documentation corresponds to the master development branch of CGAL. It might diverge from the official releases.'; + new_div.innerHTML = '⚠️ This documentation corresponds to the main development branch of CGAL. It might diverge from the official releases.'; new_div.style.cssText = "background-color: #ff9800; margin: 1ex auto 1ex 1em; padding: 1ex; border-radius: 1ex; display: inline-block;" let OK = top_elt.insertBefore(new_div, first_element); } diff --git a/Documentation/doc/resources/1.9.6/menu_version.js b/Documentation/doc/resources/1.9.6/menu_version.js index 5a33e8c8f23..9abec9bff93 100644 --- a/Documentation/doc/resources/1.9.6/menu_version.js +++ b/Documentation/doc/resources/1.9.6/menu_version.js @@ -1,11 +1,11 @@ (function() { 'use strict'; - var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(master|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; + var url_re = /(cgal\.geometryfactory\.com\/CGAL\/doc\/|doc\.cgal\.org\/)(main|latest|(\d\.\d+|\d\.\d+\.\d+)(-beta\d)?)\//; var url_local = /.*\/doc_output\//; - var current_version_local = 'master' + var current_version_local = 'main' var all_versions = [ - 'master', + 'main', '6.1-beta2', '6.0.2', 'latest', @@ -31,12 +31,12 @@ ]; function build_select(current_version) { - if( current_version == 'master') { + if( current_version == 'main') { let top_elt = document.getElementById("top"); let first_element = top_elt.childNodes[0]; let new_div = document.createElement("p"); - new_div.innerHTML = '⚠️ This documentation corresponds to the master development branch of CGAL. It might diverge from the official releases.'; + new_div.innerHTML = '⚠️ This documentation corresponds to the main development branch of CGAL. It might diverge from the official releases.'; new_div.style.cssText = "background-color: #ff9800; margin: 1ex auto 1ex 1em; padding: 1ex; border-radius: 1ex; display: inline-block;" let OK = top_elt.insertBefore(new_div, first_element); } diff --git a/README.md b/README.md index 2d51a910d8a..2415111daa0 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ or `Triangulation_3`); however some packages serve special needs: More Information ================ * [The CGAL web site](https://www.cgal.org/) -* [Latest CGAL release documentation pages](https://doc.cgal.org/) -* [Latest CGAL master documentation pages, updated once a week](https://cgal.geometryfactory.com/CGAL/doc/master/) +* [Documentation of the latest CGAL release](https://doc.cgal.org/) +* [Documentation of the CGAL `main` branch (updated weekly)](https://cgal.geometryfactory.com/CGAL/doc/master/) * [CGAL daily testsuite results](https://cgal.geometryfactory.com/CGAL/testsuite/) * [Guidelines for CGAL developers](https://github.com/CGAL/cgal/wiki/Guidelines) and [Information for new developers](https://github.com/CGAL/cgal/wiki/Information-for-New-Developers) diff --git a/Scripts/developer_scripts/cgal-show-testsuites b/Scripts/developer_scripts/cgal-show-testsuites index 4c813e6c1d3..f01f52e924f 100755 --- a/Scripts/developer_scripts/cgal-show-testsuites +++ b/Scripts/developer_scripts/cgal-show-testsuites @@ -11,10 +11,10 @@ for d in $(seq 0 6); do echo echo -n "## $(date +'%A' -d "now+$d day") night" git "--git-dir=$CGAL_GIT_DIR" log --format='%Cblue%d%Creset %h' --color=always -n1 cgal-dev/testsuite-$(date +'%A' -d "now+$d day") - git "--git-dir=$CGAL_GIT_DIR" log --format='%Cred%h%Creset %C(bold blue)<%an>%Creset %Cgreen(%cr)%Creset (parents: %C(yellow)%p%Creset)%n %s' --first-parent --decorate cgal/master..cgal-dev/testsuite-$(date +'%A' -d "now+$d day") + git "--git-dir=$CGAL_GIT_DIR" log --format='%Cred%h%Creset %C(bold blue)<%an>%Creset %Cgreen(%cr)%Creset (parents: %C(yellow)%p%Creset)%n %s' --first-parent --decorate cgal/main..cgal-dev/testsuite-$(date +'%A' -d "now+$d day") done echo echo '## cgal-dev/integration' -git "--git-dir=$CGAL_GIT_DIR" log --format='%Cred%h%Creset %C(bold blue)<%an>%Creset %Cgreen(%cr)%Creset (parents: %C(yellow)%p%Creset)%n %s' --first-parent --decorate cgal/master..cgal-dev/integration +git "--git-dir=$CGAL_GIT_DIR" log --format='%Cred%h%Creset %C(bold blue)<%an>%Creset %Cgreen(%cr)%Creset (parents: %C(yellow)%p%Creset)%n %s' --first-parent --decorate cgal/main..cgal-dev/integration } |& less -S --raw +G -X diff --git a/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake b/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake index 1d8a21b403e..f8b901b9124 100644 --- a/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake +++ b/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake @@ -210,7 +210,7 @@ endforeach() # make an extra copy of examples and demos for the testsuite if (TESTSUITE) - SET(FMT_ARG "format:SCM branch:%n%H %d%n%nShort log from master:%n") + SET(FMT_ARG "format:SCM branch:%n%H %d%n%nShort log from main:%n") execute_process( COMMAND git --git-dir=${GIT_REPO}/.git --work-tree=${GIT_REPO} log -n1 --format=${FMT_ARG} WORKING_DIRECTORY "${release_dir}" @@ -220,7 +220,7 @@ if (TESTSUITE) file(WRITE ${release_dir}/.scm-branch "${OUT_VAR}") SET(FMT_ARG "%h %s%n parents: %p%n") execute_process( - COMMAND git --git-dir=${GIT_REPO}/.git --work-tree=${GIT_REPO} log --first-parent --format=${FMT_ARG} cgal/master.. + COMMAND git --git-dir=${GIT_REPO}/.git --work-tree=${GIT_REPO} log --first-parent --format=${FMT_ARG} cgal/main.. WORKING_DIRECTORY "${release_dir}" OUTPUT_VARIABLE OUT_VAR ) diff --git a/Scripts/developer_scripts/cgal_git_update_hooks_for_client b/Scripts/developer_scripts/cgal_git_update_hooks_for_client index caac1420362..b214eb2237b 100755 --- a/Scripts/developer_scripts/cgal_git_update_hooks_for_client +++ b/Scripts/developer_scripts/cgal_git_update_hooks_for_client @@ -15,9 +15,9 @@ then exit fi -if [ "$branch" != "master" ]; +if [ "$branch" != "main" ]; then - echo "Call $0 from branch 'master'" + echo "Call $0 from branch 'main'" exit fi diff --git a/Scripts/developer_scripts/git-show-content b/Scripts/developer_scripts/git-show-content index 3d34694a5f7..cfdbb53fa2e 100755 --- a/Scripts/developer_scripts/git-show-content +++ b/Scripts/developer_scripts/git-show-content @@ -14,13 +14,13 @@ and show for each the weight of the commit. [HEAD] is the head of the branch you want to display. Its default value is 'HEAD'. -[BASE] is the base of the range. Its default value is 'cgal/master'. +[BASE] is the base of the range. Its default value is 'cgal/main'. EOF exit 0 fi commit=${1:-HEAD} -base=${2:-cgal/master} +base=${2:-cgal/main} function reset() { git update-ref -d refs/cgal/git-show-content diff --git a/Scripts/developer_scripts/run_doxygen_testsuite b/Scripts/developer_scripts/run_doxygen_testsuite index 5aaab01d981..d76ecc9c1de 100755 --- a/Scripts/developer_scripts/run_doxygen_testsuite +++ b/Scripts/developer_scripts/run_doxygen_testsuite @@ -70,11 +70,11 @@ PATH=/home/cgal-testsuite/local/bin:$PATH export PATH cd "${PWD}/doc/scripts" bash -$- ./process_doc.sh /home/cgal-testsuite/bin/doxygen_1_8_13 /home/cgal-testsuite/bin/doxygen_1_9_6 /srv/CGAL/www/Members/Manual_doxygen_test -if head -2 ../../.scm-branch | grep -q cgal/master; then - rsync -a --delete "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}/output2/" /srv/CGAL/www/doc/master/ +if head -2 ../../.scm-branch | grep -q cgal/main; then + rsync -a --delete "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}/output2/" /srv/CGAL/www/doc/main/ fi -if sestatus &>/dev/null && [ -d "/srv/CGAL/www/doc/master/" ] && [ -d "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}" ]; then - restorecon -R /srv/CGAL/www/doc/master/ /srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID} || error "restorecon command failed" +if sestatus &>/dev/null && [ -d "/srv/CGAL/www/doc/main/" ] && [ -d "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}" ]; then + restorecon -R /srv/CGAL/www/doc/main/ /srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID} || error "restorecon command failed" else error "SELinux is not enabled or the paths do not exist" fi