songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename `master` to `main` in our scripts

This commit is contained in:
Laurent Rineau 2025-09-19 17:32:59 +02:00
parent b3e2f204a4
commit f017011037
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/doc/resources/1.14.0/menu_version.js
View File

@ -1,11 +1,11 @@
(function() { (function() {
'use strict'; '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 url_local = /.*\/doc_output\//;
var current_version_local = 'master' var current_version_local = 'main'
var all_versions = [ var all_versions = [
'master', 'main',
'6.1-beta2', '6.1-beta2',
'6.0.2', '6.0.2',
'latest', 'latest',
@ -31,12 +31,12 @@
]; ];
function build_select(current_version) { function build_select(current_version) {
if( current_version == 'master') { if( current_version == 'main') {
let top_elt = document.getElementById("top"); let top_elt = document.getElementById("top");
let first_element = top_elt.childNodes[0]; let first_element = top_elt.childNodes[0];
let new_div = document.createElement("p"); let new_div = document.createElement("p");
new_div.innerHTML = '⚠️ This documentation corresponds to the <a style="font-familly: monospace;" href="https://github.com/CGAL/cgal/tree/master">master</a> development branch of CGAL. It might diverge from the official releases.'; new_div.innerHTML = '⚠️ This documentation corresponds to the <a style="font-familly: monospace;" href="https://github.com/CGAL/cgal/tree/main">main</a> 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;" 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); let OK = top_elt.insertBefore(new_div, first_element);
} }

10
Documentation/doc/resources/1.8.13/menu_version.js
View File

@ -1,11 +1,11 @@
(function() { (function() {
'use strict'; '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 url_local = /.*\/doc_output\//;
var current_version_local = 'master' var current_version_local = 'main'
var all_versions = [ var all_versions = [
'master', 'main',
'6.1-beta2', '6.1-beta2',
'6.0.2', '6.0.2',
'latest', 'latest',
@ -31,12 +31,12 @@
]; ];
function build_select(current_version) { function build_select(current_version) {
if( current_version == 'master') { if( current_version == 'main') {
let top_elt = document.getElementById("top"); let top_elt = document.getElementById("top");
let first_element = top_elt.childNodes[0]; let first_element = top_elt.childNodes[0];
let new_div = document.createElement("p"); let new_div = document.createElement("p");
new_div.innerHTML = '⚠️ This documentation corresponds to the <a style="font-familly: monospace;" href="https://github.com/CGAL/cgal/tree/master">master</a> development branch of CGAL. It might diverge from the official releases.'; new_div.innerHTML = '⚠️ This documentation corresponds to the <a style="font-familly: monospace;" href="https://github.com/CGAL/cgal/tree/main">main</a> 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;" 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); let OK = top_elt.insertBefore(new_div, first_element);
} }

10
Documentation/doc/resources/1.9.6/menu_version.js
View File

@ -1,11 +1,11 @@
(function() { (function() {
'use strict'; '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 url_local = /.*\/doc_output\//;
var current_version_local = 'master' var current_version_local = 'main'
var all_versions = [ var all_versions = [
'master', 'main',
'6.1-beta2', '6.1-beta2',
'6.0.2', '6.0.2',
'latest', 'latest',
@ -31,12 +31,12 @@
]; ];
function build_select(current_version) { function build_select(current_version) {
if( current_version == 'master') { if( current_version == 'main') {
let top_elt = document.getElementById("top"); let top_elt = document.getElementById("top");
let first_element = top_elt.childNodes[0]; let first_element = top_elt.childNodes[0];
let new_div = document.createElement("p"); let new_div = document.createElement("p");
new_div.innerHTML = '⚠️ This documentation corresponds to the <a style="font-familly: monospace;" href="https://github.com/CGAL/cgal/tree/master">master</a> development branch of CGAL. It might diverge from the official releases.'; new_div.innerHTML = '⚠️ This documentation corresponds to the <a style="font-familly: monospace;" href="https://github.com/CGAL/cgal/tree/main">main</a> 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;" 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); let OK = top_elt.insertBefore(new_div, first_element);
} }

2
Maintenance/test_handling/testsuite_comparison/diff_testsuites.html
View File

@ -24,7 +24,7 @@
<p> <p>
Note that the diff should be done from left to right, as red or yellow squares in the left testsuite that become green in the right testsuite will be ignored. Note that the diff should be done from left to right, as red or yellow squares in the left testsuite that become green in the right testsuite will be ignored.
</p> </p>
I = Master<br> I = main<br>
Ic = integration Ic = integration
</p> </p>
<div> <div>

4
Scripts/developer_scripts/cgal-show-testsuites
View File

@ -11,10 +11,10 @@ for d in $(seq 0 6); do
echo echo
echo -n "## $(date +'%A' -d "now+$d day") night" 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='%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 done
echo echo
echo '## cgal-dev/integration' 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 } |& less -S --raw +G -X

4
Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
View File

@ -210,7 +210,7 @@ endforeach()
# make an extra copy of examples and demos for the testsuite # make an extra copy of examples and demos for the testsuite
if (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( execute_process(
COMMAND git --git-dir=${GIT_REPO}/.git --work-tree=${GIT_REPO} log -n1 --format=${FMT_ARG} COMMAND git --git-dir=${GIT_REPO}/.git --work-tree=${GIT_REPO} log -n1 --format=${FMT_ARG}
WORKING_DIRECTORY "${release_dir}" WORKING_DIRECTORY "${release_dir}"
@ -220,7 +220,7 @@ if (TESTSUITE)
file(WRITE ${release_dir}/.scm-branch "${OUT_VAR}") file(WRITE ${release_dir}/.scm-branch "${OUT_VAR}")
SET(FMT_ARG "%h %s%n parents: %p%n") SET(FMT_ARG "%h %s%n parents: %p%n")
execute_process( 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}" WORKING_DIRECTORY "${release_dir}"
OUTPUT_VARIABLE OUT_VAR OUTPUT_VARIABLE OUT_VAR
) )

4
Scripts/developer_scripts/cgal_git_update_hooks_for_client
View File

@ -15,9 +15,9 @@ then
exit exit
fi fi
if [ "$branch" != "master" ]; if [ "$branch" != "main" ];
then then
echo "Call $0 from branch 'master'" echo "Call $0 from branch 'main'"
exit exit
fi fi

2
Scripts/developer_scripts/create_new_release
View File

@ -28,7 +28,7 @@ usage() {
printerr ' --help : prints this usage help' printerr ' --help : prints this usage help'
printerr ' --public : also build the corresponding public versions' printerr ' --public : also build the corresponding public versions'
printerr ' --do-it : the real thing (NOT for local tests! Only for the release' printerr ' --do-it : the real thing (NOT for local tests! Only for the release'
printerr ' master! Does write operations (updating the version_number,' printerr ' main! Does write operations (updating the version_number,'
printerr ' tag, copying on the web server...)' printerr ' tag, copying on the web server...)'
printerr ' --do-not-tag : when used with --do-it, the tag is not created.' printerr ' --do-not-tag : when used with --do-it, the tag is not created.'
printerr ' --tag : when used without --do-it, the tag is created, but files' printerr ' --tag : when used without --do-it, the tag is created, but files'

4
Scripts/developer_scripts/git-show-content
View File

@ -14,13 +14,13 @@ and show for each the weight of the commit.
[HEAD] is the head of the branch you want to display. [HEAD] is the head of the branch you want to display.
Its default value is 'HEAD'. 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 EOF
exit 0 exit 0
fi fi
commit=${1:-HEAD} commit=${1:-HEAD}
base=${2:-cgal/master} base=${2:-cgal/main}
function reset() { function reset() {
git update-ref -d refs/cgal/git-show-content git update-ref -d refs/cgal/git-show-content

8
Scripts/developer_scripts/run_doxygen_testsuite
View File

@ -70,11 +70,11 @@ PATH=/home/cgal-testsuite/local/bin:$PATH
export PATH export PATH
cd "${PWD}/doc/scripts" 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 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 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/master/ rsync -a --delete "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}/output2/" /srv/CGAL/www/doc/main/
fi fi
if sestatus &>/dev/null && [ -d "/srv/CGAL/www/doc/master/" ] && [ -d "/srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID}" ]; then 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/master/ /srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID} || error "restorecon command failed" restorecon -R /srv/CGAL/www/doc/main/ /srv/CGAL/www/Members/Manual_doxygen_test/${CGAL_RELEASE_ID} || error "restorecon command failed"
else else
error "SELinux is not enabled or the paths do not exist" error "SELinux is not enabled or the paths do not exist"
fi fi