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

this branch now targets CGAL-6.0-dev 

(Merge branch 'prepare-6.0')
This commit is contained in:
Laurent Rineau 2023-06-13 13:34:53 +02:00
parent e9e50fdbf0 12cc83e7d5
commit 0a708f83ce
6 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,8 @@
var current_version_local = 'master' var current_version_local = 'master'
var all_versions = [ var all_versions = [
'master', 'master',
'5.6-beta1', '6.0-beta1',
'5.6',
'latest', 'latest',
'5.5.2', '5.5.2',
'5.4.4', '5.4.4',

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

@ -6,7 +6,8 @@
var current_version_local = 'master' var current_version_local = 'master'
var all_versions = [ var all_versions = [
'master', 'master',
'5.6-beta1', '6.0-beta1',
'5.6',
'latest', 'latest',
'5.5.2', '5.5.2',
'5.4.4', '5.4.4',

6
Installation/include/CGAL/version.h
View File

@ -17,12 +17,12 @@
#define CGAL_VERSION_H #define CGAL_VERSION_H
#ifndef SWIG #ifndef SWIG
#define CGAL_VERSION 5.6-beta1 #define CGAL_VERSION 6.0-dev
#define CGAL_GIT_HASH abcdef #define CGAL_GIT_HASH abcdef
#endif #endif
#define CGAL_VERSION_NR 1050600910 #define CGAL_VERSION_NR 1060000900
#define CGAL_SVN_REVISION 99999 #define CGAL_SVN_REVISION 99999
#define CGAL_RELEASE_DATE 20230430 #define CGAL_RELEASE_DATE 20231001
#include <CGAL/version_macros.h> #include <CGAL/version_macros.h>

6
Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
View File

@ -1,8 +1,8 @@
set(CGAL_MAJOR_VERSION 5) set(CGAL_MAJOR_VERSION 6)
set(CGAL_MINOR_VERSION 6) set(CGAL_MINOR_VERSION 0)
set(CGAL_BUGFIX_VERSION 0) set(CGAL_BUGFIX_VERSION 0)
include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake) include(${CMAKE_CURRENT_LIST_DIR}/CGALConfigBuildVersion.cmake)
set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "5.6-beta1") set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0-dev")
set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}") set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}")
if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0) if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)

3
Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py
View File

@ -72,6 +72,9 @@ def beta_release_from_master(beta_number):
rel.cwd = "$HOME/CGAL/create_internal_release" rel.cwd = "$HOME/CGAL/create_internal_release"
return rel 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): def release(branch):
"""Convenience function to create a release from a branch""" """Convenience function to create a release from a branch"""

8
Maintenance/infrastructure/cgal.geometryfactory.com/bin/create_internal_release_of_the_day.py
View File

@ -8,7 +8,7 @@ import os
import datetime import datetime
import locale import locale
import argparse import argparse
from cgal_release import release, integration, master, beta_release_from_master from cgal_release import release, integration, master, beta_release, master, beta_release_from_master
# Define a dictionary that maps day of the week to an action # Define a dictionary that maps day of the week to an action
actions = { actions = {
@ -16,9 +16,9 @@ actions = {
"Tuesday": integration, "Tuesday": integration,
"Wednesday": integration, "Wednesday": integration,
"Thursday": integration, "Thursday": integration,
"Friday": release("5.5"), "Friday": beta_release("5.6", 2),
"Saturday": release("5.4"), "Saturday": release("5.5"),
"Sunday": beta_release_from_master(1), "Sunday": master,
} }