From 203ebf89bb8f8932bda0d18ab9e2d60783d409cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Thu, 14 Jan 2021 14:39:59 +0100 Subject: [PATCH 1/4] scripts/common.sh: Add printWarning() helper --- scripts/common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/common.sh b/scripts/common.sh index 1cca52f4e..7df8b85db 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -24,10 +24,12 @@ then export TERM="${TERM:-xterm}" function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; } function printError() { >&2 echo "$(tput setaf 1)$1$(tput setaf 7)"; } + function printWarning() { >&2 echo "$(tput setaf 11)$1$(tput setaf 7)"; } function printLog() { echo "$(tput setaf 3)$1$(tput setaf 7)"; } else function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; } function printError() { >&2 echo "$(tput setaf 1)$1$(tput sgr0)"; } + function printWarning() { >&2 echo "$(tput setaf 11)$1$(tput sgr0)"; } function printLog() { echo "$(tput setaf 3)$1$(tput sgr0)"; } fi From d8d5b3ab20e0dd7dc1f72d5179029fa8162bfadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Thu, 14 Jan 2021 14:39:41 +0100 Subject: [PATCH 2/4] docs_version_pragma_check.sh: Don't treat missing compiler version as an error if it's the current dev version --- scripts/docs_version_pragma_check.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/docs_version_pragma_check.sh b/scripts/docs_version_pragma_check.sh index ecb47377b..805a891ed 100755 --- a/scripts/docs_version_pragma_check.sh +++ b/scripts/docs_version_pragma_check.sh @@ -32,6 +32,8 @@ SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build} source "${REPO_ROOT}/scripts/common.sh" source "${REPO_ROOT}/scripts/common_cmdline.sh" +developmentVersion=$("$REPO_ROOT/scripts/get_version.sh") + function versionGreater() { v1=$1 @@ -104,7 +106,7 @@ function findMinimalVersion() fi version="" - for ver in "${allVersions[@]}" + for ver in "${allVersions[@]}" "$developmentVersion" do if versionGreater "$ver" "$pragmaVersion" then @@ -165,6 +167,11 @@ SOLTMPDIR=$(mktemp -d) then continue fi + if [[ "$version" == "$developmentVersion" ]] + then + printWarning "Skipping unreleased development version $developmentVersion" + continue + fi opts="$opts -v $version" From a39c8e3750b86a4b8af492e0dfca712b1381e3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Thu, 14 Jan 2021 14:40:50 +0100 Subject: [PATCH 3/4] docs_version_pragma_check.sh: Switch to the new-style [[ ]] conditions --- scripts/docs_version_pragma_check.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/docs_version_pragma_check.sh b/scripts/docs_version_pragma_check.sh index 805a891ed..37e6b3cdf 100755 --- a/scripts/docs_version_pragma_check.sh +++ b/scripts/docs_version_pragma_check.sh @@ -56,7 +56,7 @@ function versionGreater() function versionEqual() { - if [ "$1" == "$2" ] + if [[ "$1" == "$2" ]] then return 0 fi @@ -112,14 +112,14 @@ function findMinimalVersion() then version="$ver" break - elif ([ $greater == false ]) && versionEqual "$ver" "$pragmaVersion" + elif [[ "$greater" == false ]] && versionEqual "$ver" "$pragmaVersion" then version="$ver" break fi done - if [ -z "$version" ] + if [[ "$version" == "" ]] then if [[ "$greater" = true && "$pragmaVersion" =~ 99 ]] then @@ -163,7 +163,7 @@ SOLTMPDIR=$(mktemp -d) opts="$opts -o" findMinimalVersion $f - if [ -z "$version" ] + if [[ "$version" == "" ]] then continue fi From c63fd0a1af2e75be31413c35c25ce93aa9320a54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Thu, 14 Jan 2021 14:44:11 +0100 Subject: [PATCH 4/4] docs_version_pragma_check.sh: Remove the special case for versions ending in .99 --- scripts/docs_version_pragma_check.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/docs_version_pragma_check.sh b/scripts/docs_version_pragma_check.sh index 37e6b3cdf..e165979cb 100755 --- a/scripts/docs_version_pragma_check.sh +++ b/scripts/docs_version_pragma_check.sh @@ -121,13 +121,8 @@ function findMinimalVersion() if [[ "$version" == "" ]] then - if [[ "$greater" = true && "$pragmaVersion" =~ 99 ]] - then - printError "Skipping version check for pragma: $pragmaVersion" - else - printError "No release $sign$pragmaVersion was listed in available releases!" - exit 1 - fi + printError "No release ${sign}${pragmaVersion} was listed in available releases!" + exit 1 fi }