From 2c5c2ad1fe96b2a9cb83eabf160cc960fef0843f Mon Sep 17 00:00:00 2001
From: Sylvain Pion <Sylvain.Pion@sophia.inria.fr>
Date: Mon, 17 Apr 2006 13:54:58 +0000
Subject: [PATCH] Move the definition of the major/minor/bugfix release numbers
 out of the create_new_release script, into their own files.

---
 .gitattributes                               |  3 ++
 Maintenance/release_building/BUGFIX_NUMBER   |  1 +
 Maintenance/release_building/MAJOR_NUMBER    |  1 +
 Maintenance/release_building/MINOR_NUMBER    |  1 +
 Scripts/developer_scripts/create_new_release | 29 +++++++++++---------
 5 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 Maintenance/release_building/BUGFIX_NUMBER
 create mode 100644 Maintenance/release_building/MAJOR_NUMBER
 create mode 100644 Maintenance/release_building/MINOR_NUMBER

diff --git a/.gitattributes b/.gitattributes
index e255fef533a..8917bfd3cdd 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -712,6 +712,9 @@ Maintenance/MacOSX_Installer/Resources/Welcome.rtf -text
 Maintenance/MacOSX_Installer/Resources/postflight -text
 Maintenance/MacOSX_Installer/Resources/postupgrade -text
 Maintenance/MacOSX_Installer/cgal_very_small.gif -text
+Maintenance/release_building/BUGFIX_NUMBER -text
+Maintenance/release_building/MAJOR_NUMBER -text
+Maintenance/release_building/MINOR_NUMBER -text
 Maintenance/rpm/GNUmakefile -text
 Maintenance/rpm/SOURCES/CGAL_manual_tools-cc_extract_html.patch -text
 Maintenance/rpm/SOURCES/CGAL_manual_tools-cgal_manual.patch -text
diff --git a/Maintenance/release_building/BUGFIX_NUMBER b/Maintenance/release_building/BUGFIX_NUMBER
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/Maintenance/release_building/BUGFIX_NUMBER
@@ -0,0 +1 @@
+0
diff --git a/Maintenance/release_building/MAJOR_NUMBER b/Maintenance/release_building/MAJOR_NUMBER
new file mode 100644
index 00000000000..00750edc07d
--- /dev/null
+++ b/Maintenance/release_building/MAJOR_NUMBER
@@ -0,0 +1 @@
+3
diff --git a/Maintenance/release_building/MINOR_NUMBER b/Maintenance/release_building/MINOR_NUMBER
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/Maintenance/release_building/MINOR_NUMBER
@@ -0,0 +1 @@
+2
diff --git a/Scripts/developer_scripts/create_new_release b/Scripts/developer_scripts/create_new_release
index be6abd28537..aa1ddf90cae 100755
--- a/Scripts/developer_scripts/create_new_release
+++ b/Scripts/developer_scripts/create_new_release
@@ -16,14 +16,11 @@ SOURCES_DIR=trunk
 # Set the following to "y" in case of public release.
 IS_PUBLIC_RELEASE="n"
 
-# Set the major/minor/bugfix release numbers
-MAJOR_NUMBER="3"   # 2 digits max
-MINOR_NUMBER="2"   # 2 digits max
-BUGFIX_NUMBER="0"  # 1 digit  max
-
 # The internal release number is extracted/updated from this file :
 VERSION_FILE="version_number"
 
+LOGFILEBASE="create_release.log"
+
 # Where to put the resulting tarball and where to send the announce.
 HTML_DIR="/u/bombyx/geometrica/CGAL/Members/Releases"
 URL="http://cgal.inria.fr/CGAL/Members/Releases"
@@ -32,17 +29,25 @@ MAILTO="cgal-develop-l@postino.mpi-sb.mpg.de"
 # SVN repository
 SVNCGAL="svn+ssh://scm.gforge.inria.fr/svn/cgal"
 
-LOGFILEBASE="create_release.log"
-
-#TMPDIR="/tmp"
-TMPDIR="${HOME}/CGAL/internal_release_making"
-
 PATH=$PATH:/usr/local/bin
 TAR=/usr/bin/gnu/tar
 GZIP=/usr/bin/gnu/gzip
 
+#TMPDIR="/tmp"
+TMPDIR="${HOME}/CGAL/internal_release_making"
+
+
 cd ${TMPDIR} || return
 
+# Update the working copy
+svn update ${SOURCES_DIR} >> ${LOGFILE} 2>&1
+
+# 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
+
 # The internal release number is considered only in non-public mode.
 if [ $IS_PUBLIC_RELEASE = "n" ]; then
     [ -r $VERSION_FILE ] || return
@@ -71,9 +76,7 @@ bugfix_nr=`printf "%1s" "${BUGFIX_NUMBER}" | sed "y/ /0/"`
 release_number="1${major_nr}${minor_nr}${bugfix_nr}${internal_nr}"
 echo "Release number is ${release_number}" >> ${LOGFILE} 2>&1
 
-# Update the working copy
-svn update ${SOURCES_DIR} >> ${LOGFILE} 2>&1
-
+# Create the release
 ${SOURCES_DIR}/Scripts/developer_scripts/create_internal_release -r ${release_name} -n ${release_number} -d ${TMPDIR} >> ${LOGFILE} 2>&1
 cd ${TMPDIR}
 # Make the release tarball