mirror of https://github.com/openssl/openssl
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)
This commit is contained in:
parent
084d3afd26
commit
83a5bd8070
|
@ -186,6 +186,9 @@ following variables:
|
||||||
if [ -n "$PRE_RELEASE_TAG" ]; then
|
if [ -n "$PRE_RELEASE_TAG" ]; then
|
||||||
PRE_RELEASE_TAG="-$PRE_RELEASE_TAG"
|
PRE_RELEASE_TAG="-$PRE_RELEASE_TAG"
|
||||||
fi
|
fi
|
||||||
|
if [ -n "$BUILD_METADATA" ]; then
|
||||||
|
BUILD_METADATA="+$BUILD_METADATA"
|
||||||
|
fi
|
||||||
echo "$MAJOR.$MINOR.$PATCH$PRE_RELEASE_TAG$BUILD_METADATA" |\
|
echo "$MAJOR.$MINOR.$PATCH$PRE_RELEASE_TAG$BUILD_METADATA" |\
|
||||||
sed -e 's/[-.+]/_/g'
|
sed -e 's/[-.+]/_/g'
|
||||||
)
|
)
|
||||||
|
|
|
@ -54,6 +54,9 @@ get_version () {
|
||||||
-e 's|^dev$|0|' \
|
-e 's|^dev$|0|' \
|
||||||
-e 's|^alpha([0-9]+)(-(dev))?$|\1|' \
|
-e 's|^alpha([0-9]+)(-(dev))?$|\1|' \
|
||||||
-e 's|^beta([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"
|
# $1 is one of "alpha", "beta", "final", "", or "minor"
|
||||||
|
@ -102,6 +105,7 @@ set_version () {
|
||||||
PRE_RELEASE_TAG="$PRE_LABEL$PRE_NUM"
|
PRE_RELEASE_TAG="$PRE_LABEL$PRE_NUM"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
if [ -n "$PRE_RELEASE_TAG" ]; then _PRE_RELEASE_TAG="-${PRE_RELEASE_TAG}"; fi
|
||||||
cat > "$SOURCEDIR/VERSION.dat" <<EOF
|
cat > "$SOURCEDIR/VERSION.dat" <<EOF
|
||||||
MAJOR=$MAJOR
|
MAJOR=$MAJOR
|
||||||
MINOR=$MINOR
|
MINOR=$MINOR
|
||||||
|
|
|
@ -354,11 +354,11 @@ fi
|
||||||
set_version
|
set_version
|
||||||
|
|
||||||
if [ -n "$PRE_LABEL" ]; then
|
if [ -n "$PRE_LABEL" ]; then
|
||||||
release="$VERSION-$PRE_RELEASE_TAG$BUILD_METADATA"
|
release="$VERSION$_PRE_RELEASE_TAG$_BUILD_METADATA"
|
||||||
release_text="$SERIES$BUILD_METADATA $PRE_LABEL $PRE_NUM"
|
release_text="$SERIES$_BUILD_METADATA $PRE_LABEL $PRE_NUM"
|
||||||
announce_template=openssl-announce-pre-release.tmpl
|
announce_template=openssl-announce-pre-release.tmpl
|
||||||
else
|
else
|
||||||
release="$VERSION$BUILD_METADATA"
|
release="$VERSION$_BUILD_METADATA"
|
||||||
release_text="$release"
|
release_text="$release"
|
||||||
announce_template=openssl-announce-release.tmpl
|
announce_template=openssl-announce-release.tmpl
|
||||||
fi
|
fi
|
||||||
|
@ -458,10 +458,10 @@ prev_release_date="$RELEASE_DATE"
|
||||||
next_release_state "$next_method2"
|
next_release_state "$next_method2"
|
||||||
set_version
|
set_version
|
||||||
|
|
||||||
release="$VERSION-$PRE_RELEASE_TAG$BUILD_METADATA"
|
release="$VERSION$_PRE_RELEASE_TAG$_BUILD_METADATA"
|
||||||
release_text="$VERSION$BUILD_METADATA"
|
release_text="$VERSION$_BUILD_METADATA"
|
||||||
if [ -n "$PRE_LABEL" ]; then
|
if [ -n "$PRE_LABEL" ]; then
|
||||||
release_text="$SERIES$BUILD_METADATA $PRE_LABEL $PRE_NUM"
|
release_text="$SERIES$_BUILD_METADATA $PRE_LABEL $PRE_NUM"
|
||||||
fi
|
fi
|
||||||
$VERBOSE "== Updated version information to $release"
|
$VERBOSE "== Updated version information to $release"
|
||||||
|
|
||||||
|
@ -494,8 +494,8 @@ if $do_branch; then
|
||||||
next_release_state "minor"
|
next_release_state "minor"
|
||||||
set_version
|
set_version
|
||||||
|
|
||||||
release="$VERSION-$PRE_RELEASE_TAG$BUILD_METADATA"
|
release="$VERSION$_PRE_RELEASE_TAG$_BUILD_METADATA"
|
||||||
release_text="$SERIES$BUILD_METADATA"
|
release_text="$SERIES$_BUILD_METADATA"
|
||||||
$VERBOSE "== Updated version information to $release"
|
$VERBOSE "== Updated version information to $release"
|
||||||
|
|
||||||
$VERBOSE "== Updating files for $release :"
|
$VERBOSE "== Updating files for $release :"
|
||||||
|
@ -803,6 +803,10 @@ found in the tar file of a regular release.
|
||||||
|
|
||||||
=back
|
=back
|
||||||
|
|
||||||
|
=item B<BUILD_METADATA>
|
||||||
|
|
||||||
|
Extra build metadata to be used by anyone for their own purposes.
|
||||||
|
|
||||||
=item B<RELEASE_DATE>
|
=item B<RELEASE_DATE>
|
||||||
|
|
||||||
This is normally empty in the git workspace, but should always have the
|
This is normally empty in the git workspace, but should always have the
|
||||||
|
|
|
@ -12,6 +12,7 @@ HERE=`dirname $0`
|
||||||
. $HERE/../VERSION.dat
|
. $HERE/../VERSION.dat
|
||||||
|
|
||||||
if [ -n "$PRE_RELEASE_TAG" ]; then PRE_RELEASE_TAG=-$PRE_RELEASE_TAG; fi
|
if [ -n "$PRE_RELEASE_TAG" ]; then PRE_RELEASE_TAG=-$PRE_RELEASE_TAG; fi
|
||||||
|
if [ -n "$BUILD_METADATA" ]; then BUILD_METADATA=+$BUILD_METADATA; fi
|
||||||
version=$MAJOR.$MINOR.$PATCH$PRE_RELEASE_TAG$BUILD_METADATA
|
version=$MAJOR.$MINOR.$PATCH$PRE_RELEASE_TAG$BUILD_METADATA
|
||||||
basename=openssl
|
basename=openssl
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue