Make uniform directory structure

Author: Andras Fekete

IDE/XCODE/build-all.sh

@@ -21,6 +21,6 @@ cd ${WOLFPROV_DIR}/wolfssl-source && ${XCODE_SCRIPTS_DIR}/build-wolfssl-framewor
 
 cd ${WOLFPROV_DIR} && ${XCODE_SCRIPTS_DIR}/build-wolfprovider-framework.sh
 
-clang ${WOLFPROV_DIR}/examples/openssl_example.c -I ${WOLFPROV_DIR}/openssl-source/artifacts/macos-x86_64/include -L ${WOLFPROV_DIR}/openssl-source/artifacts/macos-x86_64 -lcrypto -o ${WOLFPROV_DIR}/artifacts/openssl_example
+clang ${WOLFPROV_DIR}/examples/openssl_example.c -I ${WOLFPROV_DIR}/openssl-source/artifacts/openssl-install-macos-x86_64/include -L ${WOLFPROV_DIR}/openssl-source/artifacts/openssl-install-macos-x86_64/lib -lcrypto -o ${WOLFPROV_DIR}/artifacts/openssl_example
 
 echo "Script ran for $SECONDS seconds"

IDE/XCODE/build-wolfprovider-framework.sh

@@ -65,7 +65,7 @@ build() { # <ARCH=arm64|x86_64> <TYPE=iphonesimulator|iphoneos|macosx|watchos|wa
     TYPE=$2
     SDK_ROOT=$(xcrun --sdk ${TYPE} --show-sdk-path)
 
-    ./configure -prefix=${OUTDIR}/wolfprov-${TYPE}-${ARCH} ${CONF_OPTS} --host=${HOST} \
+    ./configure -prefix=${OUTDIR}/wolfprov-install-${TYPE}-${ARCH} ${CONF_OPTS} --host=${HOST} \
 	--with-openssl=${WOLFPROV_DIR}/openssl-source/artifacts/openssl-install-${TYPE}-${ARCH} \
 	--with-wolfssl=${WOLFPROV_DIR}/wolfssl-source/artifacts/wolfssl-install-${TYPE}-${ARCH} \
         CFLAGS="${CFLAGS_COMMON} -arch ${ARCH} -isysroot ${SDK_ROOT}" \
@@ -84,8 +84,8 @@ for type in iphonesimulator macosx ; do
 
     # Create universal binaries from architecture-specific static libraries
     lipo \
-        "$OUTDIR/wolfprov-${type}-x86_64/lib/libwolfprov.dylib" \
-        "$OUTDIR/wolfprov-${type}-arm64/lib/libwolfprov.dylib" \
+        "$OUTDIR/wolfprov-install-${type}-x86_64/lib/libwolfprov.dylib" \
+        "$OUTDIR/wolfprov-install-${type}-arm64/lib/libwolfprov.dylib" \
         -create -output $LIPODIR/libwolfprov-${type}.dylib
 
     echo "Checking libraries"
@@ -98,7 +98,7 @@ for type in iphoneos ; do
 
     # Create universal binaries from architecture-specific static libraries
     lipo \
-        "$OUTDIR/wolfprov-${type}-arm64/lib/libwolfprov.dylib" \
+        "$OUTDIR/wolfprov-install-${type}-arm64/lib/libwolfprov.dylib" \
         -create -output $LIPODIR/libwolfprov-${type}.dylib
 
     echo "Checking libraries"

IDE/XCODE/run_openssl.sh

@@ -3,13 +3,13 @@
 set -e
 
 RUNDIR=$(pwd)
-OPENSSL_DIR=${RUNDIR}/openssl-source/artifacts/macosx-x86_64
-WOLFPROV_LIB=${RUNDIR}/artifacts/macos-x86_64/lib
-export LD_LIBRARY_PATH=${WOLFPROV_LIB}:${OPENSSL_DIR}
+OPENSSL_DIR=${RUNDIR}/openssl-source/artifacts/openssl-install-macosx-x86_64/
+WOLFPROV_LIB=${RUNDIR}/artifacts/wolfprov-install-macos-x86_64/lib
+export LD_LIBRARY_PATH=${WOLFPROV_LIB}:${OPENSSL_DIR}/lib
 export OPENSSL_MODULES=${WOLFPROV_LIB}
 export OPENSSL_CONF=${RUNDIR}/provider.conf
 
 # Run the tests
-${OPENSSL_DIR}/apps/openssl list -verbose -provider-path ${WOLFPROV_LIB} -providers
+${OPENSSL_DIR}/bin/openssl list -verbose -provider-path ${WOLFPROV_LIB} -providers
 
 ${RUNDIR}/artifacts/openssl_example