From 39a8d075de32661757c4a023ac24937728e7035c Mon Sep 17 00:00:00 2001 From: David Dawes Date: Sat, 5 May 2018 15:50:42 -0700 Subject: [PATCH 01/21] Add some build details. --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 65f34d3d4..ee1c29922 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,26 @@ Dependencies sudo apt-get install build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python python-zmq zlib1g-dev wget libcurl3-gnutls-dev bsdmainutils automake ``` +Building +-------- + +First time you'll need to get assorted startup values downloaded. This takes a moderate amount of time once but then does niot need to be repeated unless you bring a new system up. The command is: +``` +./zcutil/fetch-params.sh +``` +Building for Ubunutu/Mint: +``` +./zcutil/build.sh +``` +Building for Mac OS/X: +``` +./zcutil/build-mac.sh +``` +Building for Windows: +``` +./zcutil/build-win.sh +``` + Komodo ------ We have a release process that goes through several stages before it reaches master. This allows the most conservative users just use the master branch, which is only updated after the other branches have signed off on a release. From 37bbbc2a43b6cf3994c51c7458cc03849fd2152e Mon Sep 17 00:00:00 2001 From: "David L. Dawes" Date: Fri, 25 May 2018 02:33:10 +0000 Subject: [PATCH 02/21] Conditional compilation so that Windows, Mac and Linux compile from single (messy) file. --- .gitignore | 1 + src/crypto/haraka.h | 4 ++++ src/miner.cpp | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/.gitignore b/.gitignore index e5751db76..ca3d15c12 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ src/univalue/gen .deps .dirstamp +.idea .libs .*.swp *.*~* diff --git a/src/crypto/haraka.h b/src/crypto/haraka.h index 203f8fbf6..1cb5ea662 100644 --- a/src/crypto/haraka.h +++ b/src/crypto/haraka.h @@ -30,7 +30,11 @@ Optimized Implementations for Haraka256 and Haraka512 #define NUMROUNDS 5 +#ifdef _WIN32 +typedef unsigned long long u64; +#else typedef unsigned long u64; +#endif typedef __m128i u128; extern u128 rc[40]; diff --git a/src/miner.cpp b/src/miner.cpp index a1419ed96..cfdacb7b5 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1223,7 +1223,11 @@ void static BitcoinMiner_noeq() if ((UintToArith256(pblock->nNonce) & mask) == mask) { +#ifdef _WIN32 + printf("%llu mega hashes complete - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1048576); +#else printf("%lu mega hashes complete - working\n", (ASSETCHAINS_NONCEMASK[ASSETCHAINS_ALGO] + 1) / 1048576); +#endif break; } From aba193e39d1a772c4cf75bb7d410b0261a710534 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Fri, 25 May 2018 21:57:18 -0700 Subject: [PATCH 03/21] adding auth --- .travis.yml | 28 +++++++++++++--------------- AUTH_KEY.json.enc | Bin 2352 -> 2352 bytes 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index aba91579a..cd493f0a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,23 +23,19 @@ matrix: fast_finish: true include: - compiler: ": Linux" - env: 'HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh + env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common - libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET=src/komodod\ - src/komodo-cli COMPRESSED_BUILD=Komodo-build.tar.gz - -' + libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod + src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Windows" - env: 'HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu + env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET=src/komodod.exe\ - src/komodo-cli.exe\ src/komodo-tx.exe KOMODO_BUILD_DIR=Komodo-build COMPRESSED_BUILD=Komodo-build.tar.gz - -' + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe + src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz exclude: - compiler: gcc install: @@ -61,13 +57,15 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then mkdir -p src/$KOMODO_BUILD_DIR && cp $KOMODO_EXEC_SET - src/$KOMODO_BUILD_DIR && cd src && tar -czvf $COMPRESSED_BUILD $KOMODO_BUILD_DIR; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $COMPRESSED_BUILD gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM/; - fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz + . && tar -xzvf $TARGET_PLATFORM.tar.gz && ls && rm $TARGET_PLATFORM.tar.gz; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM + && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz + gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi notifications: slack: secure: A7JtO9RXl0Tgx09IWwUKbCuZ0oTC4wM4jthsV2CW3AS7r5Iz1qMFBnb7sb8744f40vi/QYjbr1KHkdOEbSJqWzOJS7oelSM9kyck808un7zZ8OwweXdGqdirNmIR3x+IQAYZw2lvYZcUBX/5h8eXK2LU67Rsve5I1WRGPtz0rmctFeRG6Xe0yGpMDYYxt4Ce/L7N5h3cC2eak8pQU6mSyQog0yvbiM73CFzz//bWughamOHKLx6o8BDgklwuCuh4rHQe/0kwVq1AoPQMqxuKQTsGAmub4mrDcsde39h3uo4GjAqAgfmL2e4hyp8fumdd7BtrQaFF4UBqyR8Xo/Ao97Ca7Dbeii5Eq7sl5/sTxZRdjy+MFD7z+jFpLkXfivBradyu0jABT5YYYMzZOCkpOGl5l3YymT86HKO5RBHyZLNL06jxHLti3NYBvFC6C+0yZrJOo7KN9DMqHHLZ5Y3ASZqbARWlVDE4oQmauyn4X2d6EOoE7ohwHwpY/LbVNFmrGvD+jAf4dOttwCMoWnT2pLWzs8Tl4FrvDGR3tbmZSCR/0NfbbeGrv9YNJtUghjubp1OikaZ3/Hs0+yJVsKo3kVd+dZvT/5u9MD6bu/cSdBRnoG0orca9QB8obaTEQ+71XC63D0hwDoZ9IgX6qVv+3KFErHZdZGiQBZI2yXSckvI= before_install: -- openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv +- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index ff2e4ce967a1ae652bc5aab3c33e55d97ba50581..2ef6245d853e98605dc1d1a0f39906a5ea9c6c4f 100644 GIT binary patch literal 2352 zcmV-03D5RFJz5f96*BL8_U;zR?i(LG)ka9K-{OFwk+M|mpg8F0EMj4dB+ndAISx50 z_<4HcDF~%3R zVAARd2nr*L>Mrqmg=wU^L*-THPb`j_?c%BWlLAz>+%L9f)6#dkA z@iE!D#N!#j0&j)J1@e3$RvS1Yq(QPepUPhf?dpukB8b>zu8_M@K|#I}u`gFcqvyMk zb`!7Y22U4-H!l=`NJraBpb#JzB@un%nXj3%fFfh^f_Hd4jJ$M3z4W6Aj}eR9BP#5N zR&~1swjoze;b+8a+Y~j$$(wA)*P;*knEO_gFrr#ugLbb!M2-HG6sc+ytNB+2#?P{i zL_Tx*X4n%7`2+dXReJ#8H2@au^M`APl!qKyn?bAXCioa-&IOQ|DgBt+mPzQ-1xy<| zqMcUv=BKIyKg#3NQC(Hf7JhwQH5^wU9yp_dd zbIp1-#Ol`%tr$#gCu$Ow47JX1%9UvWTZy9hGU#~=*Lq&&81d}8FZ?P+cFcY@D`w2VH}B0cIxy>CZ4*cGXb!WQjf{n znbCH!1O(TbGd+vsg*^;gvRy&%^|5cD{ply-U{sA4sLxc27p^=OQ|e`a&Aon4y|Gu) zEk9%@+(fGnYPiZb^#nq_yu0{!~nC2GAt1h%|J%VTdAs$&TIeyDAOI~BMiB}+hz1ZUc7 zDn%h3ZU#A#PuZ^8`2EZpnJ3KyPm3zQ9er5);|Mq}6CRmp;EdeF#{osyHfyMa0;U?V zejjPGNFTIH{UIVM|8#ZY)BoDYUyzg{C%@&D?9){X)?t&y9}?lAwwH_<4p0tpiB4bKE!#95UM zJ2?C_aBiCeQ$Fh<9(Jw5Lj9I7U^1obyMbkRn?fi?)bSq27*9=tj{8fmurn-n3hSr61<->f<=7&r_0(9HF< zc^HV-i~oNdood>mm|_=Kv?R{fOd2o~>^?e-dwUGwblKcKpH|pYzEIPXwUIX@teKHQ zD!{$;sw>6z5Y&>ox*T8uZ$+PG*ac?;Qx?byZs}YNpv)#<3KIJLFd5^(u;Xsz_2z`%G9r@iu78H8~9Z1YNhQ{NAxhrZHI` zmp{pj=szv2UviZXS_Vhq-8?GvMz*YZ1U>%?)k|e{)Q?*yih-xZde(!NR0##GXU$2v zuAhC;?As!|K^Hu$yB_ss=>l(P&hL1{|6xYWbDB&~IyKCVZ7z0E!)7bL=>i&-OGeBM z?{E!j>{?O=1wfI#9eqf`S(R`9l{5NmMkJ0zbm~Nj@)*~hO}F(fa(w}t>d(9RWwcIo z znEQ;!`!)RD9c1~ZMK)K*z( z3l50d7RZ;B4`V+h=?R4Ax4%2ZfLjz~fNF82asge;z;>~dHX9C2rzpG{3Yu(by^;eQ zr-qnK&rq2?A|6Uugl*^|okKt&aP*$IWYejaiOU1@Ns%>O(Z}a&oe=W{9r}3;l!Z?_ z`jU&nOwV)&*7Jc|zIIjQZtmL(EBZ^m5d6+st2NbyLzvPXBYm68k!|s|y+PK+BKB%b z7zJOzycpo~o^6Gj2NGyfA@8>@4RC`qVR$pd@)rC2F}DnyfG-d@yHn&7LQ7ts>ux*o z(x}#8kc#H1C~{@$?bS2PJzU^IQ2V8^q*i! z<~Q-tdysU~wo2+!oQZzZl8W%q!Fw_~1zaX)!aK0??>kFi;dr<@wi_-;O@EQztRd-J z2UXX+xWs0(sm&^TL@(X^gikF&GGjuDSu!C4^^=_bx*g`k? zC)R$9vTPJce1eH~1gW44S^9`Rkwu;I9WV9og5jev$bXPx^^E29UQ@dnAzxKyyXJV; zOP=OuC3Wq*cLMf1+i!rK8d7x z$AfgHkKA-}9HBXHZO3u~i+O4sD#%yTLsbxs{J|3PP>qjorsj?Url66~94@!2>gpAT W)RVtspq{@v6VaG8nI;1Sx_9gy z%dn(|#MMHO#v&1(eUurIYYO?{pD*1(84r4Ga-eVpCS5IM#O7kPfrExz&T*o~{gwAR zehB56ATl{bby(mM4I45aS@rm@*OtMhDKU6$MvF)c08GDBlI|`DlXaG4&Hv7j%WZgd zv(rd4px^I~UBwdyo$-%la8CnL?vY=T@f@90ff00ue$b(Cq0X-Cr=iiguq9?aC&@MH zjt}eiB<6H^G+7L3ELiPSu|QVaxByUAgcV(v_u|7VoWoV}<7Zn80<~Li7^~-8AL6qlOj_!l@t3u#<%7$9 zj#Lz&o-~>iJvU!O?At0YX^jNrf*byn~b9` zsl}px;gWs6g&b3D&Gn#OB&-F?K=lMY?!?A>#rxT+?`i==98`+zZ{+6j#g97TdH z@$WAvH==6h>}^Khr4|99Eb%ul@+!B(m}hx97LZuip`cOwpRC$zdCN(0+hK9#QgzQ} zT{ZFRSy+$cYgx=iD66lRr#%9Jf%UstP1+b|u&rJ7m9y#$$;M)f3{IKYDqkeoz|_BF z0f*G})?}xP=D0qe%7ibFWj!}~sV-~mQj^-EZ^{7g+@hp+VD~tgNSpAG-`!R*c=ZmG zXG-WvpA??y`x3R!?1XJWt)*tD$dskh8ovm^ncW{PJ!TCzo&*9kk!~P6;;7|$cX)NF zE{J{aB)Va%GjdewQ^%75Q?OQ=bFJ-cajJMU-(i#&t2}N;S`Z&(XtnAxb$sbR_3}&c@dG zI->B9?-`3Z4UfzeWWyS(xRuHIJOb;bU6`pB*;-`cMCd0XFgLr?%Ok5P*er5@J!u5j zNXX~X^$;P+C{B5=H0jkwY8O1MZDi9eeU%`*FAkx>q}ViaH%YzMWy(#sVUIa>4NeZw z=82PmaJ5fA5ssh>Ao9}%`1cf;BH*~eq1xU^g2^e9*L`B;^)!@?GSVKUTfeoWy zSf-+3{}bxBH`E)!GR-H@>_WKiFtQiW#*>>ptpqR+G5WbxsVD_Ai@T>AcS78WxhhQo zUpZxCWd7j-N{+sUR<@2^P@{rzQSH5Y9-50O9&{Yt6nRQ~bb{GHb83LEIKR`uojHel z(4j|qlFG0?G@mepOX-M)k$Fz^<33-y-139l_w$GQi{r@>Odsi%$aVbvMe^|2ym4g*MZAYMP<-PmS7_ltXKn>6r- z31*LgUjiklnuacWuxdw5$*$&Zf?dE!FMw=V^feNu*06J0% zsdYT6e*nbP1V&3%|8m|>O?J1CcfQ<5JYTvM$*v**e)(^ zM&o(RNx8nK$vY@Mp%?GKRUz_^jW^azo#}0ypQPTPC(lH-ljRFF@Nx>>u9(POVfV#aS56iaQF8-?{1eXjXe!~_d@JXpw_41nM)=Ds7TFASeXcG>K+|E6TXx3 zPf{OwQ)Y{lD<=44@Ro8qIe2#6yeBipfa3uKJq0IOKu^JD=Z+?0DbaN1(2aA+hEDra z53crI5kGnp`5LNL8>d7~HH*tE_eefu8IxI|0L$j^&JKt3@V42gRCPQEOm|6*VDuL=8_H1`xeiYDlDzBcP8#@Ch zvE^YSD1Wmw!xS0%T?U0qLG~!1apekOC4zLZ-$+o%M-F;sG$f^1*rkyeIXSEG)_nRb zElfTtF*6s9+)10;OAuvyD9?Cr`Yj=t_Dug>|D~%mb1}98p7WNRbr|2LB=4Lq@A)IQ zyf}sHSE0ZUAHI!+RQh@tq)~SB!cxqfxp1Z-w|%e6TJ@Xbfafz_m}=o*sA4o_ZF3%k z+X8ulO*DUmDF=1L`QMTD6;xCX#JsFl9%hGYf=T!DCCVv$yJ(1kyP(Own-iN#Z From b73006e3b833d35256a7229f19df4aabd881ffc6 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:34:57 -0700 Subject: [PATCH 04/21] attempting mac builds --- .travis.yml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd493f0a2..62a9129ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,18 +36,29 @@ matrix: python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz + - compiler: ": Mac" + os: osx + osx_image: xcode9.2 + env: > + HOST=x86_64-apple-darwin11 + TARGET=x86_64-apple-darwin + BSCRIPT=build-mac.sh + TRAVIS_OS_NAME=osx + PACKAGES="binutils protobuf autogen" + OSX_SDK=10.9 exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export - CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi -- source /home/travis/google-cloud-sdk/path.bash.inc -- sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list -- travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES +- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf $HOME/google-cloud-sdk; export + CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash &&source /home/travis/google-cloud-sdk/path.bash.inc && sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list && travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES - if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi - if [ $TARGET_PLATFORM = Win64 ]; then rustup target add $RUST_TARGET; fi +- if [ $TRAVIS_OS_NAME = osx ]; then brew upgrade python coreutils automake; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew install flock; fi +- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite gcc@5; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; fi before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources From 2a023e3c45ef425e78fea8a398d7252a53c22e90 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:35:29 -0700 Subject: [PATCH 05/21] attempting mac builds --- .travis.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62a9129ea..136f69371 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,20 +22,20 @@ cache: matrix: fast_finish: true include: - - compiler: ": Linux" - env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh - TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib - autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake - libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common - libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod - src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - - compiler: ": Windows" - env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu - BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev - libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git - python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe - src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz +# - compiler: ": Linux" +# env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh +# TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib +# autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake +# libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common +# libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod +# src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz +# - compiler: ": Windows" +# env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu +# BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev +# libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git +# python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler +# libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe +# src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Mac" os: osx osx_image: xcode9.2 From 4532d437a43267b58008113eafa0839d774df770 Mon Sep 17 00:00:00 2001 From: David Dawes Date: Sat, 26 May 2018 12:37:20 -0700 Subject: [PATCH 06/21] Attepting to fix typing issue on Mac. --- src/pow/tromp/equi_miner.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pow/tromp/equi_miner.h b/src/pow/tromp/equi_miner.h index ae527827a..d53d0d8aa 100644 --- a/src/pow/tromp/equi_miner.h +++ b/src/pow/tromp/equi_miner.h @@ -25,7 +25,13 @@ #include typedef uint16_t u16; +#ifdef _WIN32 +typedef unsigned long long u64; +#elif __linux__ typedef uint64_t u64; +#else +typedef unsigned long u64; +#endif #ifdef EQUIHASH_TROMP_ATOMIC #include From b247a9f575fbb35063d9b2588960a7ca9e14c369 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:40:19 -0700 Subject: [PATCH 07/21] attempting mac builds --- AUTH_KEY.json.enc | Bin 2352 -> 2359 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index 2ef6245d853e98605dc1d1a0f39906a5ea9c6c4f..6d9d8225a2fb381df6077d8a3bf8c5950e2a8ec5 100644 GIT binary patch literal 2359 zcmV-73CQ*gF8VVmt3G+5A2Lmc&=5CJB}F)iK(!1qqBiwH^(qhI;Egn!4d*9NaZMl+8Mn8v?N5E*e14i;2+;=tx z$|QJF-prpHWT0|cQcc|q%{@en`3{k@c`Qf+Rw4z4ue~VL=w-qg+Th!h@8=77w9+3D z<>Ed~f?22n4eozOv(lanc3d-l)+{kC7;D)RcVn>ks_1<*XST&Vs1eUgDg4D{Ct2E& z)z?5%G&sCss*);x9_ibBPNkSr>2Tm%J!7nncLDx*>IcRcsYXu9BOMnNfhW@@XtB1c z1ZscHD}Tj`f^jR6pvrwTPIlB|yxPD54JEA$269muY39;i=il<|2Gce_E;pVpxKxJIY~S+m@f8S$xBPDp&zZ+C zGT;cVk>{}e^rOl;n8FQU34%Yg@5kH4!nKIdr$wEH-ZCcMTK(1z9)gztWmeCr-JBS> z8!3_TLep7M?3o|(86|3jAwVdalHMpBuBNQJ6EiN9*($=2UMq^?-(MYf>cH~wk+D+( zh|BI4LS0z^SXk*;#ab*rk9d<6qs7H+rLd2hKQE~jdy0LG{+AidcUhj-R3Yg@yOT{K zS{!|0YE_L++dP9QUC^^<|LZkgHjX}eot7x0Ju1XF+V={ zx#TdXFxcI|m=C|n!icAqC!IqL3W$TT`~P1;NQl;2Ke_g8gr*G&4c6ms2pkijk+1hQ zU=4XtC@;<&n}G0bIMj01-rczSG3!51-Pq;D?X3|$^~1>EZT}xYs{4bTZ}h5%e=z;G zL{{a5G&)tV*&d`&9-^oKzZ4X*MGx=Ote2!N{eY)TO4|-a|LN*?Gh(wfJR$^q>OulI znm^F_$i~0sNG0-%YThv5cqV!&m}=qsr;O;&jgrIs2u4+}9nW=I&~JrpZLD}GwiIHG zw~s;^<>;QrQR*M?R;LTJIp;( zUWJF3PciHpCUcbX#1U&UuPX24i}t(x60YdfP|~5|s=}ZIf#l}};d32jI$B>8nd(fz zhXlWT<8A(B+Nmmv=>tUuxouQBOJ*nVtBA0UyArl+gnZRc^2kwF-! zQ_E7CDCBjg$V39`YgpM-A3Dm~%_>cuociIb#f1TTn8LewQY@NvPEp|c-@$I1@r z!tOx5uykI8#YxK}QI(bjc@?PpZ{F;=ci7uch>P zmk4-*c+;}Yk+_!Q=p0|CD5O1~37X${k1WyO2Lj+4qEK}4sVr64FGoiyCY1GXnr+{9 zDL7pJN`U1aGc#|TneCwq$dr0OefilPUi(2@l6@DHM75%hSWb?m%=VtVpEoz%SAd~u z&p?Gt!)WGL-ne;XZ}Y>sFdML)=#E{Vr}P)nZ*-0@gX1A|s`R#A#BO4z0UvlHNCe?R zu=2Pb0Bx6^J&8koftm9SPD4^>X!#qNMeIk524f%X?!7^|GF273c2aye!yT6#?CB=^ zHUOq=SzLxR5q=(N!I_MW{=?RT+~HQ+A|8Ico@4l#sF^V2Yq?D@npkhoXA)!)SdWA7 zZz!l*-5ucGX4aezj;x10Ri)(TU#Hp+LVvVGMCy_?P{6B&Jlo2CymPRwZf^xuI7%X> zYpj+1WLU7@L`;{v%oZV;6m@>n7d9GZ%MQoc_*J_Z!K5tXhq-GfF-OdWW^A9~mm6z9 zONnyJEMTNzKO;oK*@>3zS!v#AHS%{yVt7Yg-Lc1SPtBEv$O|YP8wPoRcF<2faj#-d zzvC)5Q~GIr7Fz>IY>MeXg=CC~dW!BbaBTcD`{>+p7*|4BRC-8yDpnYtP@AetQEPd} zA(s!B;D1%lrO5-OkAi(;7W3-nmQ;-z>{kL`J+08;iI97g%hS&S!6)Y?e2XvnEVDLdIWSBij&qWXTa)XPyY;o}s zZK0wljmJT_OQmDuBdX68Ad-$sAS&EUW!nZlsPIg$6%8cgKE+q#gK8$@ChSJ>srfAHf=qTxTd%#o zWsiY;_bm)dj6PATTzN?5nYcjhh_Brk<-pI)T6MKRZWhfF~%3R zVAARd2nr*L>Mrqmg=wU^L*-THPb`j_?c%BWlLAz>+%L9f)6#dkA z@iE!D#N!#j0&j)J1@e3$RvS1Yq(QPepUPhf?dpukB8b>zu8_M@K|#I}u`gFcqvyMk zb`!7Y22U4-H!l=`NJraBpb#JzB@un%nXj3%fFfh^f_Hd4jJ$M3z4W6Aj}eR9BP#5N zR&~1swjoze;b+8a+Y~j$$(wA)*P;*knEO_gFrr#ugLbb!M2-HG6sc+ytNB+2#?P{i zL_Tx*X4n%7`2+dXReJ#8H2@au^M`APl!qKyn?bAXCioa-&IOQ|DgBt+mPzQ-1xy<| zqMcUv=BKIyKg#3NQC(Hf7JhwQH5^wU9yp_dd zbIp1-#Ol`%tr$#gCu$Ow47JX1%9UvWTZy9hGU#~=*Lq&&81d}8FZ?P+cFcY@D`w2VH}B0cIxy>CZ4*cGXb!WQjf{n znbCH!1O(TbGd+vsg*^;gvRy&%^|5cD{ply-U{sA4sLxc27p^=OQ|e`a&Aon4y|Gu) zEk9%@+(fGnYPiZb^#nq_yu0{!~nC2GAt1h%|J%VTdAs$&TIeyDAOI~BMiB}+hz1ZUc7 zDn%h3ZU#A#PuZ^8`2EZpnJ3KyPm3zQ9er5);|Mq}6CRmp;EdeF#{osyHfyMa0;U?V zejjPGNFTIH{UIVM|8#ZY)BoDYUyzg{C%@&D?9){X)?t&y9}?lAwwH_<4p0tpiB4bKE!#95UM zJ2?C_aBiCeQ$Fh<9(Jw5Lj9I7U^1obyMbkRn?fi?)bSq27*9=tj{8fmurn-n3hSr61<->f<=7&r_0(9HF< zc^HV-i~oNdood>mm|_=Kv?R{fOd2o~>^?e-dwUGwblKcKpH|pYzEIPXwUIX@teKHQ zD!{$;sw>6z5Y&>ox*T8uZ$+PG*ac?;Qx?byZs}YNpv)#<3KIJLFd5^(u;Xsz_2z`%G9r@iu78H8~9Z1YNhQ{NAxhrZHI` zmp{pj=szv2UviZXS_Vhq-8?GvMz*YZ1U>%?)k|e{)Q?*yih-xZde(!NR0##GXU$2v zuAhC;?As!|K^Hu$yB_ss=>l(P&hL1{|6xYWbDB&~IyKCVZ7z0E!)7bL=>i&-OGeBM z?{E!j>{?O=1wfI#9eqf`S(R`9l{5NmMkJ0zbm~Nj@)*~hO}F(fa(w}t>d(9RWwcIo z znEQ;!`!)RD9c1~ZMK)K*z( z3l50d7RZ;B4`V+h=?R4Ax4%2ZfLjz~fNF82asge;z;>~dHX9C2rzpG{3Yu(by^;eQ zr-qnK&rq2?A|6Uugl*^|okKt&aP*$IWYejaiOU1@Ns%>O(Z}a&oe=W{9r}3;l!Z?_ z`jU&nOwV)&*7Jc|zIIjQZtmL(EBZ^m5d6+st2NbyLzvPXBYm68k!|s|y+PK+BKB%b z7zJOzycpo~o^6Gj2NGyfA@8>@4RC`qVR$pd@)rC2F}DnyfG-d@yHn&7LQ7ts>ux*o z(x}#8kc#H1C~{@$?bS2PJzU^IQ2V8^q*i! z<~Q-tdysU~wo2+!oQZzZl8W%q!Fw_~1zaX)!aK0??>kFi;dr<@wi_-;O@EQztRd-J z2UXX+xWs0(sm&^TL@(X^gikF&GGjuDSu!C4^^=_bx*g`k? zC)R$9vTPJce1eH~1gW44S^9`Rkwu;I9WV9og5jev$bXPx^^E29UQ@dnAzxKyyXJV; zOP=OuC3Wq*cLMf1+i!rK8d7x z$AfgHkKA-}9HBXHZO3u~i+O4sD#%yTLsbxs{J|3PP>qjorsj?Url66~94@!2>gpAT W Date: Sat, 26 May 2018 12:43:19 -0700 Subject: [PATCH 08/21] attempting mac builds --- .travis.yml | 45 ++++++++++++++++----------------------------- 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index 136f69371..793392aa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,43 +22,32 @@ cache: matrix: fast_finish: true include: -# - compiler: ": Linux" -# env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh -# TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib -# autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake -# libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common -# libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="src/komodod -# src/komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz -# - compiler: ": Windows" -# env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu -# BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev -# libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git -# python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler -# libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="src/komodod.exe -# src/komodo-cli.exe src/komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Mac" os: osx osx_image: xcode9.2 - env: > - HOST=x86_64-apple-darwin11 - TARGET=x86_64-apple-darwin - BSCRIPT=build-mac.sh - TRAVIS_OS_NAME=osx - PACKAGES="binutils protobuf autogen" - OSX_SDK=10.9 + env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BSCRIPT=build-mac.sh + TRAVIS_OS_NAME=osx PACKAGES="binutils protobuf autogen" OSX_SDK=10.9 + +' exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf $HOME/google-cloud-sdk; export - CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash &&source /home/travis/google-cloud-sdk/path.bash.inc && sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list && travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES +- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf + $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com + | bash &&source /home/travis/google-cloud-sdk/path.bash.inc && sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list + && travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES - if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi - if [ $TARGET_PLATFORM = Win64 ]; then rustup target add $RUST_TARGET; fi - if [ $TRAVIS_OS_NAME = osx ]; then brew upgrade python coreutils automake; fi -- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew install flock; fi -- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite gcc@5; fi -- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew + install flock; fi +- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew + tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite + gcc@5; fi +- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; + fi before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources @@ -74,9 +63,7 @@ after_script: && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi -notifications: - slack: - secure: A7JtO9RXl0Tgx09IWwUKbCuZ0oTC4wM4jthsV2CW3AS7r5Iz1qMFBnb7sb8744f40vi/QYjbr1KHkdOEbSJqWzOJS7oelSM9kyck808un7zZ8OwweXdGqdirNmIR3x+IQAYZw2lvYZcUBX/5h8eXK2LU67Rsve5I1WRGPtz0rmctFeRG6Xe0yGpMDYYxt4Ce/L7N5h3cC2eak8pQU6mSyQog0yvbiM73CFzz//bWughamOHKLx6o8BDgklwuCuh4rHQe/0kwVq1AoPQMqxuKQTsGAmub4mrDcsde39h3uo4GjAqAgfmL2e4hyp8fumdd7BtrQaFF4UBqyR8Xo/Ao97Ca7Dbeii5Eq7sl5/sTxZRdjy+MFD7z+jFpLkXfivBradyu0jABT5YYYMzZOCkpOGl5l3YymT86HKO5RBHyZLNL06jxHLti3NYBvFC6C+0yZrJOo7KN9DMqHHLZ5Y3ASZqbARWlVDE4oQmauyn4X2d6EOoE7ohwHwpY/LbVNFmrGvD+jAf4dOttwCMoWnT2pLWzs8Tl4FrvDGR3tbmZSCR/0NfbbeGrv9YNJtUghjubp1OikaZ3/Hs0+yJVsKo3kVd+dZvT/5u9MD6bu/cSdBRnoG0orca9QB8obaTEQ+71XC63D0hwDoZ9IgX6qVv+3KFErHZdZGiQBZI2yXSckvI= before_install: - openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d + From 987b65957e93622a254ff46d7b026e9bd6bfc1da Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:45:29 -0700 Subject: [PATCH 09/21] attempting mac builds --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 793392aa1..1ce754c95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,7 +63,4 @@ after_script: && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi -before_install: -- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv - -in AUTH_KEY.json.enc -out AUTH_KEY.json -d From 85b0e3fd9404dc493aff7b7bcc4f84e86c84898a Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:47:55 -0700 Subject: [PATCH 10/21] attempting mac builds --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ce754c95..7956aef3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,6 @@ matrix: exclude: - compiler: gcc install: -- if [ ! -d "$HOME/google-cloud-sdk/bin" && $TRAVIS_OS_NAME = linux]; then rm -rf - $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com - | bash &&source /home/travis/google-cloud-sdk/path.bash.inc && sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list - && travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES - if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi From 78a27c22525c45dd7fd44e49088cc9eccb847f85 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 12:53:18 -0700 Subject: [PATCH 11/21] attempting mac builds --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7956aef3a..0b9f1bcc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ matrix: - compiler: ": Mac" os: osx osx_image: xcode9.2 - env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BSCRIPT=build-mac.sh + env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BUILD_SCRIPT=build-mac.sh TRAVIS_OS_NAME=osx PACKAGES="binutils protobuf autogen" OSX_SDK=10.9 ' From db71ae3bcc765f21dd72dddeb910abdc506f90a4 Mon Sep 17 00:00:00 2001 From: "David L. Dawes" Date: Sat, 26 May 2018 19:08:32 -0700 Subject: [PATCH 12/21] Add komodo tool kit. Some assembly required. --- kmd/assemble | 4 ++++ kmd/verus | 7 +++++++ kmd/verusd | 2 ++ 3 files changed, 13 insertions(+) create mode 100755 kmd/assemble create mode 100755 kmd/verus create mode 100755 kmd/verusd diff --git a/kmd/assemble b/kmd/assemble new file mode 100755 index 000000000..30ce5d327 --- /dev/null +++ b/kmd/assemble @@ -0,0 +1,4 @@ +cp ../src/komodod . +cp ../src/komodo-cli . +tar -czf kmd.tar.gz komodod komodo-cli verus verusd + diff --git a/kmd/verus b/kmd/verus new file mode 100755 index 000000000..956ac71c4 --- /dev/null +++ b/kmd/verus @@ -0,0 +1,7 @@ +#!/bin/bash + +#set working directory to the location of this script +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +cd $DIR + +../komodo-cli -ac_name=VRSC "$@" diff --git a/kmd/verusd b/kmd/verusd new file mode 100755 index 000000000..7ec4f6246 --- /dev/null +++ b/kmd/verusd @@ -0,0 +1,2 @@ +./komodod -ac_name=VRSC -ac_algo=verushash -ac_cc=1 -ac_veruspos=50 -ac_supply=0 -ac_eras=3 -ac_reward=0,38400000000,2400000000 -ac_halving=1,43200,1051920 -ac_decay=100000000,0,0 -ac_end=10080,226080,0 -ac_timelockgte=19200000000 -ac_timeunlockfrom=129600 -ac_timeunlockto=1180800 -addnode=185.25.48.72 -addnode=185.25.48.236 -addnode=185.64.105.111 "$@" + From 50b418e0b81a76702d5feec023212174d23f2a81 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 19:41:25 -0700 Subject: [PATCH 13/21] stop unnecessary fetch --- .travis.yml | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index bb92777d6..30331e41d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,27 +22,32 @@ cache: matrix: fast_finish: true include: - - - compiler: ": Mac" - os: osx - osx_image: xcode9.2 - env: 'HOST=x86_64-apple-darwin11 TARGET=x86_64-apple-darwin BUILD_SCRIPT=build-mac.sh - TRAVIS_OS_NAME=osx PACKAGES="binutils protobuf autogen" OSX_SDK=10.9 + - compiler: ": Linux" + env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh + TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib + autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake + libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common + libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="komodod + komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz + - compiler: ": Windows" + env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu + BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev + libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git + python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="komodod.exe + komodo-cli.exe komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz exclude: - compiler: gcc install: +- if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export + CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi +- source /home/travis/google-cloud-sdk/path.bash.inc +- sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list +- travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES - if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi - if [ $TARGET_PLATFORM = Win64 ]; then rustup target add $RUST_TARGET; fi -- if [ $TRAVIS_OS_NAME = osx ]; then brew upgrade python coreutils automake; fi -- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew tap discoteq/discoteq && brew - install flock; fi -- if [ $TRAVIS_OS_NAME = osx ]; then rm '/usr/local/include/c++' && travis_retry brew - tap homebrew/homebrew-core && brew install homebrew/homebrew-core/gcc@5 --overwrite - gcc@5; fi -- if [ $TRAVIS_OS_NAME = osx ]; then travis_retry brew update && brew install $PACKAGES; - fi before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources @@ -52,10 +57,11 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/$TARGET_PLATFORM.tar.gz - . && tar -xzvf $TARGET_PLATFORM.tar.gz && ls && rm $TARGET_PLATFORM.tar.gz; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cp -rv $KOMODO_EXEC_SET $TARGET_PLATFORM - && cd src && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp -rv $TARGET_PLATFORM.tar.gz - gs://$BUCKET/CI-TESTS/$PROJECT/$TRAVIS_BRANCH/; fi - +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd src && mkdir $TARGET_PLATFORM && cp -r $KOMODO_EXEC_SET $TARGET_PLATFORM && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $TARGET_PLATFORM.tar.gz gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi +notifications: + slack: + secure: A7JtO9RXl0Tgx09IWwUKbCuZ0oTC4wM4jthsV2CW3AS7r5Iz1qMFBnb7sb8744f40vi/QYjbr1KHkdOEbSJqWzOJS7oelSM9kyck808un7zZ8OwweXdGqdirNmIR3x+IQAYZw2lvYZcUBX/5h8eXK2LU67Rsve5I1WRGPtz0rmctFeRG6Xe0yGpMDYYxt4Ce/L7N5h3cC2eak8pQU6mSyQog0yvbiM73CFzz//bWughamOHKLx6o8BDgklwuCuh4rHQe/0kwVq1AoPQMqxuKQTsGAmub4mrDcsde39h3uo4GjAqAgfmL2e4hyp8fumdd7BtrQaFF4UBqyR8Xo/Ao97Ca7Dbeii5Eq7sl5/sTxZRdjy+MFD7z+jFpLkXfivBradyu0jABT5YYYMzZOCkpOGl5l3YymT86HKO5RBHyZLNL06jxHLti3NYBvFC6C+0yZrJOo7KN9DMqHHLZ5Y3ASZqbARWlVDE4oQmauyn4X2d6EOoE7ohwHwpY/LbVNFmrGvD+jAf4dOttwCMoWnT2pLWzs8Tl4FrvDGR3tbmZSCR/0NfbbeGrv9YNJtUghjubp1OikaZ3/Hs0+yJVsKo3kVd+dZvT/5u9MD6bu/cSdBRnoG0orca9QB8obaTEQ+71XC63D0hwDoZ9IgX6qVv+3KFErHZdZGiQBZI2yXSckvI= +before_install: +- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv +-in AUTH_KEY.json.enc -out AUTH_KEY.json -d \ No newline at end of file From 61644b4965a49fe1bb217b6fb217d0e84deaf00d Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 20:19:33 -0700 Subject: [PATCH 14/21] stop unnecessary fetch --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 30331e41d..698b9d60c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,14 +23,14 @@ matrix: fast_finish: true include: - compiler: ": Linux" - env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=Linux64 BUILD_SCRIPT=build.sh + env: HOST=x86_64-unknown-linux-gnu TARGET_PLATFORM=linux64 BUILD_SCRIPT=build.sh TRAVIS_OS_NAME=linux PACKAGES="build-essential pkg-config libc6-dev m4 g++-multilib autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="komodod komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz - compiler: ": Windows" - env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=Win64 RUST_TARGET=x86_64-pc-windows-gnu + env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=win64 RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler From f0d93abb0fc8f4d93cb48146d2ed391af9527e94 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 20:43:12 -0700 Subject: [PATCH 15/21] Travis Cleanup --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 698b9d60c..dce8783a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,14 +28,14 @@ matrix: autoconf libtool ncurses-dev unzip python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libdb++-dev software-properties-common libcurl4-openssl-dev curl" PPA="ppa:chris-lea/zeromq" KOMODO_EXEC_SET="komodod - komodo-cli" COMPRESSED_BUILD=Komodo-build.tar.gz + komodo-cli" - compiler: ": Windows" env: HOST=x86_64-w64-mingw32 TARGET_PLATFORM=win64 RUST_TARGET=x86_64-pc-windows-gnu BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="komodod.exe - komodo-cli.exe komodo-tx.exe" COMPRESSED_BUILD=Komodo-build.tar.gz + komodo-cli.exe komodo-tx.exe" exclude: - compiler: gcc install: From 031326162df57c778892013d873291de466c8bf5 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 20:49:00 -0700 Subject: [PATCH 16/21] Travis Cleanup --- .travis.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index dce8783a0..b5724967d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,10 +34,13 @@ matrix: BUILD_SCRIPT=build-win.sh PACKAGES="build-essential pkg-config libcurl3-gnutls-dev libc6-dev libevent-dev m4 g++-multilib autoconf libtool ncurses-dev unzip git python zlib1g-dev wget bsdmainutils automake libssl-dev libprotobuf-dev protobuf-compiler - libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="komodod.exe - komodo-cli.exe komodo-tx.exe" + libdb++-dev ntp ntpdate mingw-w64 wine bc" KOMODO_EXEC_SET="komodod.exe komodo-cli.exe + komodo-tx.exe" exclude: - compiler: gcc +before_install: +- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv + -in AUTH_KEY.json.enc -out AUTH_KEY.json -d install: - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi @@ -57,11 +60,11 @@ script: after_script: - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gcloud auth activate-service-account --key-file AUTH_KEY.json; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd src && mkdir $TARGET_PLATFORM && cp -r $KOMODO_EXEC_SET $TARGET_PLATFORM && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; fi -- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $TARGET_PLATFORM.tar.gz gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then cd src && mkdir $TARGET_PLATFORM && + cp -r $KOMODO_EXEC_SET $TARGET_PLATFORM && tar -czvf $TARGET_PLATFORM.tar.gz $TARGET_PLATFORM; + fi +- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then gsutil cp $TARGET_PLATFORM.tar.gz + gs://$BUCKET/$PROJECT/$TRAVIS_BRANCH/; fi notifications: slack: - secure: A7JtO9RXl0Tgx09IWwUKbCuZ0oTC4wM4jthsV2CW3AS7r5Iz1qMFBnb7sb8744f40vi/QYjbr1KHkdOEbSJqWzOJS7oelSM9kyck808un7zZ8OwweXdGqdirNmIR3x+IQAYZw2lvYZcUBX/5h8eXK2LU67Rsve5I1WRGPtz0rmctFeRG6Xe0yGpMDYYxt4Ce/L7N5h3cC2eak8pQU6mSyQog0yvbiM73CFzz//bWughamOHKLx6o8BDgklwuCuh4rHQe/0kwVq1AoPQMqxuKQTsGAmub4mrDcsde39h3uo4GjAqAgfmL2e4hyp8fumdd7BtrQaFF4UBqyR8Xo/Ao97Ca7Dbeii5Eq7sl5/sTxZRdjy+MFD7z+jFpLkXfivBradyu0jABT5YYYMzZOCkpOGl5l3YymT86HKO5RBHyZLNL06jxHLti3NYBvFC6C+0yZrJOo7KN9DMqHHLZ5Y3ASZqbARWlVDE4oQmauyn4X2d6EOoE7ohwHwpY/LbVNFmrGvD+jAf4dOttwCMoWnT2pLWzs8Tl4FrvDGR3tbmZSCR/0NfbbeGrv9YNJtUghjubp1OikaZ3/Hs0+yJVsKo3kVd+dZvT/5u9MD6bu/cSdBRnoG0orca9QB8obaTEQ+71XC63D0hwDoZ9IgX6qVv+3KFErHZdZGiQBZI2yXSckvI= -before_install: -- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv --in AUTH_KEY.json.enc -out AUTH_KEY.json -d \ No newline at end of file + secure: FiVlFhSw5xnDu1Cx2yAo3J7miFCSRyuzR/2+8LKFjdWl5+fyIGvQ9x5vgUg6dWbv3UP9iIMqQuWfotsg8H+NE8pYRZQ0zDVxZ5h9+PA028qGb3OF4TMFNcltP5DGtAZ6AqrMNRZ4ltatPUm5H9ig1bhzjsx+3pqlqQuVXTXPjaUryB5s/fk2CjrsV6zTLfPHiI30jeMjmQrJJLik1vSWF70sB6HkQhvaT6jymkO4Vuh+cja418W1xIgkkoRsOXiZ/JK4hIypFo/sBkmIOprGqoFUahFqJlsBoSrp9iAzkwbDItIqqvNCHTEeN7lj6kK43ZK72E4etjjNc0CXWeleXBJBCj5Prq2lEkQ4NwuDTos3KLyyr2vI7f54xhb5+wjzY9dByHXGuG5UaNz0+uukuJinAdazGaNmmfesv1wg9p3jGa/TLsfHLMcUti875DzkUHnenivP5cXrc6/uuZyyQNq5+Gn/3DA8k0y7d1e23nm3nDjCNfATAn3yu1jieYY2yYI6CYGEXcD+UbP61uG6no+mm/lkQbQosyDfE0sADqGryqXswRste+R0sSVMBQtTipAZOUoYNbEmhN4+L78SSp3zpmgkrIxAw7le8oj6Evp2ofvE2Kvh+Z0MVoEJx6mtZI6hheIFSS38NeUZr/HBfRSpaElOYTN/ZNf8QwThCWo= From d29688dc20d60aa841045e8955777ba54e885c78 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 20:52:18 -0700 Subject: [PATCH 17/21] Fixed broken auth --- .travis.yml | 6 +++--- AUTH_KEY.json.enc | Bin 2359 -> 2361 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5724967d..9d08a14fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,9 +38,6 @@ matrix: komodo-tx.exe" exclude: - compiler: gcc -before_install: -- openssl aes-256-cbc -K $encrypted_80a07e64c04e_key -iv $encrypted_80a07e64c04e_iv - -in AUTH_KEY.json.enc -out AUTH_KEY.json -d install: - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash; fi @@ -68,3 +65,6 @@ after_script: notifications: slack: secure: FiVlFhSw5xnDu1Cx2yAo3J7miFCSRyuzR/2+8LKFjdWl5+fyIGvQ9x5vgUg6dWbv3UP9iIMqQuWfotsg8H+NE8pYRZQ0zDVxZ5h9+PA028qGb3OF4TMFNcltP5DGtAZ6AqrMNRZ4ltatPUm5H9ig1bhzjsx+3pqlqQuVXTXPjaUryB5s/fk2CjrsV6zTLfPHiI30jeMjmQrJJLik1vSWF70sB6HkQhvaT6jymkO4Vuh+cja418W1xIgkkoRsOXiZ/JK4hIypFo/sBkmIOprGqoFUahFqJlsBoSrp9iAzkwbDItIqqvNCHTEeN7lj6kK43ZK72E4etjjNc0CXWeleXBJBCj5Prq2lEkQ4NwuDTos3KLyyr2vI7f54xhb5+wjzY9dByHXGuG5UaNz0+uukuJinAdazGaNmmfesv1wg9p3jGa/TLsfHLMcUti875DzkUHnenivP5cXrc6/uuZyyQNq5+Gn/3DA8k0y7d1e23nm3nDjCNfATAn3yu1jieYY2yYI6CYGEXcD+UbP61uG6no+mm/lkQbQosyDfE0sADqGryqXswRste+R0sSVMBQtTipAZOUoYNbEmhN4+L78SSp3zpmgkrIxAw7le8oj6Evp2ofvE2Kvh+Z0MVoEJx6mtZI6hheIFSS38NeUZr/HBfRSpaElOYTN/ZNf8QwThCWo= +before_install: +- openssl aes-256-cbc -K $encrypted_742ace89121e_key -iv $encrypted_742ace89121e_iv + -in AUTH_KEY.json.enc -out AUTH_KEY.json -d diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index 6d9d8225a2fb381df6077d8a3bf8c5950e2a8ec5..d1e21cb2b581252db36225c0b720d00be7210a55 100644 GIT binary patch literal 2361 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 Date: Sat, 26 May 2018 20:56:00 -0700 Subject: [PATCH 18/21] Fixed broken auth --- .travis.yml | 2 +- AUTH_KEY.json.enc | Bin 2361 -> 2352 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9d08a14fb..3a3968bea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -66,5 +66,5 @@ notifications: slack: secure: FiVlFhSw5xnDu1Cx2yAo3J7miFCSRyuzR/2+8LKFjdWl5+fyIGvQ9x5vgUg6dWbv3UP9iIMqQuWfotsg8H+NE8pYRZQ0zDVxZ5h9+PA028qGb3OF4TMFNcltP5DGtAZ6AqrMNRZ4ltatPUm5H9ig1bhzjsx+3pqlqQuVXTXPjaUryB5s/fk2CjrsV6zTLfPHiI30jeMjmQrJJLik1vSWF70sB6HkQhvaT6jymkO4Vuh+cja418W1xIgkkoRsOXiZ/JK4hIypFo/sBkmIOprGqoFUahFqJlsBoSrp9iAzkwbDItIqqvNCHTEeN7lj6kK43ZK72E4etjjNc0CXWeleXBJBCj5Prq2lEkQ4NwuDTos3KLyyr2vI7f54xhb5+wjzY9dByHXGuG5UaNz0+uukuJinAdazGaNmmfesv1wg9p3jGa/TLsfHLMcUti875DzkUHnenivP5cXrc6/uuZyyQNq5+Gn/3DA8k0y7d1e23nm3nDjCNfATAn3yu1jieYY2yYI6CYGEXcD+UbP61uG6no+mm/lkQbQosyDfE0sADqGryqXswRste+R0sSVMBQtTipAZOUoYNbEmhN4+L78SSp3zpmgkrIxAw7le8oj6Evp2ofvE2Kvh+Z0MVoEJx6mtZI6hheIFSS38NeUZr/HBfRSpaElOYTN/ZNf8QwThCWo= before_install: -- openssl aes-256-cbc -K $encrypted_742ace89121e_key -iv $encrypted_742ace89121e_iv +- openssl aes-256-cbc -K $encrypted_11153c0bb86c_key -iv $encrypted_11153c0bb86c_iv -in AUTH_KEY.json.enc -out AUTH_KEY.json -d diff --git a/AUTH_KEY.json.enc b/AUTH_KEY.json.enc index d1e21cb2b581252db36225c0b720d00be7210a55..f76321d6bc2a24de895f764aff33215eade13a65 100644 GIT binary patch literal 2352 zcmV-03D5SKK%PChDM?bH-`@L|ZW|HTDQ!Dw@$Ve&IzNvSkbWV;I{B9)sAR=|@hb`J z3`a`a?*Y_tz_DcDmGOeeB{iDu^}gogN?j=#OYklPw7J#WLgGr<~q4X9!Ms9axYG)XfU0 zy1B;_PM}Wv>)PsGQKwFXDRTPtXb{vW1xeD!rRvxYo8Hf^EUFUn9Zfl0Qd#?+mSiRIYCVnY{7|bLq$@m6g46L{rG0OOymA;}4 zm|WFD=_t<^o-fGOVH)zo7^Keg<)T?0&8}_zH=7GpToL(KtuJe|E0lCdOht&%L!HX0 zf?5D8zb3)4d$J4--}o6bj+qR%U&G*F_D- zx_Sd?d#;%Zm2<6xiG3!iLD>K$qdQzi( zsTgI~|M(p?^0n;#hMn=v%*1)(MncbUeHdh29b{Ac%1pOLZxZjfGhtoMada4xK(BC* zl(8Jb&EpcJx>j5~hqYeyndq}{yp)X*UVi`#gtx*Pd%ai2!UN}YGS}pcjZ0;+S&x&F-zIpK)`AGjG z&(X(TVG8_YK!98~UkN@IGJi*WB9tY~hc`b~CYkXmLzJii^vG zT5gm9erlc6DDK`O<1^o$17tswJ@%*~ah!z~t$%Tt!oO846b>7x{84bt!>tQB|EfuhLuH5TxSo zFikI>aL4iwPEmf0RGizx#v|pI#xKIxEovdCyc2=xSQbm*)VR*s)VU0dOZ%C&^APes z$^m#qtIvp8<=^KreeaJAdak%a28gui{#=}ZVeHkBQGDAcV7^>4Ik{p%b;bz~0Rdq= z>Sm$aB%PDU)wb)ko@`!JH09b9b)Y5nT)fa(`q*~QB9$jV;EMTS5S2!Q{ zWyJ)W&!I@d1_(1s^Yxdq-y^graMhHir#Wr@Kv}QjiX}1;U_?F&3qbP}>8t&SbSR1ABAoa`JIJIK!XbkO(D5o2D15E= z$`oQn^{HzO1&mBSw#~79xJXBt=suL-8E76=uxi!sP5%Sp%Y^m4b>a(k)n$DYQqlaM z>hstYPW308N?)o`4#O^^X@$bcfSW9F80MHOZQ!ydIPaoKCNmm(D<7-B6@HmFMG-=f zMz~DxA(m+@+_z3@*=GCAIZNV#q86KG4l=Sv!R`W!3_xuCE6GOx?= zjO2!e#hNMM+m5V-RkioRo_gEbf}e-R)C&dH#?L#&Rfj)=c)vdhtzSY*<=3uvBS-0Y zT0^Jg3+Z`#-2VsK)^>b_L&%j?W1%J8JhV7~BUCpols&k1rzQ zhZ^brDO#eZoDonr<)`*l6$WducNO5A|kldP%agyB4)nAeczYOk7Iu)x;|Ke6=&R5aUN5@!4}~?xSmV zRl{uU`FLSk0Kb+!)+43wOoq%;^(FElg3Q)`P? ztH`&2qh3(o0rD^0+;iPs0wdQXC}2JN&K0YNG~c(Mxdqc4{cO0B_Qu>3sxFTn105ax z<%ULWFp?N>v5%nSjS=IP<9NN5pnPLZtWy&k<8UQ}1_y=Ic6__Fs5M{NL7kiFh;AmD z{X0=U;GfG!rvqurfE;$pYt*1De!_&psaA$6OO+j!6w-#|rTbGTXi^JR0r5^3U&0`- zuv|3I#`-%7&Ayx3Ay{X|hR;=_frJk-0FbhMdRFcumouem?JZiDa9p(Zri^k&g+73G WFyttmhl6~rZ>sFlJ1 literal 2361 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 f4GQ Date: Sat, 26 May 2018 21:24:27 -0700 Subject: [PATCH 19/21] Fixed composite command --- zcutil/build-win.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zcutil/build-win.sh b/zcutil/build-win.sh index 07a8ce89e..a3288e879 100755 --- a/zcutil/build-win.sh +++ b/zcutil/build-win.sh @@ -9,7 +9,8 @@ set -eu -o pipefail set -x cd "$(dirname "$(readlink -f "$0")")/.." -cd depends/ && make HOST=$HOST V=1 NO_QT=1 && cd ../ +cd depends/ && make HOST=$HOST V=1 NO_QT=1 +cd .. ./autogen.sh CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -DCURVE_ALT_BN128 -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared sed -i 's/-lboost_system-mt /-lboost_system-mt-s /' configure From af78ac8643d26a256b809d785dbe14afba3b454c Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 22:19:38 -0700 Subject: [PATCH 20/21] Fixed composite command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a3968bea..cd14a38bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,7 +47,7 @@ install: - if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi -- if [ $TARGET_PLATFORM = Win64 ]; then rustup target add $RUST_TARGET; fi +- if [ $TARGET_PLATFORM = win64 ]; then rustup target add $RUST_TARGET; fi before_script: - unset CC; unset CXX - mkdir -p depends/SDKs depends/sdk-sources From 7b339838ea9271fea373f36607c0a6f94bd58be1 Mon Sep 17 00:00:00 2001 From: Asher Dawes Date: Sat, 26 May 2018 22:24:59 -0700 Subject: [PATCH 21/21] Fixed composite command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd14a38bb..c45e82a94 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ install: - source /home/travis/google-cloud-sdk/path.bash.inc - sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list - travis_retry sudo apt-get -y update && sudo apt-get -y install -qq $PACKAGES -- if [ $TARGET_PLATFORM = Win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh +- if [ $TARGET_PLATFORM = win64 ]; then curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-toolchain stable -y && export PATH=$PATH:$HOME/.cargo/bin:$PATH; fi - if [ $TARGET_PLATFORM = win64 ]; then rustup target add $RUST_TARGET; fi