Merge pull request #204 from jl777/dev

Dev

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

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
@@ -512,9 +512,10 @@ STRING_AND_INT(dpow,fundnotaries,symbol,numblocks)
             for (j=0; j<n; j++)
             {
                 bitcoin_address(coinaddr,60,pubkeys[j],33);
-                sprintf(cmd,"./komodo-cli -ac_name=%s sendtoaddress %s %f\n",NOTARY_CURRENCIES[i],coinaddr,val);
+                sprintf(cmd,"./komodo-cli -ac_name=%s sendtoaddress %s %f",NOTARY_CURRENCIES[i],coinaddr,val);
                 if ( system(cmd) != 0 )
                     printf("ERROR with (%s)\n",cmd);
+                else printf("%s\n",cmd);
             }
         }
     }

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

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

m_osx_release

@@ -0,0 +1,2 @@
+git pull
+cd iguana; ./m_osx_release; cd ..

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