Merge pull request #42 from bandi13/updateScripts

Update scripts

Author: dgarske

scripts/build-wolfprovider.sh

@@ -6,25 +6,6 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 LOG_FILE=${SCRIPT_DIR}/build-release.log
 source ${SCRIPT_DIR}/utils-wolfprovider.sh
 
-kill_servers() {
-    if [ "$(jobs -p)" != "" ]; then
-        kill $(jobs -p)
-    fi
-}
-
-do_cleanup() {
-    sleep 0.5 # flush buffers
-    kill_servers
-}
-
-do_trap() {
-    printf "got trap\n"
-    do_cleanup
-    date
-    exit 1
-}
-trap do_trap INT TERM
-
 echo "Using openssl: $OPENSSL_TAG, wolfssl: $WOLFSSL_TAG"
 
 init_wolfprov

scripts/utils-general.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+# This script provides the bare minimum function definitions for compiling
+# the wolfProvider library
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+if [ "$UTILS_GENERAL_LOADED" != "yes" ]; then # only set once
+    kill_servers() {
+        if [ "$(jobs -p)" != "" ]; then
+            kill $(jobs -p)
+        fi
+    }
+
+    do_cleanup() {
+        sleep 0.5 # flush buffers
+        kill_servers
+    }
+
+    do_trap() {
+        printf "got trap\n"
+        do_cleanup
+        date
+        exit 1
+    }
+    trap do_trap INT TERM
+
+    export UTILS_GENERAL_LOADED=yes
+fi

scripts/utils-openssl.sh

@@ -24,6 +24,8 @@
 #
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+source ${SCRIPT_DIR}/utils-general.sh
+
 OPENSSL_GIT="https://github.com/openssl/openssl.git"
 OPENSSL_TAG=${OPENSSL_TAG:-"openssl-3.0.0"}
 OPENSSL_SOURCE_DIR=${SCRIPT_DIR}/../openssl-source
@@ -32,6 +34,12 @@ OPENSSL_INSTALL_DIR=${SCRIPT_DIR}/../openssl-install
 NUMCPU=${NUMCPU:-8}
 WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
 
+if [ -z $LD_LIBRARY_PATH ]; then
+  export LD_LIBRARY_PATH=$OPENSSL_INSTALL_DIR/lib64
+else
+  export LD_LIBRARY_PATH=$OPENSSL_INSTALL_DIR/lib64:$LD_LIBRARY_PATH
+fi
+
 clone_openssl() {
     if [ -d ${OPENSSL_SOURCE_DIR} ]; then
         OPENSSL_TAG_CUR=$(cd ${OPENSSL_SOURCE_DIR} && (git describe --tags 2>/dev/null || git branch --show-current))

scripts/utils-wolfprovider.sh

@@ -38,11 +38,6 @@ install_wolfprov() {
 
     init_openssl
     init_wolfssl
-    if [ -z $LD_LIBRARY_PATH ]; then
-      export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib"
-    else
-      export LD_LIBRARY_PATH="$OPENSSL_INSTALL_DIR/lib64:$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
-    fi
     printf "LD_LIBRARY_PATH: $LD_LIBRARY_PATH\n"
 
     if [ ! -d ${WOLFPROV_INSTALL_DIR} ]; then

scripts/utils-wolfssl.sh

@@ -20,6 +20,8 @@
 #
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+source ${SCRIPT_DIR}/utils-general.sh
+
 WOLFSSL_GIT=${WOLFSSL_GIT:-"https://github.com/wolfSSL/wolfssl.git"}
 WOLFSSL_TAG=${WOLFSSL_TAG:-"v5.7.2-stable"}
 WOLFSSL_SOURCE_DIR=${SCRIPT_DIR}/../wolfssl-source
@@ -30,6 +32,12 @@ WOLFSSL_CONFIG_CFLAGS=${WOLFSSL_CONFIG_CFLAGS:-"-I${OPENSSL_INSTALL_DIR}/include
 
 WOLFPROV_DEBUG=${WOLFPROV_DEBUG:-0}
 
+if [ -z $LD_LIBRARY_PATH ]; then
+  export LD_LIBRARY_PATH="$WOLFSSL_INSTALL_DIR/lib"
+else
+  export LD_LIBRARY_PATH="$WOLFSSL_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
+fi
+
 # Depends on OPENSSL_INSTALL_DIR
 clone_wolfssl() {
     if [ -d ${WOLFSSL_SOURCE_DIR} ]; then