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:23:27 +0100 |
| commit | f60dfe818470c41a4d6d299a2b1f4b4d64765464 (patch) | |
| tree | 2b7390568b227be6c1fd9926e50d7d250a93fc5f /dev | |
| parent | f15d23e2f9ec10a0c6ccd76317c0c8aeb5378a33 (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')
| -rw-r--r-- | dev/release-aux/release-version-fn.sh | 4 | ||||
| -rwxr-xr-x | dev/release.sh | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/dev/release-aux/release-version-fn.sh b/dev/release-aux/release-version-fn.sh index e9e1ac3850..b924fad8c0 100644 --- a/dev/release-aux/release-version-fn.sh +++ b/dev/release-aux/release-version-fn.sh @@ -54,6 +54,9 @@ get_version () { -e 's|^dev$|0|' \ -e 's|^alpha([0-9]+)(-(dev))?$|\1|' \ -e 's|^beta([0-9]+)(-(dev))?$|\1|' ) + _BUILD_METADATA='' + if [ -n "$PRE_RELEASE_TAG" ]; then _PRE_RELEASE_TAG="-${PRE_RELEASE_TAG}"; fi + if [ -n "$BUILD_METADATA" ]; then _BUILD_METADATA="+${BUILD_METADATA}"; fi } # $1 is one of "alpha", "beta", "final", "", or "minor" @@ -102,6 +105,7 @@ set_version () { PRE_RELEASE_TAG="$PRE_LABEL$PRE_NUM" ;; esac + if [ -n "$PRE_RELEASE_TAG" ]; then _PRE_RELEASE_TAG="-${PRE_RELEASE_TAG}"; fi cat > "$SOURCEDIR/VERSION.dat" <<EOF MAJOR=$MAJOR MINOR=$MINOR diff --git a/dev/release.sh b/dev/release.sh index a1ddfa4b85..6ea228649c 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 |