diff options
author | Richard Levitte <levitte@openssl.org> | 2022-12-02 06:59:58 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2022-12-08 07:22:05 +0100 |
commit | 3aad04a02862a9633798da77f32d15f79d2027e6 (patch) | |
tree | d115e55834bf091a427a9cfa5a883cabcac93b06 /dev/release.sh | |
parent | 25b0b21722021573615b2d7d61786f3573334c7d (diff) |
Fix treatment of BUILD_METADATA
According to documentation [^1], the BUILD_METADATA from VERSION.dat should
be prefixed with a plus sign when used. It is given this treatment in
Configure, but not in all other scripts that use VERSION.dat directly.
This change fixes that.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/19815)
(cherry picked from commit 83a5bd80708adc6726deac390e405a7b50dec540)
Diffstat (limited to 'dev/release.sh')
-rwxr-xr-x | dev/release.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/dev/release.sh b/dev/release.sh index ede8bc2616..a239e94b33 100755 --- a/dev/release.sh +++ b/dev/release.sh @@ -354,11 +354,11 @@ fi set_version if [ -n "$PRE_LABEL" ]; then - release="$VERSION-$PRE_RELEASE_TAG$BUILD_METADATA" - release_text="$SERIES$BUILD_METADATA $PRE_LABEL $PRE_NUM" + release="$VERSION$_PRE_RELEASE_TAG$_BUILD_METADATA" + release_text="$SERIES$_BUILD_METADATA $PRE_LABEL $PRE_NUM" announce_template=openssl-announce-pre-release.tmpl else - release="$VERSION$BUILD_METADATA" + release="$VERSION$_BUILD_METADATA" release_text="$release" announce_template=openssl-announce-release.tmpl fi @@ -458,10 +458,10 @@ prev_release_date="$RELEASE_DATE" next_release_state "$next_method2" set_version -release="$VERSION-$PRE_RELEASE_TAG$BUILD_METADATA" -release_text="$VERSION$BUILD_METADATA" +release="$VERSION$_PRE_RELEASE_TAG$_BUILD_METADATA" +release_text="$VERSION$_BUILD_METADATA" if [ -n "$PRE_LABEL" ]; then - release_text="$SERIES$BUILD_METADATA $PRE_LABEL $PRE_NUM" + release_text="$SERIES$_BUILD_METADATA $PRE_LABEL $PRE_NUM" fi $VERBOSE "== Updated version information to $release" @@ -494,8 +494,8 @@ if $do_branch; then next_release_state "minor" set_version - release="$VERSION-$PRE_RELEASE_TAG$BUILD_METADATA" - release_text="$SERIES$BUILD_METADATA" + release="$VERSION$_PRE_RELEASE_TAG$_BUILD_METADATA" + release_text="$SERIES$_BUILD_METADATA" $VERBOSE "== Updated version information to $release" $VERBOSE "== Updating files for $release :" @@ -803,6 +803,10 @@ found in the tar file of a regular release. =back +=item B<BUILD_METADATA> + +Extra build metadata to be used by anyone for their own purposes. + =item B<RELEASE_DATE> This is normally empty in the git workspace, but should always have the |