diff --git a/.gitattributes b/.gitattributes index 9fe4a9fc9ac..2ff92209d0a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1984,6 +1984,8 @@ Maintenance/release_building/BUGFIX_NUMBER -text Maintenance/release_building/MAJOR_NUMBER -text Maintenance/release_building/MINOR_NUMBER -text Maintenance/release_building/global_dont_submit -text +Maintenance/release_building/public_release_name -text +Maintenance/release_building/release_name -text Maintenance/rpm/SOURCES/CGAL-README.Fedora svneol=native#text/plain Maintenance/rpm/SOURCES/CGAL-build-library.dpatch svneol=native#text/x-diff Maintenance/rpm/SOURCES/CGAL-install_cgal-SUPPORT_REQUIRED.patch svneol=native#text/x-diff diff --git a/Maintenance/release_building/BUGFIX_NUMBER b/Maintenance/release_building/BUGFIX_NUMBER index 573541ac970..d61f00d8cad 100644 --- a/Maintenance/release_building/BUGFIX_NUMBER +++ b/Maintenance/release_building/BUGFIX_NUMBER @@ -1 +1 @@ -0 +90 diff --git a/Maintenance/release_building/MINOR_NUMBER b/Maintenance/release_building/MINOR_NUMBER index b8626c4cff2..00750edc07d 100644 --- a/Maintenance/release_building/MINOR_NUMBER +++ b/Maintenance/release_building/MINOR_NUMBER @@ -1 +1 @@ -4 +3 diff --git a/Maintenance/release_building/public_release_name b/Maintenance/release_building/public_release_name new file mode 100644 index 00000000000..2192e2deb5b --- /dev/null +++ b/Maintenance/release_building/public_release_name @@ -0,0 +1 @@ +CGAL-3.4-alpha1 diff --git a/Maintenance/release_building/release_name b/Maintenance/release_building/release_name new file mode 100644 index 00000000000..d0e4a23c2d2 --- /dev/null +++ b/Maintenance/release_building/release_name @@ -0,0 +1 @@ +CGAL-3.4 diff --git a/Scripts/developer_scripts/create_new_release b/Scripts/developer_scripts/create_new_release index 76caf59ec0d..529d9c43b85 100755 --- a/Scripts/developer_scripts/create_new_release +++ b/Scripts/developer_scripts/create_new_release @@ -136,7 +136,12 @@ if [ -z "$INTERNAL_NUMBER" ]; then fi INTERNAL_STRING="-I-${INTERNAL_NUMBER}" internal_nr=`printf "%4s" "${INTERNAL_NUMBER}" | sed "y/ /0/"` -release_name="CGAL-${MAJOR_NUMBER}.${MINOR_NUMBER}${BUGFIX_STRING}${INTERNAL_STRING}" + +if [ -r "${NUMBERS_DIR}/release_name" ]; then + release_name=`cat "${NUMBERS_DIR}/release_name"`${INTERNAL_STRING} +else + release_name="CGAL-${MAJOR_NUMBER}.${MINOR_NUMBER}${BUGFIX_STRING}${INTERNAL_STRING}" +fi echo "${release_name}" major_nr=`printf "%2s" "${MAJOR_NUMBER}" | sed "y/ /0/"` minor_nr=`printf "%2s" "${MINOR_NUMBER}" | sed "y/ /0/"` @@ -187,7 +192,11 @@ if [ "$DO_PUBLIC" ]; then echo "Making the public version of the tarball" public_release_number="1${major_nr}${minor_nr}${bugfix_nr}1000" public_release_version="${MAJOR_NUMBER}.${MINOR_NUMBER}${BUGFIX_STRING}" - public_release_name="CGAL-${public_release_version}" + if [ -r "${NUMBERS_DIR}/public_release_name" ]; then + public_release_name=`cat "${NUMBERS_DIR/public_release_name"` + else + public_release_name="CGAL-${public_release_version}" + fi mv ${release_name} $public_release_name cd ${public_release_name}