From 5b2c6baa60d7be46cf95957c91ad8e5bf2ca00d2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 00:55:42 +0200 Subject: [PATCH 1/4] test --- iguana/iguana_notary.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 5652f6f20..2fa47e070 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -512,9 +512,10 @@ STRING_AND_INT(dpow,fundnotaries,symbol,numblocks) for (j=0; j Date: Fri, 20 Jan 2017 06:25:12 +0100 Subject: [PATCH 2/4] osx release build --- crypto777/m_osx_release | 4 ++++ iguana/m_osx_release | 8 ++++++++ iguana/secp256k1/m_osx_release | 1 + m_osx_release | 2 ++ 4 files changed, 15 insertions(+) create mode 100755 crypto777/m_osx_release create mode 100755 iguana/m_osx_release create mode 100755 iguana/secp256k1/m_osx_release create mode 100755 m_osx_release diff --git a/crypto777/m_osx_release b/crypto777/m_osx_release new file mode 100755 index 000000000..1cdb05957 --- /dev/null +++ b/crypto777/m_osx_release @@ -0,0 +1,4 @@ +git pull +rm *.o +gcc -mmacosx-version-min=10.6 -c -DLIQUIDITY_PROVIDER=1 -O2 *.c jpeg/*.c jpeg/unix/*.c -I/usr/lib/x86_64-linux-gnu/curl +rm -f ../agents/libcrypto777.a; ar rc ../agents/libcrypto777.a *.o diff --git a/iguana/m_osx_release b/iguana/m_osx_release new file mode 100755 index 000000000..19c94d74b --- /dev/null +++ b/iguana/m_osx_release @@ -0,0 +1,8 @@ +#!/bin/bash +#./configure --enable-endomorphism --enable-module-ecdh --enable-module-schnorr --enable-module-rangeproof --enable-experimental --enable-module_recovery +rm ../agents/iguana *.o +git pull +cd secp256k1; ./m_osx_release; cd .. +gcc -g -mmacosx-version-min=10.6 -Wno-deprecated -c -O2 -DLIQUIDITY_PROVIDER=1 *.c ../basilisk/basilisk.c ../gecko/gecko.c ../datachain/datachain.c +gcc -g -mmacosx-version-min=10.6 -Wno-deprecated -c -DLIQUIDITY_PROVIDER=1 main.c iguana777.c iguana_bundles.c ../basilisk/basilisk.c +gcc -g -mmacosx-version-min=10.6 /usr/local/lib/libnanomsg.5.0.0.dylib -o ../agents/iguana *.o ../agents/libcrypto777.a -lcurl -lssl -lcrypto -lpthread -lz -lm diff --git a/iguana/secp256k1/m_osx_release b/iguana/secp256k1/m_osx_release new file mode 100755 index 000000000..e962600e2 --- /dev/null +++ b/iguana/secp256k1/m_osx_release @@ -0,0 +1 @@ +gcc -mmacosx-version-min=10.6 -c -o ../secp256k1.o -I. -I./src -I./include -I./src -O3 -W -std=c89 -pedantic -Wall -Wextra -Wcast-align -Wnested-externs -Wshadow -Wstrict-prototypes -Wno-unused-function -Wno-long-long -Wno-overlength-strings -fvisibility=hidden -DHAVE_CONFIG_H src/secp256k1.c diff --git a/m_osx_release b/m_osx_release new file mode 100755 index 000000000..e3bce6893 --- /dev/null +++ b/m_osx_release @@ -0,0 +1,2 @@ +git pull +cd iguana; ./m_osx_release; cd .. From 46f4e44f09fa967fca3a710cfcf14bdd379a16fa Mon Sep 17 00:00:00 2001 From: ca333 Date: Fri, 20 Jan 2017 09:07:09 +0100 Subject: [PATCH 3/4] add osx deployment --- osx_deploy.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 osx_deploy.sh diff --git a/osx_deploy.sh b/osx_deploy.sh new file mode 100755 index 000000000..4a7efa802 --- /dev/null +++ b/osx_deploy.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +TMP_DIR=~/tmp/iguana + +# make a tmp directory +mkdir -p $TMP_DIR +echo "making $TMP_DIR" + +binaries=("iguana") + +for binary in "${binaries[@]}"; +do + echo "copying $binary to $TMP_DIR" + + cp agents/$binary $TMP_DIR + + # find the dylibs to copy for iguana + DYLIBS=`otool -L $TMP_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'` + echo "copying $DYLIBS to $TMP_DIR" + + # copy the dylibs to the tmpdir + for dylib in $DYLIBS; do cp -rf $dylib $TMP_DIR/; done + + # modify iguana to point to dylibs + echo "modifying $binary to use local libraries" + for dylib in $DYLIBS; do install_name_tool -change $dylib @executable_path/`basename $dylib` $TMP_DIR/$binary; done; +done From a41efb2c659c3f1884029128140ca39e7cdc3daf Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 20 Jan 2017 10:31:01 +0200 Subject: [PATCH 4/4] test --- iguana/iguana_notary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 2fa47e070..97fb190b3 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -490,7 +490,7 @@ STRING_AND_INT(dpow,fundnotaries,symbol,numblocks) if ( (val= vals[j]) > 0. ) { bitcoin_address(coinaddr,60,pubkeys[j],33); - sprintf(cmd,"bicoin-cli sendtoaddress %s %f\n",coinaddr,val); + sprintf(cmd,"bitcoin-cli sendtoaddress %s %f\n",coinaddr,val); if ( sendflag != 0 && system(cmd) != 0 ) printf("ERROR with (%s)\n",cmd); else