Move the definition of the major/minor/bugfix release numbers out

of the create_new_release script, into their own files.
This commit is contained in:
Sylvain Pion 2006-04-17 13:54:58 +00:00
parent 92858051ea
commit 2c5c2ad1fe
5 changed files with 22 additions and 13 deletions

3
.gitattributes vendored
View File

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

View File

@ -0,0 +1 @@
0

View File

@ -0,0 +1 @@
3

View File

@ -0,0 +1 @@
2

View File

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