Skip to content

Commit

Permalink
contrib/dist/make_dist_tarball: update android/windows VERSION too
Browse files Browse the repository at this point in the history
HWLOC_VERSION* macros were X.Yrc1 instead of X.Y in the MSVC builds.

Windows CMAKE builds don't include suffixes such as rc1, but we still
update the hwloc version there for consistency (and in case X.Y was
changed too).

Android isn't updated since it isn't distributed in tarballs.

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
  • Loading branch information
bgoglin committed Jan 3, 2023
1 parent 471e43d commit accb702
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion contrib/dist/make_dist_tarball
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Copyright © 2004-2005 The Regents of the University of California.
# All rights reserved.
# Copyright © 2008-2013 Cisco Systems, Inc. All rights reserved.
# Copyright © 2012-2018 Inria. All rights reserved.
# Copyright © 2012-2023 Inria. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand Down Expand Up @@ -173,6 +173,9 @@ sed -e "s/^date=.*/date=\"$release_date\"/" \
cp -f VERSION.new VERSION
rm -f VERSION.new

contrib/windows/check-versions.sh --quiet --update
contrib/windows-cmake/check-versions.sh --quiet --update

#
# Make 2 tarballs:
#
Expand Down Expand Up @@ -201,10 +204,16 @@ if test "$1" != "-greekonly" -a "$1" != "--greekonly"; then
sed -e 's/^greek=.*/greek=/' VERSION > VERSION.new
cp -f VERSION.new VERSION
rm -f VERSION.new
contrib/windows/check-versions.sh --quiet --update
contrib/windows-cmake/check-versions.sh --quiet --update
echo "Making non-greek tarball"
make_tarball
fi

# Put the VERSION and README files back the way they were
echo "*** Reverting VERSION and README files"
git diff VERSION README | patch -p1 -R

contrib/windows/check-versions.sh --quiet --update
contrib/windows-cmake/check-versions.sh --quiet --update
# no need for contrib/android/check-versions.sh, it isn't distributed in tarballs

0 comments on commit accb702

Please sign in to comment.