Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
335 commits
Select commit Hold shift + click to select a range
2b2e124
Make interface out of the NeuralNet functions.
denravonska Dec 22, 2018
45c9018
Merge pull request #7 from denravonska/nn-interface
jamescowens Dec 22, 2018
60709fd
Create new files for new NN interface plugin
jamescowens Dec 22, 2018
a2ac538
Add boost iostreams to depends build system
sedited Dec 22, 2018
2227ee2
Merge remote-tracking branch 'TheCharlatan/zlibIntegrated_Scraper' in…
jamescowens Dec 23, 2018
a5e7309
The beginning of the implementation of the new NN
jamescowens Dec 23, 2018
cb04f95
Make interface out of the NeuralNet functions.
denravonska Dec 22, 2018
ed47faf
Fix for neuralnet link errors.
denravonska Dec 23, 2018
26b1a6a
Merge pull request #8 from denravonska/fix-link-errors
jamescowens Dec 23, 2018
9f5cf0a
Implementation of the new NN calls part 2
jamescowens Dec 24, 2018
0a44bf1
Change block granularity for beacon consensus
jamescowens Dec 24, 2018
ede40b2
Change IsScraperAuthorized() to true
jamescowens Dec 24, 2018
6eca5ff
Change IsScraperAuthorized() to true
jamescowens Dec 24, 2018
53d19c4
Add global stats cache and ExplainMagnitude
jamescowens Dec 24, 2018
3c2af07
Merge branch 'integrated_scraper' of https://github.com/jamescowens/G…
jamescowens Dec 24, 2018
13cac0e
Refine locking and add locking logging.
jamescowens Dec 24, 2018
9fb5483
Condition lock loggin to when fDebug is true.
jamescowens Dec 25, 2018
d7d7861
Finish first version of ExplainMagnitude
jamescowens Dec 25, 2018
c91b184
Adjustments for proper NN operation
jamescowens Dec 25, 2018
894734e
Fix duplicate fclose under curl error
jamescowens Dec 25, 2018
e2bad37
Another attemot to fix rare segmentation fault.
jamescowens Dec 27, 2018
a3e6cae
Change SCRAPER_CMANIFEST_RETENTION_TIME to 48 hrs
jamescowens Dec 27, 2018
04312ef
Move old .NET calls into neuralnet_win.
denravonska Dec 26, 2018
d46af00
Ensure proper initialization order.
denravonska Dec 26, 2018
357f610
Move old neuralnet factory to bitcoingui.cpp.
denravonska Dec 26, 2018
ad1b8f0
Remove unused ToQstring.
denravonska Dec 27, 2018
2418a21
Remove unused/empty ResolveDiscrepancies.
denravonska Dec 27, 2018
e66ca62
Replace ExecuteDotNetStringFunction with concrete calls.
denravonska Dec 27, 2018
4690422
Merge pull request #9 from denravonska/isolate-old-nn
jamescowens Dec 27, 2018
443e521
Adjust logging for nBeforeSBSleep sleep.
jamescowens Dec 27, 2018
b4cdc49
Change scraper logger to use human readable datetime
jamescowens Dec 27, 2018
4da3f26
Merge remote-tracking branch 'origin/development' into integrated_scr…
jamescowens Dec 28, 2018
e794825
Change GetConsensusBeaconList()
jamescowens Dec 28, 2018
2aeef10
Remove VB based NeuralNet.
denravonska Dec 28, 2018
1a9b896
Remove NN::SetQuorumData.
denravonska Dec 28, 2018
d2b39ac
Remove NN factory registration.
denravonska Dec 28, 2018
390760b
Remove NN show functionality.
denravonska Dec 28, 2018
593e50e
Remove NN::ResolveDiscrepancies.
denravonska Dec 28, 2018
2aef61a
Remove NN::SetPrimaryCPID.
denravonska Dec 28, 2018
9b1081a
Small cleanup.
denravonska Dec 28, 2018
3e07523
Remove GetListOf/GetCountOf.
denravonska Dec 28, 2018
ddd49cf
Enable scraper RPC functions for non-win32 targets.
denravonska Dec 28, 2018
4e81c32
Remove some unnecessary forward declarations.
denravonska Dec 28, 2018
2fc0757
Remove unused functions, variables and forward declarations.
denravonska Dec 28, 2018
74ad5df
Remove nBoincUtilization.
denravonska Dec 28, 2018
dc999ae
Remove additional unused forward declarations.
denravonska Dec 28, 2018
de857f4
Disable certificate verification for WCG on Win32
jamescowens Dec 28, 2018
20d7248
Merge pull request #10 from denravonska/remove-old-nn
jamescowens Dec 28, 2018
185aa09
Change directory for scraper and remove standalone compile code
jamescowens Dec 28, 2018
84787b2
Removal of standalone compile part 2
jamescowens Dec 28, 2018
eeb0dca
Restore definitions removed by accident
jamescowens Dec 28, 2018
f813e4f
Change string for WCG URL certification verification exception
jamescowens Dec 28, 2018
7acc880
Replace enums with enum classes
jamescowens Dec 29, 2018
3a680fe
Change name of error enum to ERR to prevent windows.h conflict
jamescowens Dec 29, 2018
25fe71f
Implementation of convergence at project level
jamescowens Dec 30, 2018
d32128d
Add missed change to local variable for vwhitelist
jamescowens Dec 30, 2018
68c1d93
Merge remote-tracking branch 'origin/development' into integrated_scr…
jamescowens Dec 30, 2018
441d13f
Merge remote-tracking branch 'origin/development' into integrated_scr…
jamescowens Dec 31, 2018
1050fd0
Add excluded projects vector to StructConvergedManifest
jamescowens Jan 1, 2019
eeee543
Change CONVERGENCE_BY_PROJECT_RATIO to 0.75
jamescowens Jan 2, 2019
c299aec
Move CURL handling out of scraper.h.
denravonska Dec 30, 2018
06f6859
Remove dash character print.
denravonska Dec 30, 2018
d129bd0
Remove unnecessary "ACC" logging.
denravonska Dec 30, 2018
acdadfc
Move boost includes to the cpp.
denravonska Jan 1, 2019
51e7268
Remove nntester and reduce stringbuilder usage.
denravonska Jan 1, 2019
c6307dd
Remove unused stringbuilder functions.
denravonska Jan 2, 2019
2646a42
Remove the unused testdata function.
denravonska Jan 2, 2019
25a1637
Replace find with existing Contains function.
denravonska Jan 2, 2019
7998044
First pass at cleaning up code structure
jamescowens Jan 3, 2019
c37288a
Second pass at cleaning up code structure
jamescowens Jan 3, 2019
df57560
Change ScraperGetNeuralHash() to be a wrapper
jamescowens Jan 3, 2019
594a51b
Merge remote-tracking branch 'origin/development' into integrated_scr…
jamescowens Jan 5, 2019
983857b
Readd _log to http.cpp temporarily for troubleshooting
jamescowens Jan 6, 2019
16a383f
Minor comment changes.
jamescowens Jan 6, 2019
c1da42b
Change type of contract hash in ConvergedScraperStatsCache
jamescowens Jan 6, 2019
76eabf3
Add temporary log print of Quorum map...
jamescowens Jan 6, 2019
40c1fc1
Create ScraperHousekeeping function to reduce code duplication.
jamescowens Jan 6, 2019
60c1f2e
Refactor and add ProcessNetworkWideFromProjectStats
jamescowens Jan 7, 2019
fd72321
Add CPID_MAG_LIMIT to limit CPID magnitudes
jamescowens Jan 7, 2019
a0d1e7a
Quiet logging on manifest insertions unless debug is true
jamescowens Jan 7, 2019
e294213
Add neural contract hash logging to housekeeping for testing
jamescowens Jan 7, 2019
6e82172
Replace 0 magnitude CPID entries with 15,0; for compatibility
jamescowens Jan 8, 2019
0c2f096
A pass to beautify code formatting
jamescowens Jan 8, 2019
50157b7
Reverse 15,0 to 0,15 to agree with unpacker
jamescowens Jan 8, 2019
3962fd3
Refactor Scraper() a little to clean up
jamescowens Jan 10, 2019
74a58b2
Change superblocks rpc command
jamescowens Jan 12, 2019
9d69068
Condense appcache entry functions
jamescowens Jan 13, 2019
8f37d60
Appcache entry cleanup Part II
jamescowens Jan 13, 2019
a112eff
Add ALLOW_NONSCRAPER_NODE_STATS_DOWNLOAD
jamescowens Jan 13, 2019
95086c3
Fix comment on range of int in ApplyCache
jamescowens Jan 13, 2019
16c833f
Scraper Authorization - Part I
jamescowens Jan 14, 2019
a74f60a
Scraper Authorization - Part II
jamescowens Jan 14, 2019
ecae96e
Scraper Authorization - Part III
jamescowens Jan 16, 2019
2de5e62
Fix univalue JSON errors for modified superblocks rpc command
jamescowens Jan 18, 2019
e16a779
Initial pass at adding some UI signaling
jamescowens Jan 18, 2019
dc98b5f
Correct the failure to create the Scraper subdirectory
jamescowens Jan 18, 2019
d55a98a
Introduce enum MinedType and GenerateType function
iFoggz Aug 19, 2018
e3b1427
Change the transaction table model to show type based on what it is a…
iFoggz Aug 19, 2018
eeb37b7
Implement MinedType for selection of icons based on new implemnetation
iFoggz Aug 19, 2018
a3d0297
Remove bool IsPoR
iFoggz Aug 19, 2018
2d25d3a
clean up tabs to 4 spacecs where i've done changes
iFoggz Aug 19, 2018
c59c04f
clean up implementation
iFoggz Aug 19, 2018
0d659cf
Change to use icons used elsewhere till new ones can be created in su…
iFoggz Aug 19, 2018
8353478
Add comment to enum about UNKNOWN
iFoggz Aug 19, 2018
e7a51f4
change Listtransactions2 to use new implementation
iFoggz Aug 19, 2018
61e1dc3
Remove ISPOR2 function
iFoggz Aug 19, 2018
4d89f10
remove RemoteFlag section of Generated
iFoggz Aug 22, 2018
2eb66e8
fix compile issue
iFoggz Aug 22, 2018
c641a9a
update rule
iFoggz Sep 8, 2018
b10e1b7
Another big step
iFoggz Sep 10, 2018
80b9020
More changes including conforming of description of transaction
iFoggz Sep 10, 2018
d424d42
some clean up
iFoggz Sep 10, 2018
bf87a60
update icon section
iFoggz Sep 10, 2018
4656bae
remove last RemoteFlag
iFoggz Sep 10, 2018
a59df76
add missing >
iFoggz Sep 10, 2018
e6e8764
Merge remote-tracking branch 'jamescowens/removalof01230124' into int…
jamescowens Jan 19, 2019
3d0b509
Add icons for sidestakes
jamescowens Jan 20, 2019
67e5340
Correction of UTXO credit for coinstake
jamescowens Jan 21, 2019
ac0ba06
Change to new UI icons for staking.
jamescowens Jan 21, 2019
171d41b
Further fixes for coinstake return outputs.
jamescowens Jan 21, 2019
808a17e
Coalesce stake output (returns) to the same address
jamescowens Jan 21, 2019
78cb1cc
Introduce enum MinedType and GenerateType function
iFoggz Aug 19, 2018
54a93a9
Change the transaction table model to show type based on what it is a…
iFoggz Aug 19, 2018
ea839e0
Implement MinedType for selection of icons based on new implemnetation
iFoggz Aug 19, 2018
696837f
Remove bool IsPoR
iFoggz Aug 19, 2018
7899d5e
clean up tabs to 4 spacecs where i've done changes
iFoggz Aug 19, 2018
0ddf596
clean up implementation
iFoggz Aug 19, 2018
dcd78b3
Change to use icons used elsewhere till new ones can be created in su…
iFoggz Aug 19, 2018
7bed0c8
Add comment to enum about UNKNOWN
iFoggz Aug 19, 2018
d7a85c7
change Listtransactions2 to use new implementation
iFoggz Aug 19, 2018
6a93c75
Remove ISPOR2 function
iFoggz Aug 19, 2018
7f10b02
remove RemoteFlag section of Generated
iFoggz Aug 22, 2018
a579138
fix compile issue
iFoggz Aug 22, 2018
b5ca65b
update rule
iFoggz Sep 8, 2018
bfcf8fa
Another big step
iFoggz Sep 10, 2018
8efd474
More changes including conforming of description of transaction
iFoggz Sep 10, 2018
339dfb5
some clean up
iFoggz Sep 10, 2018
f5937e5
update icon section
iFoggz Sep 10, 2018
46e754e
remove last RemoteFlag
iFoggz Sep 10, 2018
c5ed849
add missing >
iFoggz Sep 10, 2018
acd6ce6
Add icons for sidestakes
jamescowens Jan 20, 2019
84ec4f1
Correction of UTXO credit for coinstake
jamescowens Jan 21, 2019
cb0e974
Change to new UI icons for staking.
jamescowens Jan 21, 2019
f3cef90
Further fixes for coinstake return outputs.
jamescowens Jan 21, 2019
0bbb342
Coalesce stake output (returns) to the same address
jamescowens Jan 21, 2019
7912f4e
Clean up logging in scraper_net.cpp.
jamescowens Jan 22, 2019
4f033e8
Adjust includes to try and fix compile error on Ubuntu 16.04
jamescowens Jan 22, 2019
5d3ea41
Clean up logging in scraper_net.cpp.
jamescowens Jan 22, 2019
5aa0c44
Adjust includes to try and fix compile error on Ubuntu 16.04
jamescowens Jan 22, 2019
d5c6649
Make -usenewnn the default
jamescowens Jan 24, 2019
95e2f71
Make -usenewnn the default
jamescowens Jan 24, 2019
0c8012c
Add team filtering functionality
jamescowens Jan 27, 2019
4845c3b
Add team filtering functionality
jamescowens Jan 27, 2019
5acf5a5
UI signaling round II
jamescowens Jan 29, 2019
e807f4e
Correct deleted count in ScraperDeleteUnauthorizedCScraperManifests()
jamescowens Jan 30, 2019
8992b14
UI signaling round II
jamescowens Jan 29, 2019
d100427
Correct deleted count in ScraperDeleteUnauthorizedCScraperManifests()
jamescowens Jan 30, 2019
1e28b3f
Implementation of log scroll window for scraper.
jamescowens Feb 2, 2019
bd5b744
Implementation of log scroll window for scraper.
jamescowens Feb 2, 2019
93c7f81
Update .travis.yml file
jamescowens Feb 2, 2019
a6e5723
Remove neuralnet_win.h from Makefile.am
jamescowens Feb 2, 2019
2ac2c14
Change from Trusty to Xenial for Travis
jamescowens Feb 2, 2019
00e0694
Fix overloading problem scraper.cpp template for GCC5
jamescowens Feb 2, 2019
7cf9e0b
Fix qt include file to fix bitcoin resource build error
jamescowens Feb 2, 2019
d9c5ce4
Revert height of rpcconsole dialog
jamescowens Feb 3, 2019
1b38b7d
Fix qt include file to fix bitcoin resource build error
jamescowens Feb 2, 2019
aaa285b
Implement locking around CScraperManifest::mapManifest
jamescowens Feb 3, 2019
bce20fd
Add sync check to CScraperManifest:SendManifestTo
jamescowens Feb 3, 2019
9ac1c25
Update .travis.yml file
jamescowens Feb 2, 2019
98c5920
Remove neuralnet_win.h from Makefile.am
jamescowens Feb 2, 2019
c912f08
Change from Trusty to Xenial for Travis
jamescowens Feb 2, 2019
a633c25
Fix overloading problem scraper.cpp template for GCC5
jamescowens Feb 2, 2019
d471803
Revert height of rpcconsole dialog
jamescowens Feb 3, 2019
36dfa33
Implement locking around CScraperManifest::mapManifest
jamescowens Feb 3, 2019
c9b399e
Add sync check to CScraperManifest:SendManifestTo
jamescowens Feb 3, 2019
35fd5b9
Change to ccache 3.4.3 for depends
jamescowens Feb 3, 2019
548a591
Change zlib from qt_package to package in depends
jamescowens Feb 3, 2019
9f64605
Change to Bionic for Travis
jamescowens Feb 3, 2019
a0a3137
Select posix threading for Win32 cross-compile
jamescowens Feb 3, 2019
127bc68
Add missing call to ScraperDeleteUnauthorizedCScraperManifests
jamescowens Feb 4, 2019
65ec7ef
Ensure proper handling of scraper deauthorizations
jamescowens Feb 4, 2019
896119f
Change to ccache 3.4.3 for depends
jamescowens Feb 3, 2019
c6a8c4c
Change to Bionic for Travis
jamescowens Feb 3, 2019
856a157
Select posix threading for Win32 cross-compile
jamescowens Feb 3, 2019
e03c5e0
Add missing call to ScraperDeleteUnauthorizedCScraperManifests
jamescowens Feb 4, 2019
46557b2
Ensure proper handling of scraper deauthorizations
jamescowens Feb 4, 2019
813bb52
Move authorization check and locking to correct seg fault
jamescowens Feb 4, 2019
2437d57
Move authorization check and locking to correct seg fault
jamescowens Feb 4, 2019
8e49a55
Change file close code in ProcessProjectTeamFile
jamescowens Feb 5, 2019
dba47fc
Use reference instead of straight assignment
jamescowens Feb 5, 2019
043dac2
Adjust formatting for scraper tab in rpcconsole.ui
jamescowens Feb 6, 2019
68b1628
fix seg fault part II - check for existence in mapManifest
jamescowens Feb 6, 2019
309e08d
Change locking in a few areas to address suspected deadlock
jamescowens Feb 7, 2019
644544a
Modify addManifest to do its own map insert
jamescowens Feb 9, 2019
288fa50
Store manifest name and time in local variables
jamescowens Feb 9, 2019
b74c76a
Changed convergence function to fall back to project
jamescowens Feb 9, 2019
5f4bf86
Implement deauthorized scraper grace period
jamescowens Feb 10, 2019
3dfe302
Reduce locking frequency for CScraperManifest::cs_mapManifest
jamescowens Feb 10, 2019
8e09d0d
Change file close code in ProcessProjectTeamFile
jamescowens Feb 5, 2019
8d01312
Use reference instead of straight assignment
jamescowens Feb 5, 2019
1afabfe
Adjust formatting for scraper tab in rpcconsole.ui
jamescowens Feb 6, 2019
0c20541
fix seg fault part II - check for existence in mapManifest
jamescowens Feb 6, 2019
72d16d9
Change locking in a few areas to address suspected deadlock
jamescowens Feb 7, 2019
81113d7
Modify addManifest to do its own map insert
jamescowens Feb 9, 2019
db36c7f
Store manifest name and time in local variables
jamescowens Feb 9, 2019
872f5b0
Changed convergence function to fall back to project
jamescowens Feb 9, 2019
66d92c1
Implement deauthorized scraper grace period
jamescowens Feb 10, 2019
265e9b7
Reduce locking frequency for CScraperManifest::cs_mapManifest
jamescowens Feb 10, 2019
2926e52
Change implementation of nSyncTime to std::atomic<int64_t>
jamescowens Feb 10, 2019
fef08f1
Remove unnneeded CCriticalSection for nSyncTime
jamescowens Feb 10, 2019
989495c
Implement first version of scraper tooltip
jamescowens Feb 11, 2019
6e5670f
Correct tooltip verbiage for sleep state.
jamescowens Feb 11, 2019
6264f22
Change implementation of nSyncTime to std::atomic<int64_t>
jamescowens Feb 10, 2019
4041dc7
Remove unnneeded CCriticalSection for nSyncTime
jamescowens Feb 10, 2019
d5f6b70
Implement first version of scraper tooltip
jamescowens Feb 11, 2019
42e1ec7
Correct tooltip verbiage for sleep state.
jamescowens Feb 11, 2019
0dc95a4
Add missed file delete in error path
jamescowens Feb 11, 2019
4c17f50
Change locking around whitelist update
jamescowens Feb 11, 2019
650f6bb
Constrain critical section in main.cpp for CScraperManifest::AlreadyHave
jamescowens Feb 12, 2019
b865d40
Remove OutOfSyncByAge() check in ScraperGetNeuralContract
jamescowens Feb 12, 2019
3766776
Optimize locking in IsScraperAuthorizedToBroadcastManifests
jamescowens Feb 12, 2019
7ec8a48
Correct bug in scraper tooltip.
jamescowens Feb 13, 2019
64e5e34
Adjust GetmScraperFileManifestHash
jamescowens Feb 13, 2019
de8d1a5
Add overloaded CScraperManifest::DeleteManifest
jamescowens Feb 16, 2019
8a29666
Add missing icon file to qt include
jamescowens Feb 16, 2019
1804c5e
Change GenerateType to getGeneratedType for a better
jamescowens Feb 16, 2019
1677ff5
Merge branch 'development' into integrated_scraper_removalof01230124
jamescowens Feb 18, 2019
60be7d5
Development merge fixup for nBoincUtilization
jamescowens Feb 18, 2019
3622421
Change GenerateType to GetGeneratedType for a better
jamescowens Feb 16, 2019
531a6d5
Revert "Change GenerateType to getGeneratedType for a better"
jamescowens Feb 18, 2019
6ff052a
Change GenerateType to GetGeneratedType for a better
jamescowens Feb 16, 2019
39dc72e
Add more detail for duplicate CScraperManifest receive
jamescowens Feb 18, 2019
8877c03
Be explicit about build dependency on pkg-config
smoe Feb 18, 2019
6815629
Change LOCK/ENDLOCK debug messages to debug3
jamescowens Feb 18, 2019
c8b777b
Add missing ui Signal states for contract formation
jamescowens Feb 18, 2019
a4fbcec
Add back magnitude to about dialog
jamescowens Feb 18, 2019
7976fe3
Merge pull request #1403 from smoe/patch-1
denravonska Feb 19, 2019
9f77efc
Merge pull request #1390 from jamescowens/staging_removal_of_01234
denravonska Feb 19, 2019
b2dce80
Merge branch 'staging' into integrated_scraper
jamescowens Feb 19, 2019
2d87ad4
Merge branch 'integrated_scraper_removalof01230124' into integrated_s…
jamescowens Feb 19, 2019
ed8b51f
Resolve missed merge conflict marker
jamescowens Feb 19, 2019
b06101c
scraper.log archiving
jamescowens Feb 21, 2019
bed3166
Correct pathScraper assignment and workaround for timing
jamescowens Feb 23, 2019
b951fd4
A little cleanup
jamescowens Feb 23, 2019
e2c89a5
Added an -scraperlogarchivedaily argument to control
jamescowens Feb 24, 2019
d292c80
Remove unnecessary reference to ntdll in configure.ac
jamescowens Feb 24, 2019
f6bd749
Merge branch 'integrated_scraper' of https://github.com/jamescowens/G…
jamescowens Feb 24, 2019
507e770
Configure Windows builds to use native SSL stack, not OpenSSL
cyrossignol Feb 24, 2019
db2ae60
Remove scraper workaround for peer verification during retrieval of WCG
cyrossignol Feb 24, 2019
f05c083
Merge pull request #23 from cyrossignol/integrated_scraper
jamescowens Feb 25, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .travis.yml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sudo: required
dist: trusty
dist: bionic
os: linux
language: minimal
cache:
Expand All @@ -22,25 +22,30 @@ env:
- WINEDEBUG=fixme-all
matrix:
# ARM
- HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" GRIDCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports RUN_TESTS=false"
- HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf zlib1g-dev" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" GRIDCOIN_CONFIG="--enable-glibc-back-compat --disable-tests RUN_TESTS=false"
# Win32
- HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6" RUN_TESTS=false GOAL="" GRIDCOIN_CONFIG="--enable-reduce-exports"
# Qt5 & system libs
- HOST=x86_64-unknown-linux-gnu PACKAGES="libqt5gui5 libqt5core5a qtbase5-dev libqt5dbus5 qttools5-dev qttools5-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.1++-dev libminiupnpc-dev protobuf-compiler libqrencode-dev xvfb" NO_DEPENDS=1 NEED_XVFB=1 RUN_TESTS=true GOAL="install" GRIDCOIN_CONFIG=" --with-incompatible-bdb --enable-reduce-exports --with-gui=qt5"
- HOST=x86_64-unknown-linux-gnu PACKAGES="libqt5gui5 libqt5core5a qtbase5-dev libqt5dbus5 qttools5-dev qttools5-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-iostreams-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev protobuf-compiler libqrencode-dev xvfb zlib1g-dev" NO_DEPENDS=1 NEED_XVFB=1 RUN_TESTS=true GOAL="install" GRIDCOIN_CONFIG=" --with-incompatible-bdb --enable-reduce-exports --with-gui=qt5"
# 32-bit + dash
- HOST=i686-pc-linux-gnu PACKAGES="g++-multilib" DEP_OPTS="NO_QT=1" RUN_TESTS=false GOAL="install" GRIDCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
# Win64
- HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6 xvfb" DEP_OPTS="NO_QT=1" RUN_TESTS=false GOAL="" GRIDCOIN_CONFIG="--enable-reduce-exports" NEED_XVFB=1
- HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" PACKAGES="gcc-7 python3 nsis g++-mingw-w64-x86-64 wine1.6 xvfb" DEP_OPTS="NO_QT=1" RUN_TESTS=false GOAL="" GRIDCOIN_CONFIG="--enable-reduce-exports" NEED_XVFB=1
# Cross-Mac - disabled for now, since we cannot compile QtSVG with the SDK
#- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" GRIDCOIN_CONFIG="--enable-gui --enable-reduce-exports" OSX_SDK=10.11 RUN_TESTS=false GOAL="deploy"

before_install:
- export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -q
- sudo apt-get install gcc-7 -y
install:
- if [ -n "$DPKG_ADD_ARCH" ]; then sudo dpkg --add-architecture "$DPKG_ADD_ARCH" ; fi
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi
before_script:
- if [ "$HOST" == "i686-w64-mingw32" ]; then sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix; fi
- if [ "$HOST" == "x86_64-w64-mingw32" ]; then sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix; fi
- unset CC; unset CXX
- mkdir -p depends/SDKs depends/sdk-sources
- if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ These dependencies are required:

Library | Purpose | Description
------------|------------------|----------------------------------------------------------------
pkg-config | Build | Learn library inter-dependencies
libssl | Crypto | Random Number Generation, Elliptic Curve Cryptography
libboost | Utility | Library for threading, data structures, etc
libevent | Networking | OS independent asynchronous networking
Expand Down
116 changes: 116 additions & 0 deletions build-aux/m4/ax_boost_iostreams.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# ===========================================================================
# https://www.gnu.org/software/autoconf-archive/ax_boost_iostreams.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_BOOST_IOSTREAMS
#
# DESCRIPTION
#
# Test for IOStreams library from the Boost C++ libraries. The macro
# requires a preceding call to AX_BOOST_BASE. Further documentation is
# available at <http://randspringer.de/boost/index.html>.
#
# This macro calls:
#
# AC_SUBST(BOOST_IOSTREAMS_LIB)
#
# And sets:
#
# HAVE_BOOST_IOSTREAMS
#
# LICENSE
#
# Copyright (c) 2008 Thomas Porschberg <[email protected]>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 21

AC_DEFUN([AX_BOOST_IOSTREAMS],
[
AC_ARG_WITH([boost-iostreams],
AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@],
[use the IOStreams library from boost - it is possible to specify a certain library for the linker
e.g. --with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 ]),
[
if test "$withval" = "no"; then
want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_iostreams_lib=""
else
want_boost="yes"
ax_boost_user_iostreams_lib="$withval"
fi
],
[want_boost="yes"]
)

if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS

LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS

AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
ax_cv_boost_iostreams,
[AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/iostreams/filtering_stream.hpp>
@%:@include <boost/range/iterator_range.hpp>
]],
[[std::string input = "Hello World!";
namespace io = boost::iostreams;
io::filtering_istream in(boost::make_iterator_range(input));
return 0;
]])],
ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
AC_LANG_POP([C++])
])
if test "x$ax_cv_boost_iostreams" = "xyes"; then
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_iostreams_lib" = "x"; then
for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* $BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_iostreams.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
[link_iostreams="no"])
done
if test "x$link_iostreams" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.dll* $BOOSTLIBDIR/boost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e 's;^\(boost_iostreams.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
[link_iostreams="no"])
done
fi

else
for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
[link_iostreams="no"])
done

fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the library!)
fi
if test "x$link_iostreams" != "xyes"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
fi
fi

CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
90 changes: 90 additions & 0 deletions build-aux/m4/ax_boost_zlib.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
# SYNOPSIS
#
# AX_BOOST_ZLIB
#
# DESCRIPTION
#
# Test for ZLib library from the Boost C++ libraries. The macro
# requires a preceding call to AX_BOOST_BASE. Further documentation is
# available at <http://randspringer.de/boost/index.html>.
#
# This macro calls:
#
# AC_SUBST(BOOST_ZLIB_LIB)
#
# And sets:
#
# HAVE_BOOST_ZLIB
#
# LICENSE
#
# Copyright (c) 2008 Thomas Porschberg <[email protected]>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 21

AC_DEFUN([AX_BOOST_ZLIB],
[
AC_ARG_WITH([boost-zlib],
AS_HELP_STRING([--with-boost-zlib@<:@=special-lib@:>@],
[use the ZLib library from boost - it is possible to specify a certain library for the linker
e.g. --with-boost-zlib=boost_zlib-gcc-mt-d-1_33_1 ]),
[
if test "$withval" = "no"; then
want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_zlib_lib=""
else
want_boost="yes"
ax_boost_user_zlib_lib="$withval"
fi
],
[want_boost="yes"]
)

if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS

LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS

AC_DEFINE(HAVE_BOOST_ZLIB,,[define if the Boost::zlib library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_zlib_lib" = "x"; then
for libextension in `ls $BOOSTLIBDIR/libboost_zlib*.so* $BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_zlib*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_zlib.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_zlib.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_ZLIB_LIB="-l$ax_lib"; AC_SUBST(BOOST_ZLIB_LIB) link_zlib="yes"; break],
[link_zlib="no"])
done
if test "x$link_zlib" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_zlib*.dll* $BOOSTLIBDIR/boost_zlib*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_zlib.*\)\.dll.*$;\1;' -e 's;^\(boost_zlib.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_ZLIB_LIB="-l$ax_lib"; AC_SUBST(BOOST_ZLIB_LIB) link_zlib="yes"; break],
[link_zlib="no"])
done
fi

else
for ax_lib in $ax_boost_user_zlib_lib boost_zlib-$ax_boost_user_zlib_lib; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_ZLIB_LIB="-l$ax_lib"; AC_SUBST(BOOST_ZLIB_LIB) link_zlib="yes"; break],
[link_zlib="no"])
done

fi

CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
116 changes: 116 additions & 0 deletions build-aux/m4/m4_ax_boost_iostreams.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# ===========================================================================
# https://www.gnu.org/software/autoconf-archive/ax_boost_iostreams.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_BOOST_IOSTREAMS
#
# DESCRIPTION
#
# Test for IOStreams library from the Boost C++ libraries. The macro
# requires a preceding call to AX_BOOST_BASE. Further documentation is
# available at <http://randspringer.de/boost/index.html>.
#
# This macro calls:
#
# AC_SUBST(BOOST_IOSTREAMS_LIB)
#
# And sets:
#
# HAVE_BOOST_IOSTREAMS
#
# LICENSE
#
# Copyright (c) 2008 Thomas Porschberg <[email protected]>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.

#serial 21

AC_DEFUN([AX_BOOST_IOSTREAMS],
[
AC_ARG_WITH([boost-iostreams],
AS_HELP_STRING([--with-boost-iostreams@<:@=special-lib@:>@],
[use the IOStreams library from boost - it is possible to specify a certain library for the linker
e.g. --with-boost-iostreams=boost_iostreams-gcc-mt-d-1_33_1 ]),
[
if test "$withval" = "no"; then
want_boost="no"
elif test "$withval" = "yes"; then
want_boost="yes"
ax_boost_user_iostreams_lib=""
else
want_boost="yes"
ax_boost_user_iostreams_lib="$withval"
fi
],
[want_boost="yes"]
)

if test "x$want_boost" = "xyes"; then
AC_REQUIRE([AC_PROG_CC])
CPPFLAGS_SAVED="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
export CPPFLAGS

LDFLAGS_SAVED="$LDFLAGS"
LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
export LDFLAGS

AC_CACHE_CHECK(whether the Boost::IOStreams library is available,
ax_cv_boost_iostreams,
[AC_LANG_PUSH([C++])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/iostreams/filtering_stream.hpp>
@%:@include <boost/range/iterator_range.hpp>
]],
[[std::string input = "Hello World!";
namespace io = boost::iostreams;
io::filtering_istream in(boost::make_iterator_range(input));
return 0;
]])],
ax_cv_boost_iostreams=yes, ax_cv_boost_iostreams=no)
AC_LANG_POP([C++])
])
if test "x$ax_cv_boost_iostreams" = "xyes"; then
AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams library is available])
BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
if test "x$ax_boost_user_iostreams_lib" = "x"; then
for libextension in `ls $BOOSTLIBDIR/libboost_iostreams*.so* $BOOSTLIBDIR/libboost_iostream*.dylib* $BOOSTLIBDIR/libboost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_iostreams.*\)\.so.*$;\1;' -e 's;^lib\(boost_iostream.*\)\.dylib.*$;\1;' -e 's;^lib\(boost_iostreams.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
[link_iostreams="no"])
done
if test "x$link_iostreams" != "xyes"; then
for libextension in `ls $BOOSTLIBDIR/boost_iostreams*.dll* $BOOSTLIBDIR/boost_iostreams*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_iostreams.*\)\.dll.*$;\1;' -e 's;^\(boost_iostreams.*\)\.a.*$;\1;'` ; do
ax_lib=${libextension}
AC_CHECK_LIB($ax_lib, exit,
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
[link_iostreams="no"])
done
fi

else
for ax_lib in $ax_boost_user_iostreams_lib boost_iostreams-$ax_boost_user_iostreams_lib; do
AC_CHECK_LIB($ax_lib, main,
[BOOST_IOSTREAMS_LIB="-l$ax_lib"; AC_SUBST(BOOST_IOSTREAMS_LIB) link_iostreams="yes"; break],
[link_iostreams="no"])
done

fi
if test "x$ax_lib" = "x"; then
AC_MSG_ERROR(Could not find a version of the library!)
fi
if test "x$link_iostreams" != "xyes"; then
AC_MSG_ERROR(Could not link against $ax_lib !)
fi
fi

CPPFLAGS="$CPPFLAGS_SAVED"
LDFLAGS="$LDFLAGS_SAVED"
fi
])
Loading