From 5564cb247f45a1c24ad3131a994a87126f97aef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 28 Apr 2023 20:08:58 +0200 Subject: [PATCH 1/3] bump CGAL version to 6.0 --- Installation/include/CGAL/version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Installation/include/CGAL/version.h b/Installation/include/CGAL/version.h index d90474f8913..482cd7db1a6 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 5.6-beta1 +#define CGAL_VERSION 6.0-beta1 #define CGAL_GIT_HASH abcdef #endif -#define CGAL_VERSION_NR 1050600910 +#define CGAL_VERSION_NR 1060000910 #define CGAL_SVN_REVISION 99999 -#define CGAL_RELEASE_DATE 20230430 +#define CGAL_RELEASE_DATE 20231001 #include From 29b84248f844608560adeda5afd1641d38403612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 28 Apr 2023 23:08:22 +0200 Subject: [PATCH 2/3] missing 6.0 updates # Conflicts: # Documentation/doc/resources/1.8.20/menu_version.js # Documentation/doc/resources/1.8.4/menu_version.js # Documentation/doc/resources/1.9.3/menu_version.js --- Documentation/doc/resources/1.8.13/menu_version.js | 3 ++- Documentation/doc/resources/1.9.6/menu_version.js | 3 ++- Installation/lib/cmake/CGAL/CGALConfigVersion.cmake | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Documentation/doc/resources/1.8.13/menu_version.js b/Documentation/doc/resources/1.8.13/menu_version.js index a66903b10fe..f3b20c2fe00 100644 --- a/Documentation/doc/resources/1.8.13/menu_version.js +++ b/Documentation/doc/resources/1.8.13/menu_version.js @@ -6,7 +6,8 @@ var current_version_local = 'master' var all_versions = [ 'master', - '5.6-beta1', + '6.0-beta1', + '5.6', 'latest', '5.5.2', '5.4.4', diff --git a/Documentation/doc/resources/1.9.6/menu_version.js b/Documentation/doc/resources/1.9.6/menu_version.js index a66903b10fe..f3b20c2fe00 100644 --- a/Documentation/doc/resources/1.9.6/menu_version.js +++ b/Documentation/doc/resources/1.9.6/menu_version.js @@ -6,7 +6,8 @@ var current_version_local = 'master' var all_versions = [ 'master', - '5.6-beta1', + '6.0-beta1', + '5.6', 'latest', '5.5.2', '5.4.4', diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake index e71784c4c52..fc443126c18 100644 --- a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake +++ b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake @@ -1,8 +1,8 @@ -set(CGAL_MAJOR_VERSION 5) -set(CGAL_MINOR_VERSION 6) +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 "5.6-beta1") +set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0-beta1") set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}") if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0) From 12cc83e7d57f806fd98f032cd18220b922a778db Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 13 Jun 2023 13:32:56 +0200 Subject: [PATCH 3/3] prepare the creation of 5.6-beta2 and 6.0-dev --- Installation/include/CGAL/version.h | 4 ++-- Installation/lib/cmake/CGAL/CGALConfigVersion.cmake | 2 +- .../cgal.geometryfactory.com/bin/cgal_release.py | 3 +++ .../bin/create_internal_release_of_the_day.py | 8 ++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Installation/include/CGAL/version.h b/Installation/include/CGAL/version.h index 482cd7db1a6..584452d7d67 100644 --- a/Installation/include/CGAL/version.h +++ b/Installation/include/CGAL/version.h @@ -17,10 +17,10 @@ #define CGAL_VERSION_H #ifndef SWIG -#define CGAL_VERSION 6.0-beta1 +#define CGAL_VERSION 6.0-dev #define CGAL_GIT_HASH abcdef #endif -#define CGAL_VERSION_NR 1060000910 +#define CGAL_VERSION_NR 1060000900 #define CGAL_SVN_REVISION 99999 #define CGAL_RELEASE_DATE 20231001 diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake index fc443126c18..2687e75956e 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-beta1") +set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "6.0-dev") 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/bin/cgal_release.py b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py index 50634394094..a835da2c812 100644 --- a/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py +++ b/Maintenance/infrastructure/cgal.geometryfactory.com/bin/cgal_release.py @@ -72,6 +72,9 @@ def beta_release_from_master(beta_number): 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""" 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 index 36daeb35eaf..cd976dd2d01 100644 --- 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 @@ -8,7 +8,7 @@ import os import datetime import locale 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 actions = { @@ -16,9 +16,9 @@ actions = { "Tuesday": integration, "Wednesday": integration, "Thursday": integration, - "Friday": release("5.5"), - "Saturday": release("5.4"), - "Sunday": beta_release_from_master(1), + "Friday": beta_release("5.6", 2), + "Saturday": release("5.5"), + "Sunday": master, }