From abf414df81cef3dddf9b1ae810168a71b182bb70 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Fri, 1 May 2020 16:24:19 +0200
Subject: [PATCH] Change create_new_release to use CGALConfigVersion.cmake as
 input

---
 Installation/lib/cmake/CGAL/CGALConfigVersion.cmake |  3 ++-
 Maintenance/release_building/BUGFIX_NUMBER          |  1 -
 Maintenance/release_building/MAJOR_NUMBER           |  1 -
 Maintenance/release_building/MINOR_NUMBER           |  1 -
 Maintenance/release_building/public_release_name    |  1 -
 Scripts/developer_scripts/create_new_release        | 13 ++++++++++---
 .../create_new_release_evaluate_versions.cmake      |  6 ++++++
 7 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 100644 Maintenance/release_building/BUGFIX_NUMBER
 delete mode 100644 Maintenance/release_building/MAJOR_NUMBER
 delete mode 100644 Maintenance/release_building/MINOR_NUMBER
 delete mode 100644 Maintenance/release_building/public_release_name
 create mode 100644 Scripts/developer_scripts/create_new_release_evaluate_versions.cmake

diff --git a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
index 77b73b21be0..16aa829ea9d 100644
--- a/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
+++ b/Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
@@ -1,7 +1,8 @@
 set(CGAL_MAJOR_VERSION 4)
 set(CGAL_MINOR_VERSION 14)
 set(CGAL_BUGFIX_VERSION 4)
-set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-4.14.4")
+set(CGAL_VERSION_PUBLIC_RELEASE_VERSION "4.14.4")
+set(CGAL_VERSION_PUBLIC_RELEASE_NAME "CGAL-${CGAL_VERSION_PUBLIC_RELEASE_VERSION}")
 
 if (CGAL_BUGFIX_VERSION AND CGAL_BUGFIX_VERSION GREATER 0)
   set(CGAL_CREATED_VERSION_NUM "${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}.${CGAL_BUGFIX_VERSION}")
diff --git a/Maintenance/release_building/BUGFIX_NUMBER b/Maintenance/release_building/BUGFIX_NUMBER
deleted file mode 100644
index b8626c4cff2..00000000000
--- a/Maintenance/release_building/BUGFIX_NUMBER
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/Maintenance/release_building/MAJOR_NUMBER b/Maintenance/release_building/MAJOR_NUMBER
deleted file mode 100644
index b8626c4cff2..00000000000
--- a/Maintenance/release_building/MAJOR_NUMBER
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/Maintenance/release_building/MINOR_NUMBER b/Maintenance/release_building/MINOR_NUMBER
deleted file mode 100644
index 8351c19397f..00000000000
--- a/Maintenance/release_building/MINOR_NUMBER
+++ /dev/null
@@ -1 +0,0 @@
-14
diff --git a/Maintenance/release_building/public_release_name b/Maintenance/release_building/public_release_name
deleted file mode 100644
index f36bb69a3f9..00000000000
--- a/Maintenance/release_building/public_release_name
+++ /dev/null
@@ -1 +0,0 @@
-CGAL-4.14.4
diff --git a/Scripts/developer_scripts/create_new_release b/Scripts/developer_scripts/create_new_release
index 9f4ddc266df..443a068a78a 100755
--- a/Scripts/developer_scripts/create_new_release
+++ b/Scripts/developer_scripts/create_new_release
@@ -180,9 +180,13 @@ else
 fi
 # Set the major/minor/bugfix release numbers
 NUMBERS_DIR=${SOURCES_DIR}/Maintenance/release_building
-MAJOR_NUMBER=`cat ${NUMBERS_DIR}/MAJOR_NUMBER`     # 2 digits max
-MINOR_NUMBER=`cat ${NUMBERS_DIR}/MINOR_NUMBER`     # 2 digits max
-BUGFIX_NUMBER=`cat ${NUMBERS_DIR}/BUGFIX_NUMBER`   # 1 digit max
+if [ -f ${NUMBERS_DIR}/MAJOR_NUMBER ]; then
+    MAJOR_NUMBER=`cat ${NUMBERS_DIR}/MAJOR_NUMBER`     # 2 digits max
+    MINOR_NUMBER=`cat ${NUMBERS_DIR}/MINOR_NUMBER`     # 2 digits max
+    BUGFIX_NUMBER=`cat ${NUMBERS_DIR}/BUGFIX_NUMBER`   # 1 digit max
+else
+    eval $(cmake -DCGALCONFIGVERSIONFILE=${SOURCES_DIR}/CGALConfigVersion.cmake -P ${SOURCES_DIR}/Scripts/developer_scripts/create_new_release_evaluate_versions.cmake 2>&1)
+fi
 
 # Do not show the bugfix number if it is 0.
 if [ x"$BUGFIX_NUMBER" != "x0" ]; then 
@@ -302,6 +306,9 @@ if [ -n "$DO_PUBLIC" ]; then
     else
 	public_release_name="CGAL-${public_release_version}"
     fi
+    if ! [ -f ${NUMBERS_DIR}/MAJOR_NUMBER ]; then
+        eval $(cmake -DCGALCONFIGVERSIONFILE=${SOURCES_DIR}/CGALConfigVersion.cmake -P ${SOURCES_DIR}/Scripts/developer_scripts/create_new_release_evaluate_versions.cmake 2>&1)
+    fi
 
     cmake -DGIT_REPO=${SOURCES_DIR} -DPUBLIC="ON" -DDESTINATION="${DESTINATION}" -DCGAL_VERSION="${public_release_version}" -DCGAL_VERSION_NR="${release_number}" -DVERBOSE="${VERBOSE}" -P ${SOURCES_DIR}/Scripts/developer_scripts/cgal_create_release_with_cmake.cmake
     pushd "${DESTINATION}/${public_release_name}"
diff --git a/Scripts/developer_scripts/create_new_release_evaluate_versions.cmake b/Scripts/developer_scripts/create_new_release_evaluate_versions.cmake
new file mode 100644
index 00000000000..4b5cfddd39c
--- /dev/null
+++ b/Scripts/developer_scripts/create_new_release_evaluate_versions.cmake
@@ -0,0 +1,6 @@
+include(${CGALCONFIGVERSIONFILE})
+message("MAJOR_NUMBER=${CGAL_MAJOR_VERSION}
+MINOR_NUMBER=${CGAL_MINOR_VERSION}
+BUGFIX_NUMBER=${CGAL_BUGFIX_VERSION}
+public_release_version=${CGAL_VERSION_PUBLIC_RELEASE_VERSION}
+public_release_name=${CGAL_VERSION_PUBLIC_RELEASE_NAME}")