Skip to content

Commit f2ec6ef

Browse files
committed
contrib/dist/make_dist_tarball: update android/windows VERSION too
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 <[email protected]> (cherry picked from commit accb702)
1 parent f588db9 commit f2ec6ef

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

contrib/dist/make_dist_tarball

+10-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# Copyright © 2004-2005 The Regents of the University of California.
1212
# All rights reserved.
1313
# Copyright © 2008-2013 Cisco Systems, Inc. All rights reserved.
14-
# Copyright © 2012-2022 Inria. All rights reserved.
14+
# Copyright © 2012-2023 Inria. All rights reserved.
1515
# $COPYRIGHT$
1616
#
1717
# Additional copyrights may follow
@@ -173,6 +173,9 @@ sed -e "s/^date=.*/date=\"$release_date\"/" \
173173
cp -f VERSION.new VERSION
174174
rm -f VERSION.new
175175

176+
contrib/windows/check-versions.sh --quiet --update
177+
contrib/windows-cmake/check-versions.sh --quiet --update
178+
176179
#
177180
# Make 2 tarballs:
178181
#
@@ -201,10 +204,16 @@ if test "$1" != "-greekonly" -a "$1" != "--greekonly"; then
201204
sed -e 's/^greek=.*/greek=/' VERSION > VERSION.new
202205
cp -f VERSION.new VERSION
203206
rm -f VERSION.new
207+
contrib/windows/check-versions.sh --quiet --update
208+
contrib/windows-cmake/check-versions.sh --quiet --update
204209
echo "Making non-greek tarball"
205210
make_tarball
206211
fi
207212

208213
# Put the VERSION and README files back the way they were
209214
echo "*** Reverting VERSION and README files"
210215
git diff VERSION README | patch -p1 -R
216+
217+
contrib/windows/check-versions.sh --quiet --update
218+
contrib/windows-cmake/check-versions.sh --quiet --update
219+
# no need for contrib/android/check-versions.sh, it isn't distributed in tarballs

0 commit comments

Comments
 (0)