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

master > main across scripts and documentation

This commit is contained in:
Mael Rouxel-Labbé 2025-09-19 16:08:27 +02:00
parent b3e2f204a4
commit 6567d54ca3
10 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/delete_doc.yml vendored
View File

@ -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

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

@ -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 <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;"
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() {
'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 <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;"
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() {
'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 <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;"
let OK = top_elt.insertBefore(new_div, first_element);
}

4
README.md
View File

@ -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)

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

@ -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

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
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
)

4
Scripts/developer_scripts/cgal_git_update_hooks_for_client
View File

@ -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

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.
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

8
Scripts/developer_scripts/run_doxygen_testsuite
View File

@ -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