Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
contrib: cleanup/factorize scripts fot checking windows/android versions
contrib/git-hooks/check-versions.sh tested both android and windows. contrib/windows/test-windows-version.sh.in only tested windows but it had verbose messages, and it was only called in ci.inria.fr/job-0-tarball.sh. Have a single windows check script under contrib/windows and an Android one under contrib/android. Both are called by the git hooks with --quiet, and by ci.inria.fr/job-0-tarball.sh without --quiet. No need to make them "make check" compatible. No need to generate anything from configure. They have a parameter to run outside of the git root directory but it's actually not required here. contrib/android/check-versions.sh isn't distributed since contrib/android isn't. Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
- Loading branch information
Showing
9 changed files
with
205 additions
and
204 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| #!/bin/bash | ||
| # | ||
| # Copyright © 2018-2021 Inria. All rights reserved. | ||
| # $COPYRIGHT$ | ||
| # | ||
|
|
||
| function die() { | ||
| echo "$@" | ||
| exit 1 | ||
| } | ||
|
|
||
| if test "x$1" = "x-h" -o "x$1" = "x--help"; then | ||
| echo "$0 [--quiet] [git root directory]" | ||
| exit 0 | ||
| fi | ||
|
|
||
| echo=echo | ||
| if test "x$1" = "x--quiet"; then | ||
| echo=true | ||
| shift | ||
| fi | ||
|
|
||
| rootdir=. | ||
| if test "x$1" != x; then | ||
| rootdir="$1" | ||
| fi | ||
|
|
||
| android_gradle="$rootdir/contrib/android/AndroidApp/lstopo/build.gradle" | ||
| android_config_h="$rootdir/contrib/android/include/hwloc/autogen/config.h" | ||
| version_file="$rootdir/VERSION" | ||
|
|
||
| if ! test -f "$version_file"; then | ||
| die "Couldn't find $version_file" | ||
| fi | ||
|
|
||
| ### EXTRACT MAIN VERSION ### | ||
| $echo "Looking for official version $version_file ..." | ||
| official_major=$(grep ^major= $version_file | cut -d= -f2) | ||
| official_minor=$(grep ^minor= $version_file | cut -d= -f2) | ||
| official_release=$(grep ^release= $version_file | cut -d= -f2) | ||
| official_greek=$(grep ^greek= $version_file | cut -d= -f2) | ||
| if [ -z "$official_major" -o -z "$official_minor" -o -z "$official_release" ]; then | ||
| die "ERROR in $version_file: Failed to get official HWLOC_VERSION_MAJOR/MINOR/RELEASE/GREEK" | ||
| fi | ||
| $echo " Found major=$official_major minor=$official_minor release=$official_release greek=$official_greek" | ||
| official_version_nogreek="$official_major.$official_minor.$official_release" | ||
|
|
||
| $echo | ||
|
|
||
| ### ANDROID CHECKS ### | ||
| $echo "Looking for Android-specific version in $android_config_h ..." | ||
| android_version=$(grep -w HWLOC_VERSION $android_config_h | grep -oP '".+"' | tr -d \") | ||
| android_major=$(grep -w HWLOC_VERSION_MAJOR $android_config_h | grep -oP '[0-9]+') | ||
| android_minor=$(grep -w HWLOC_VERSION_MINOR $android_config_h | grep -oP '[0-9]+') | ||
| android_release=$(grep -w HWLOC_VERSION_RELEASE $android_config_h | grep -oP '[0-9]+') | ||
| android_greek=$(grep -w HWLOC_VERSION_GREEK $android_config_h | grep -oP '".*"' | tr -d \") | ||
| if [ -z "$android_major" -o -z "$android_minor" -o -z "$android_release" ]; then | ||
| # greek is likely empty on purpose, ignore it | ||
| die "ERROR in $android_config_h: Failed to get Android-specific HWLOC_VERSION_MAJOR/MINOR/RELEASE" | ||
| fi | ||
| $echo " Found Android-specific version=$android_version major=$android_major minor=$android_minor release=$android_release greek=$android_greek" | ||
|
|
||
| # check that the version string matches | ||
| expected_android_version="$android_major.$android_minor.$android_release$android_greek" | ||
| if [ "$android_version" != "$expected_android_version" ]; then | ||
| die "ERROR in $android_config_h: Android-specific HWLOC_VERSION \"$android_version\" doesn't match HWLOC_VERSION_MAJOR/MINOR/RELEASE/GREEK components \"$expected_android_version\"" | ||
| fi | ||
| $echo " Android-specific HWLOC_VERSION \"$android_version\" matches HWLOC_VERSION_MAJOR/MINOR/RELEASE/GREEK components" | ||
|
|
||
| # check android config.h version | ||
| if [ "$official_version_nogreek" != "$android_version" ]; then | ||
| die "ERROR in $android_config_h: Android-specific HWLOC_VERSION \"$android_version\" doesn't match \"$official_version_nogreek\" without GREEK" | ||
| fi | ||
| $echo " Android-specific version \"$android_version\" matches official version without GREEK" | ||
|
|
||
| $echo | ||
|
|
||
| # check android gradle version | ||
| $echo "Looking for Android-specific version in $android_gradle ..." | ||
| android_gradle_version=$(grep -w versionName $android_gradle | grep -oP '".*"' | tr -d \" | grep -oP '.+?(?=[-~])') | ||
| if [ "$official_version_nogreek" != "$android_gradle_version" ]; then | ||
| die "ERROR in $android_gradle: Android gradle HWLOC_VERSION \"$android_gradle_version\" doesn't match \"$official_version_nogreek\" without GREEK" | ||
| fi | ||
| $echo " Android-specific gradle version \"$android_gradle_version\" matches official version without GREEK" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,102 +1,8 @@ | ||
| #!/bin/bash | ||
| # | ||
| # Copyright © 2018-2020 Inria. All rights reserved. | ||
| # Copyright © 2018-2021 Inria. All rights reserved. | ||
| # $COPYRIGHT$ | ||
| # | ||
|
|
||
| function die() { | ||
| echo "$@" | ||
| exit 1 | ||
| } | ||
|
|
||
| android_gradle="./contrib/android/AndroidApp/lstopo/build.gradle" | ||
| android_config_h="./contrib/android/include/hwloc/autogen/config.h" | ||
| windows_config_h="./contrib/windows/hwloc_config.h" | ||
| vcxproj_file="./contrib/windows/libhwloc.vcxproj" | ||
| version_file="./VERSION" | ||
|
|
||
| # get all individual version components | ||
| android_version=$(grep -w HWLOC_VERSION $android_config_h | grep -oP '".+"' | tr -d \") | ||
| android_major=$(grep -w HWLOC_VERSION_MAJOR $android_config_h | grep -oP '[0-9]+') | ||
| android_minor=$(grep -w HWLOC_VERSION_MINOR $android_config_h | grep -oP '[0-9]+') | ||
| android_release=$(grep -w HWLOC_VERSION_RELEASE $android_config_h | grep -oP '[0-9]+') | ||
| android_greek=$(grep -w HWLOC_VERSION_GREEK $android_config_h | grep -oP '".*"' | tr -d \") | ||
| android_gradle_version=$(grep -w versionName $android_gradle | grep -oP '".*"' | tr -d \" | grep -oP '.+?(?=[-~])') | ||
| windows_major=$(grep -w HWLOC_VERSION_MAJOR $windows_config_h | grep -oP '[0-9]+') | ||
| windows_minor=$(grep -w HWLOC_VERSION_MINOR $windows_config_h | grep -oP '[0-9]+') | ||
| windows_release=$(grep -w HWLOC_VERSION_RELEASE $windows_config_h | grep -oP '[0-9]+') | ||
| windows_greek=$(grep -w HWLOC_VERSION_GREEK $windows_config_h | grep -oP '".*"' | tr -d \") | ||
| official_major=$(grep ^major= $version_file | cut -d= -f2) | ||
| official_minor=$(grep ^minor= $version_file | cut -d= -f2) | ||
| official_release=$(grep ^release= $version_file | cut -d= -f2) | ||
|
|
||
|
|
||
| ### WINDOWS CHECK ### | ||
| if [ -z "$windows_major" -o -z "$windows_minor" -o -z "$windows_release" ]; then | ||
| # greek is likely empty on purpose, ignore it | ||
| die "ERROR in $windows_config_h: Failed to get Windows-specific HWLOC_VERSION_MAJOR/MINOR/RELEASE" | ||
| fi | ||
|
|
||
| # check that the version string matches | ||
| windows_version=$(grep -w HWLOC_VERSION $windows_config_h | grep -oP '".+"' | tr -d \") | ||
| expected_windows_version="$windows_major.$windows_minor.$windows_release$windows_greek" | ||
| if [ "$windows_version" != "$expected_windows_version" ]; then | ||
| die "ERROR in $windows_config_h: Windows-specific HWLOC_VERSION \"$windows_version\" doesn't match HWLOC_VERSION_MAJOR/MINOR/RELEASE/GREEK components \"$expected_windows_version\"" | ||
| fi | ||
|
|
||
| # check that it matchs the official version, without a GREEK | ||
| if [ -z "$official_major" -o -z "$official_minor" -o -z "$official_release" ]; then | ||
| die "ERROR in $windows_config_h: Failed to get official HWLOC_VERSION_MAJOR/MINOR/RELEASE" | ||
| fi | ||
| official_version_nogreek="$official_major.$official_minor.$official_release" | ||
| if [ "$official_version_nogreek" != "$windows_version" ]; then | ||
| die "ERROR in $windows_config_h: Windows-specific HWLOC_VERSION \"$windows_version\" doesn't match the official \"$official_version_nogreek\" without GREEK" | ||
| fi | ||
|
|
||
| # get the windows soname | ||
| if [ `grep '<TargetName>' $vcxproj_file | uniq -c | wc -l` != 1 ]; then | ||
| die "ERROR in $vcxproj_file: Couldn't find a single value for <TargetName> lines" | ||
| fi | ||
| windows_lib_soname=$(grep -m1 '<TargetName>' $vcxproj_file | grep -oP '\d+') | ||
| if [ -z "$windows_lib_soname" ]; then | ||
| die "ERROR in $vcxproj_file: Failed to get the Windows-specific soname" | ||
| fi | ||
|
|
||
| # get the official soname | ||
| official_lib_version=$(grep -w "libhwloc_so_version" $version_file | grep -oP '\d+:\d+:\d+') | ||
| if [ -z "$official_lib_version" ]; then | ||
| die "ERROR in $version_file: Failed to get the official lib version" | ||
| fi | ||
|
|
||
| # bashisms to extract the soname from the version | ||
| IFS=':' arr=(${official_lib_version}) | ||
| declare -i official_lib_soname=${arr[0]}-${arr[2]} | ||
|
|
||
| # check that sonames match only if on a release branch | ||
| if [ "$official_lib_version" != "0:0:0" ] ; then | ||
| if [ "$windows_lib_soname" != "$official_lib_soname" ]; then | ||
| die "ERROR in $vcxproj_file: Windows-specific lib soname $windows_lib_soname differs from official $official_lib_soname (from \"$official_lib_version\")" | ||
| fi | ||
| fi | ||
|
|
||
| ### ANDROID CHECK ### | ||
| if [ -z "$android_major" -o -z "$android_minor" -o -z "$android_release" ]; then | ||
| # greek is likely empty on purpose, ignore it | ||
| die "ERROR in $android_config_h: Failed to get Android-specific HWLOC_VERSION_MAJOR/MINOR/RELEASE" | ||
| fi | ||
|
|
||
| # check that the version string matches | ||
| expected_android_version="$android_major.$android_minor.$android_release$android_greek" | ||
| if [ "$android_version" != "$expected_android_version" ]; then | ||
| die "ERROR in $android_config_h: Android-specific HWLOC_VERSION \"$android_version\" doesn't match HWLOC_VERSION_MAJOR/MINOR/RELEASE/GREEK components \"$expected_android_version\"" | ||
| fi | ||
|
|
||
| # check android config.h version | ||
| if [ "$official_version_nogreek" != "$android_version" ]; then | ||
| die "ERROR in $android_config_h: Android-specific HWLOC_VERSION \"$android_version\" doesn't match \"$official_version_nogreek\" without GREEK" | ||
| fi | ||
|
|
||
| # check android gradle version | ||
| if [ "$official_version_nogreek" != "$android_gradle_version" ]; then | ||
| die "ERROR in $android_gradle: Android gradle HWLOC_VERSION \"$android_gradle_version\" doesn't match \"$official_version_nogreek\" without GREEK" | ||
| fi | ||
| ./contrib/windows/check-versions.sh --quiet | ||
| ./contrib/android/check-versions.sh --quiet |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,111 @@ | ||
| #!/bin/bash | ||
| # | ||
| # Copyright © 2018-2021 Inria. All rights reserved. | ||
| # $COPYRIGHT$ | ||
| # | ||
|
|
||
| function die() { | ||
| echo "$@" | ||
| exit 1 | ||
| } | ||
|
|
||
| if test "x$1" = "x-h" -o "x$1" = "x--help"; then | ||
| echo "$0 [--quiet] [git root directory]" | ||
| exit 0 | ||
| fi | ||
|
|
||
| echo=echo | ||
| if test "x$1" = "x--quiet"; then | ||
| echo=true | ||
| shift | ||
| fi | ||
|
|
||
| rootdir=. | ||
| if test "x$1" != x; then | ||
| rootdir="$1" | ||
| fi | ||
|
|
||
| windows_config_h="$rootdir/contrib/windows/hwloc_config.h" | ||
| vcxproj_file="$rootdir/contrib/windows/libhwloc.vcxproj" | ||
| version_file="$rootdir/VERSION" | ||
|
|
||
| if ! test -f "$version_file"; then | ||
| die "Couldn't find $version_file" | ||
| fi | ||
|
|
||
| ### EXTRACT MAIN VERSION ### | ||
| $echo "Looking for official version $version_file ..." | ||
| official_major=$(grep ^major= $version_file | cut -d= -f2) | ||
| official_minor=$(grep ^minor= $version_file | cut -d= -f2) | ||
| official_release=$(grep ^release= $version_file | cut -d= -f2) | ||
| official_greek=$(grep ^greek= $version_file | cut -d= -f2) | ||
| if [ -z "$official_major" -o -z "$official_minor" -o -z "$official_release" ]; then | ||
| die "ERROR in $version_file: Failed to get official HWLOC_VERSION_MAJOR/MINOR/RELEASE/GREEK" | ||
| fi | ||
| $echo " Found major=$official_major minor=$official_minor release=$official_release greek=$official_greek" | ||
| official_version_nogreek="$official_major.$official_minor.$official_release" | ||
|
|
||
| $echo | ||
|
|
||
| ### WINDOWS CHECKS ### | ||
| $echo "Looking for Windows-specific version in $windows_config_h ..." | ||
| windows_major=$(grep -w HWLOC_VERSION_MAJOR $windows_config_h | grep -oP '[0-9]+') | ||
| windows_minor=$(grep -w HWLOC_VERSION_MINOR $windows_config_h | grep -oP '[0-9]+') | ||
| windows_release=$(grep -w HWLOC_VERSION_RELEASE $windows_config_h | grep -oP '[0-9]+') | ||
| windows_greek=$(grep -w HWLOC_VERSION_GREEK $windows_config_h | grep -oP '".*"' | tr -d \") | ||
| if [ -z "$windows_major" -o -z "$windows_minor" -o -z "$windows_release" ]; then | ||
| # greek is likely empty on purpose, ignore it | ||
| die "ERROR in $windows_config_h: Failed to get Windows-specific HWLOC_VERSION_MAJOR/MINOR/RELEASE" | ||
| fi | ||
| $echo " Found Windows-specific major=$windows_major minor=$windows_minor release=$windows_release greek=$windows_greek" | ||
|
|
||
| # check that the version string matches | ||
| windows_version=$(grep -w HWLOC_VERSION $windows_config_h | grep -oP '".+"' | tr -d \") | ||
| $echo " Found windows-specific HWLOC_VERSION \"$windows_version\"" | ||
| expected_windows_version="$windows_major.$windows_minor.$windows_release$windows_greek" | ||
| if [ "$windows_version" != "$expected_windows_version" ]; then | ||
| die "ERROR in $windows_config_h: Windows-specific HWLOC_VERSION \"$windows_version\" doesn't match HWLOC_VERSION_MAJOR/MINOR/RELEASE/GREEK components \"$expected_windows_version\"" | ||
| fi | ||
| $echo " Windows-specific HWLOC_VERSION \"$windows_version\" matches HWLOC_VERSION_MAJOR/MINOR/RELEASE/GREEK components" | ||
|
|
||
| # check that it matches the official version, without a GREEK | ||
| if [ "$official_version_nogreek" != "$windows_version" ]; then | ||
| die "ERROR in $windows_config_h: Windows-specific HWLOC_VERSION \"$windows_version\" doesn't match the official \"$official_version_nogreek\" without GREEK" | ||
| fi | ||
| $echo " Windows-specific HWLOC_VERSION \"$windows_version\" matches official version without GREEK" | ||
|
|
||
| $echo | ||
|
|
||
| # get the windows soname | ||
| $echo "Looking in $vcxproj_file ..." | ||
| if [ `grep '<TargetName>' $vcxproj_file | uniq -c | wc -l` != 1 ]; then | ||
| die "ERROR in $vcxproj_file: Couldn't find a single value for <TargetName> lines" | ||
| fi | ||
| windows_lib_soname=$(grep -m1 '<TargetName>' $vcxproj_file | grep -oP '\d+') | ||
| if [ -z "$windows_lib_soname" ]; then | ||
| die "ERROR in $vcxproj_file: Failed to get the Windows-specific soname" | ||
| fi | ||
| $echo " Found Windows-specific soname $windows_lib_soname" | ||
|
|
||
| # get the official soname | ||
| $echo "Looking in $version_file ..." | ||
| official_lib_version=$(grep -w "libhwloc_so_version" $version_file | grep -oP '\d+:\d+:\d+') | ||
| if [ -z "$official_lib_version" ]; then | ||
| die "ERROR in $version_file: Failed to get the official lib version" | ||
| fi | ||
| $echo " Found official lib version \"$official_lib_version\"" | ||
|
|
||
| # bashisms to extract the soname from the version | ||
| IFS=':' arr=(${official_lib_version}) | ||
| declare -i official_lib_soname=${arr[0]}-${arr[2]} | ||
| $echo " Extracted official lib soname $official_lib_soname" | ||
|
|
||
| # check that sonames match only if on a release branch | ||
| if [ "$official_lib_version" != "0:0:0" ] ; then | ||
| if [ "$windows_lib_soname" != "$official_lib_soname" ]; then | ||
| die "ERROR in $vcxproj_file: Windows-specific lib soname $windows_lib_soname differs from official $official_lib_soname (from \"$official_lib_version\")" | ||
| fi | ||
| $echo " Windows-specific lib soname $windows_lib_soname matches official lib soname" | ||
| else | ||
| $echo " Ignoring unset lib soname" | ||
| fi |
Oops, something went wrong.