Updated messages

pull/339/head
Jeffrey Walton 2016-11-07 07:20:14 -05:00
parent b38edd49d8
commit 795e47add6
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 17 additions and 7 deletions

View File

@ -20,22 +20,22 @@ if [[ ! (-z "$DIRTY") ]]; then
echo echo
echo "The local repo is dirty. Continuing will reset the repo and lose changes." echo "The local repo is dirty. Continuing will reset the repo and lose changes."
read -p "Type 'Y' to proceed. Proceed? " -n 1 -r read -p "Type 'Y' to proceed, and 'N' to exit. Proceed? " -n 1 -r
echo # (optional) move to a new line echo # (optional) move to a new line
if [[ !($REPLY =~ ^[Yy]$) ]]; then if [[ !($REPLY =~ ^[Yy]$) ]]; then
[[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0 [[ "$0" = "$BASH_SOURCE" ]] && exit 0 || return 0
fi fi
else else
echo echo
echo "The repo is clean. Proceeding..." echo "The repo is clean. Proceeding..."
echo
fi fi
############################################ ############################################
echo
echo "****************************************************************" echo "****************************************************************"
echo "****************************************************************" echo "****************************************************************"
echo "Testing '$OLD_VERSION_TAG' against '$NEW_VERSION_TAG'" echo "Testing '$NEW_VERSION_TAG' against '$OLD_VERSION_TAG'"
echo "****************************************************************" echo "****************************************************************"
echo "****************************************************************" echo "****************************************************************"
echo echo
@ -211,6 +211,12 @@ cp GNUmakefile GNUmakefile-symbols
git checkout "$OLD_VERSION_TAG" -f &>/dev/null git checkout "$OLD_VERSION_TAG" -f &>/dev/null
echo
echo "****************************************************************"
echo "Patching makefile to use dynamic linking for cryptest.exe"
echo "****************************************************************"
echo
if [[ "$IS_DARWIN" -ne "0" ]]; then if [[ "$IS_DARWIN" -ne "0" ]]; then
"$SED" "$SED_OPTS" -e 's|libcryptopp.a $(TESTOBJS)|libcryptopp.dylib $(TESTOBJS)|g' GNUmakefile-symbols "$SED" "$SED_OPTS" -e 's|libcryptopp.a $(TESTOBJS)|libcryptopp.dylib $(TESTOBJS)|g' GNUmakefile-symbols
"$SED" "$SED_OPTS" -e 's|$(TESTOBJS) ./libcryptopp.a |$(TESTOBJS) ./libcryptopp.dylib |g' GNUmakefile-symbols "$SED" "$SED_OPTS" -e 's|$(TESTOBJS) ./libcryptopp.a |$(TESTOBJS) ./libcryptopp.dylib |g' GNUmakefile-symbols
@ -219,15 +225,15 @@ else
"$SED" "$SED_OPTS" -e 's|$(TESTOBJS) ./libcryptopp.a |$(TESTOBJS) ./libcryptopp.so |g' GNUmakefile-symbols "$SED" "$SED_OPTS" -e 's|$(TESTOBJS) ./libcryptopp.a |$(TESTOBJS) ./libcryptopp.so |g' GNUmakefile-symbols
fi fi
git diff --exit-code echo
echo "****************************************************************" echo "****************************************************************"
echo "Building library for $OLD_VERSION_TAG" echo "Building dynamic library for $OLD_VERSION_TAG"
echo "****************************************************************" echo "****************************************************************"
echo echo
"$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols dynamic "$MAKE" "${MAKEARGS[@]}" -f GNUmakefile-symbols dynamic
echo
echo "****************************************************************" echo "****************************************************************"
echo "Building cryptest.exe for $OLD_VERSION_TAG" echo "Building cryptest.exe for $OLD_VERSION_TAG"
echo "****************************************************************" echo "****************************************************************"
@ -237,6 +243,7 @@ echo
if [[ -f "cryptest.exe" ]]; then if [[ -f "cryptest.exe" ]]; then
echo
echo "****************************************************************" echo "****************************************************************"
echo "Running $OLD_VERSION_TAG cryptest.exe using $OLD_VERSION_TAG library" echo "Running $OLD_VERSION_TAG cryptest.exe using $OLD_VERSION_TAG library"
echo "****************************************************************" echo "****************************************************************"
@ -253,6 +260,7 @@ else
echo "Failed to make cryptest.exe" echo "Failed to make cryptest.exe"
fi fi
echo
echo "****************************************************************" echo "****************************************************************"
echo "Removing dynamic library for $OLD_VERSION_TAG" echo "Removing dynamic library for $OLD_VERSION_TAG"
echo "****************************************************************" echo "****************************************************************"
@ -262,6 +270,7 @@ rm -f *.o *.so *.dylib
git checkout "$NEW_VERSION_TAG" -f &>/dev/null git checkout "$NEW_VERSION_TAG" -f &>/dev/null
echo
echo "****************************************************************" echo "****************************************************************"
echo "Building dynamic library for $NEW_VERSION_TAG" echo "Building dynamic library for $NEW_VERSION_TAG"
echo "****************************************************************" echo "****************************************************************"
@ -271,6 +280,7 @@ echo
if [[ -f "cryptest.exe" ]]; then if [[ -f "cryptest.exe" ]]; then
echo
echo "****************************************************************" echo "****************************************************************"
echo "Running $OLD_VERSION_TAG cryptest.exe using $NEW_VERSION_TAG library" echo "Running $OLD_VERSION_TAG cryptest.exe using $NEW_VERSION_TAG library"
echo "****************************************************************" echo "****************************************************************"