From 3257a9668840a976c076b7219f3ad8ee818eb73c Mon Sep 17 00:00:00 2001 From: ca333 Date: Sun, 25 Nov 2018 17:06:32 +0100 Subject: [PATCH] fix makeRelease.sh komodify release script for darwin arch --- makeReleaseMac.sh | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/makeReleaseMac.sh b/makeReleaseMac.sh index 2ecf271cc..e20df75aa 100755 --- a/makeReleaseMac.sh +++ b/makeReleaseMac.sh @@ -1,29 +1,19 @@ #!/bin/sh -KMD_DIR=verus-cli -mkdir ${KMD_DIR} - -cp src/fiat/verus \ - src/verusd \ - doc/man/verus-cli/mac/README.txt \ - zcutil/fetch-params.sh \ - verus-cli -mv verus-cli/fetch-params.sh verus-cli/fetch-params -chmod +x ${KMD_DIR}/fetch-params -chmod +x ${KMD_DIR}/verus -chmod +x ${KMD_DIR}/verusd +PACKAGE_DIR="$@" +mkdir ${PACKAGE_DIR} binaries=("komodo-cli" "komodod") alllibs=() for binary in "${binaries[@]}"; do # do the work in the destination directory - cp src/${binary} ${KMD_DIR} + cp src/${binary} ${PACKAGE_DIR} # find the dylibs to copy for komodod - DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` - echo "copying ${DYLIBS} to ${KMD_DIR}" + DYLIBS=`otool -L ${PACKAGE_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` + echo "copying ${DYLIBS} to ${PACKAGE_DIR}" # copy the dylibs to the srcdir - for dylib in ${DYLIBS}; do cp -rf ${dylib} ${KMD_DIR}; done + for dylib in ${DYLIBS}; do cp -rf ${dylib} ${PACKAGE_DIR}; done done libraries=("libgcc_s.1.dylib" "libgomp.1.dylib" "libidn2.0.dylib" "libstdc++.6.dylib") @@ -31,10 +21,10 @@ libraries=("libgcc_s.1.dylib" "libgomp.1.dylib" "libidn2.0.dylib" "libstdc++.6.d for binary in "${libraries[@]}"; do # find the dylibs to copy for komodod - DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` - echo "copying ${DYLIBS} to ${KMD_DIR}" + DYLIBS=`otool -L ${PACKAGE_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` + echo "copying ${DYLIBS} to ${PACKAGE_DIR}" # copy the dylibs to the srcdir - for dylib in ${DYLIBS}; do cp -rf ${dylib} ${KMD_DIR}; alllibs+=(${dylib}); done + for dylib in ${DYLIBS}; do cp -rf ${dylib} ${PACKAGE_DIR}; alllibs+=(${dylib}); done done indirectlibraries=("libintl.8.dylib" "libunistring.2.dylib") @@ -44,10 +34,10 @@ do # Need to undo this for the dylibs when we are done chmod 755 src/${binary} # find the dylibs to copy for komodod - DYLIBS=`otool -L ${KMD_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` - echo "copying indirect ${DYLIBS} to ${KMD_DIR}" + DYLIBS=`otool -L ${PACKAGE_DIR}/${binary} | grep "/usr/local" | awk -F' ' '{ print $1 }'` + echo "copying indirect ${DYLIBS} to ${PACKAGE_DIR}" # copy the dylibs to the dest dir - for dylib in ${DYLIBS}; do cp -rf ${dylib} ${KMD_DIR}; alllibs+=(${dylib}); done + for dylib in ${DYLIBS}; do cp -rf ${dylib} ${PACKAGE_DIR}; alllibs+=(${dylib}); done done for binary in "${binaries[@]}"; @@ -57,9 +47,9 @@ do for dylib in "${alllibs[@]}" do echo "Next lib is ${dylib} " - install_name_tool -change ${dylib} @executable_path/`basename ${dylib}` ${KMD_DIR}/${binary} + install_name_tool -change ${dylib} @executable_path/`basename ${dylib}` ${PACKAGE_DIR}/${binary} done - chmod +x ${KMD_DIR}/${binary} + chmod +x ${PACKAGE_DIR}/${binary} done for binary in "${libraries[@]}"; @@ -69,8 +59,6 @@ do for dylib in "${alllibs[@]}" do echo "Next lib is ${dylib} " - install_name_tool -change ${dylib} @executable_path/`basename ${dylib}` ${KMD_DIR}/${binary} + install_name_tool -change ${dylib} @executable_path/`basename ${dylib}` ${PACKAGE_DIR}/${binary} done done - -