Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add headers to install targets #629

Open
wants to merge 2,369 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2369 commits
Select commit Hold shift + click to select a range
d2d8b29
Preprocess blocks + transactions in parallel, working version
pmconrad Sep 27, 2018
9946bde
Get rid of possibly uninitialized local variable
pmconrad Oct 5, 2018
cb2244f
Changed push_transaction to accept precomputable_transaction instead …
pmconrad Oct 8, 2018
883ec6a
Avoid one level of indirection on precompute block
pmconrad Oct 11, 2018
d032890
Make pubkey comparator generally available
pmconrad Oct 11, 2018
2c01109
Address some review comments
pmconrad Nov 7, 2018
c4b584c
direct_index: Added clarifying comment, ensure that object ID is not …
pmconrad Dec 9, 2018
9117c85
Added unit test for direct_index
pmconrad Dec 9, 2018
956f1c9
bump database
oxarbitrage Dec 14, 2018
1fc6dc1
Merge pull request #1410 from HarukaMa/patch-1
pmconrad Dec 14, 2018
1471c05
Merge pull request #1360 from bitshares/performance_opt
pmconrad Dec 14, 2018
115ed51
clarify proxy vote test times
oxarbitrage Dec 14, 2018
4a3f45b
Fixed code smell
pmconrad Dec 14, 2018
0171861
Merge branch 'develop' into issue1393
oxarbitrage Dec 15, 2018
dd6c7fc
Properly initialize inner vectors, support nested modifications
pmconrad Dec 15, 2018
69c4011
Removed obsolete hardfork code to avoid problems with next commit
pmconrad Dec 15, 2018
2409104
Added direct_index-like replacement for by_account_asset subindex
pmconrad Dec 15, 2018
ae1cbfa
Merge pull request #1449 from oxarbitrage/issue1393
oxarbitrage Dec 16, 2018
a8020a7
reverse delayed node and only add auto to needed plugins
oxarbitrage Dec 17, 2018
1326a5c
make plugins option work in delayed
oxarbitrage Dec 17, 2018
fe4c4e9
add link to hackthedex.io to README
oxarbitrage Dec 17, 2018
1e8ccab
change adaptor response to be mutable_variant_object
oxarbitrage Dec 18, 2018
9dbc880
Merge pull request #1470 from bitshares/oxarbitrage-patch-3
oxarbitrage Dec 18, 2018
e5978ca
Merge pull request #1474 from bitshares/release
oxarbitrage Dec 18, 2018
5c7fd22
Merge pull request #1429 from oxarbitrage/es_objects_templates
oxarbitrage Dec 19, 2018
d3ba372
Merge pull request #1462 from bitshares/direct_index
pmconrad Dec 19, 2018
cb5250f
Merge pull request #1 from bitshares/develop
manikey123 Dec 20, 2018
f4dcd9b
Fix for node crash #1479
pmconrad Dec 20, 2018
d3cab53
Fixed hf date
pmconrad Dec 20, 2018
80e9664
Revert fix attempt
pmconrad Dec 20, 2018
9c7f693
Different approach - detect nested proposal_update with invalid id an…
pmconrad Dec 20, 2018
062613c
Catch nested delete as well
pmconrad Dec 21, 2018
46daa67
Bump db version
pmconrad Dec 21, 2018
36cb35c
Switched impossible authority to null account
pmconrad Dec 21, 2018
5cb908e
Bumped hf date by 24 hours
pmconrad Dec 21, 2018
b0ada12
Log as warning not info
pmconrad Dec 21, 2018
35bc344
Added self-deletion test case
pmconrad Dec 21, 2018
3c76228
Merge pull request #1458 from oxarbitrage/issue1455
oxarbitrage Dec 21, 2018
3eb2cfa
Merge pull request #1480 from bitshares/issue_1479
pmconrad Dec 21, 2018
bc85e17
Resolve conflicts release/develop
pmconrad Dec 21, 2018
205dc88
Merge pull request #1486 from pmconrad/resolve_conflicts
pmconrad Dec 21, 2018
53d3538
create test
jmjatlanta Dec 25, 2018
20a2f62
catching exception if history_object no longer in memory
jmjatlanta Dec 25, 2018
3503768
limit subscribed accounts to 100
jmjatlanta Dec 27, 2018
08e4ea9
Add ilog message when plugin starts
jmjatlanta Dec 28, 2018
bbd6773
Reduce warning messages, constructor still throws
jmjatlanta Dec 28, 2018
f52636d
Squelch memaccess and parentheses warnings
jmjatlanta Dec 28, 2018
d4231ad
fixed comparison warnings
jmjatlanta Dec 28, 2018
bea4a5d
revert accidental change
jmjatlanta Dec 28, 2018
3284797
Fixed linker error
pmconrad Dec 30, 2018
8bce57a
Merge pull request #1502 from bitshares/jmj_1459
jmjatlanta Dec 31, 2018
71821e3
Merge pull request #1505 from pmconrad/linker_fix
pmconrad Dec 31, 2018
ebc8603
use find instead of try/catch
jmjatlanta Dec 31, 2018
143ee6f
Merge pull request #1494 from bitshares/jmj_1490
jmjatlanta Dec 31, 2018
c6474f9
Do not subscribe to associated accounts
jmjatlanta Jan 1, 2019
667e44a
Revert adding compile switches -Wno-???
jmjatlanta Jan 1, 2019
1588275
Reduce warning messages, constructor still throws
jmjatlanta Dec 28, 2018
c97988b
Squelch memaccess and parentheses warnings
jmjatlanta Dec 28, 2018
52b0fe3
fixed comparison warnings
jmjatlanta Dec 28, 2018
33d6d99
revert accidental change
jmjatlanta Dec 28, 2018
d3c2b57
Revert adding compile switches -Wno-???
jmjatlanta Jan 1, 2019
004708d
fix merge conflict
jmjatlanta Jan 1, 2019
a978805
prevent throw in destructor
jmjatlanta Jan 2, 2019
a4afb7c
Merge pull request #2 from bitshares/develop
manikey123 Jan 4, 2019
a22e850
added test case for 782 part1
manikey123 Jan 4, 2019
14f71f2
removed boost signals (no longer used)
jmjatlanta Jan 4, 2019
4907f56
Merge pull request #1514 from bitshares/jmj_1512
jmjatlanta Jan 6, 2019
e338fdb
refactor template instantiation
jmjatlanta Jan 7, 2019
aa8d430
handle_message overrides node::handle_message
jmjatlanta Jan 7, 2019
f5237f9
class forward declared as struct
jmjatlanta Jan 7, 2019
3019bfc
no virtual destructor in class with virt methods
jmjatlanta Jan 7, 2019
07bedf7
switch variable from size_t to uint64_t
jmjatlanta Jan 7, 2019
53feeff
Reject get_key_references with > 100 keys
jmjatlanta Jan 7, 2019
87dcfa1
Remove use of skip_fork_db flag
jmjatlanta Jan 7, 2019
7fa01fb
change seq. counter 'next' used by db indexes to uint64_t
jmjatlanta Jan 7, 2019
fc2ab66
Merge pull request #1499 from bitshares/jmj_1472
jmjatlanta Jan 7, 2019
b4195aa
Update history_api_tests.cpp
manikey123 Jan 8, 2019
7a88dff
add virtual destructors to classes derived from transaction
jmjatlanta Jan 8, 2019
961c4f9
template specialization for fee_schedule
jmjatlanta Jan 8, 2019
86568a5
Revert "template specialization for fee_schedule"
jmjatlanta Jan 8, 2019
329cb41
Merge branch 'jmj_1504' of ssh://github.com/bitshares/bitshares-core …
jmjatlanta Jan 8, 2019
0e6b07e
added template specialization for mac release builds
jmjatlanta Jan 8, 2019
b4bd649
Make sure price_to_string works and throws as it should
jmjatlanta Jan 8, 2019
1829a9a
updated based on review comment received
manikey123 Jan 9, 2019
d66f15b
updated based on review comment received1
manikey123 Jan 9, 2019
ab7b44a
Update history_api_tests.cpp
manikey123 Jan 9, 2019
c3db2db
Update application.cpp
manikey123 Jan 9, 2019
43a743b
updating uint64_t
manikey123 Jan 9, 2019
834e476
Separate throws from edge cases that should work
jmjatlanta Jan 11, 2019
9a9a8f8
782 pt 1 and 2
manikey123 Jan 13, 2019
3aecf1f
782 pt 1 and 2 edit
manikey123 Jan 13, 2019
aae2b4c
Merge pull request #1518 from bitshares/jmj_1186
jmjatlanta Jan 14, 2019
e9f0312
Fix comment typo
jmjatlanta Jan 14, 2019
60e8a8d
shut down without calling exit
jmjatlanta Jan 14, 2019
7c3968b
prevent segfault when destructing application obj
jmjatlanta Jan 14, 2019
0229957
Added human-readable message to assert
jmjatlanta Jan 14, 2019
28875e1
fixed long lines
jmjatlanta Jan 14, 2019
596d7e9
Merge pull request #1531 from bitshares/jmj_1018
jmjatlanta Jan 14, 2019
a724f9d
Merge pull request #3 from bitshares/develop
manikey123 Jan 15, 2019
3066629
782 chnages based on review comments
manikey123 Jan 15, 2019
9d6b06f
782 changes based on travis build and review comments
manikey123 Jan 15, 2019
884a6b4
782 changes based on travis build and review comments
manikey123 Jan 15, 2019
f6f6cde
Update group_order_api_tests.cpp
manikey123 Jan 15, 2019
f85b46d
Update api.hpp
manikey123 Jan 15, 2019
8d59ea3
782 changes based on get_key_references
manikey123 Jan 15, 2019
f928f90
Update application.hpp
manikey123 Jan 15, 2019
3b0891a
keep return value
jmjatlanta Jan 15, 2019
7462d39
Fix typo
jmjatlanta Jan 15, 2019
d2bf27e
Merge pull request #1527 from bitshares/jmj_1313
jmjatlanta Jan 15, 2019
097a8e6
changes for 782 to correct spacing issue
manikey123 Jan 15, 2019
782bbba
Merge branch '782_test_p1' of https://github.com/manikey123/bitshares…
manikey123 Jan 15, 2019
ba3a895
Update database_api_tests.cpp
manikey123 Jan 15, 2019
a590c25
remove useless check
oxarbitrage Jan 16, 2019
caf7f7f
add default value to trusted-node
oxarbitrage Jan 16, 2019
bac55a4
Merge branch 'develop' into pull1427_2
oxarbitrage Jan 16, 2019
6e11c31
Remove gui_version file which is no longer used
abitmore Jan 16, 2019
241e605
Remove old testnet files
abitmore Jan 16, 2019
8e41bdd
Merge pull request #1533 from bitshares/cleanup
pmconrad Jan 17, 2019
e198552
remove default option in delayed plugin
oxarbitrage Jan 17, 2019
540a536
add readme to libraries and programs
oxarbitrage Jan 18, 2019
46e248e
Remove create-genesis-json
jmjatlanta Jan 18, 2019
e49c049
Removed comment
jmjatlanta Jan 18, 2019
9fc8983
Removed comment
jmjatlanta Jan 18, 2019
bbcbed0
Merge pull request #1437 from oxarbitrage/pull1427_2
oxarbitrage Jan 20, 2019
f2acea8
add utilities, net libraries, change app description
oxarbitrage Jan 21, 2019
1bad92a
resolve conflict
jmjatlanta Jan 21, 2019
4f079fa
remove category column
oxarbitrage Jan 22, 2019
f3da528
change some descriptions in libraries
oxarbitrage Jan 22, 2019
8624fad
change some descriptions in programs
oxarbitrage Jan 22, 2019
a4588a6
add subprograms
oxarbitrage Jan 22, 2019
6669fb9
Merge pull request #1529 from bitshares/jmj_1110
jmjatlanta Jan 22, 2019
41bff6e
add egenesis library description
oxarbitrage Jan 24, 2019
10f5282
Fix CMake Doxygen Perl reference
jmjatlanta Jan 24, 2019
f2a0b4d
Merge pull request #1511 from bitshares/jmj_1246b
jmjatlanta Jan 24, 2019
accc381
catch exception in destructor
jmjatlanta Jan 24, 2019
a26dc47
fix warnings in test
jmjatlanta Jan 24, 2019
fa0e647
Merge pull request #1510 from bitshares/jmj_1246
jmjatlanta Jan 25, 2019
cf2682f
add es-objects-start-es-after-block option
oxarbitrage Jan 25, 2019
063221c
Merge pull request #1539 from bitshares/jmj_1418
oxarbitrage Jan 25, 2019
bc48dae
change cat-parts from old to active
oxarbitrage Jan 25, 2019
0dff411
Merge pull request #1534 from oxarbitrage/issue1532
oxarbitrage Jan 25, 2019
95b4aa6
Rename API param operation_id to operation_type
abitmore Jan 26, 2019
893607f
Merge pull request #1544 from bitshares/op-type
oxarbitrage Jan 27, 2019
aa469bc
remove special case 0 for start after block in both ES plugins
oxarbitrage Jan 27, 2019
db640be
Merge branch 'develop' into issue1051
oxarbitrage Jan 29, 2019
8aa3ebd
Try to make docker build work again
pmconrad Jan 29, 2019
16206f9
Remove unused boost::serialization dependency
pmconrad Jan 29, 2019
b579a54
Implement API changes
jmjatlanta Jan 29, 2019
4c0062c
Try to avoid travis timeouts better
pmconrad Jan 29, 2019
f7212d7
Try to resolve "Bad substitution" error
pmconrad Jan 30, 2019
a4211b6
Removed unused boost-locale dependency
pmconrad Jan 30, 2019
f5cd910
Only install required boost packages, not all - should remove locale …
pmconrad Jan 30, 2019
da0dba2
Build more stuff, run tests in parallel
pmconrad Jan 30, 2019
d589b5b
Minor Dockerfile improvements
pmconrad Jan 30, 2019
fb61b93
travis: switch to xenial build env
pmconrad Jan 30, 2019
ee18179
Merge pull request #1541 from oxarbitrage/es_objects_start_after_block
oxarbitrage Jan 30, 2019
dbd7eee
Modified build time expectations
pmconrad Jan 30, 2019
62db8bf
Bumped fc + removed unused boost libs from travis + docker
pmconrad Jan 30, 2019
708f017
Install libtool in docker build
pmconrad Jan 30, 2019
e1eb934
travis: adjust expected sonar time
pmconrad Jan 30, 2019
5503152
Merge pull request #1547 from bitshares/build_simplification
pmconrad Jan 31, 2019
052531b
refactor get_top_markets
oxarbitrage Jan 31, 2019
c0ac898
Moved impl to fee_schedule.hpp
jmjatlanta Feb 1, 2019
2efac1f
Merge pull request #4 from bitshares/oxarbitrage-issue1051
oxarbitrage Feb 1, 2019
11df989
replace smart_ref with shared_ptr
jmjatlanta Feb 1, 2019
04f20af
refactor for in-place construction
oxarbitrage Feb 1, 2019
18ac80a
rename name_or_id with symbol_or_id
oxarbitrage Feb 2, 2019
d256af6
expose get_asset_id_from_string
oxarbitrage Feb 2, 2019
9eab093
change asset id or name to asset id or symbol in descriptions of api.hpp
oxarbitrage Feb 3, 2019
a38b558
change some more docs
oxarbitrage Feb 4, 2019
21a4d76
Fixed crash on empty/invalid node pubkey
pmconrad Feb 4, 2019
5b4e51a
Merge pull request #1272 from oxarbitrage/issue1051
oxarbitrage Feb 4, 2019
f1e4480
Merge pull request #1516 from bitshares/jmj_1504
jmjatlanta Feb 5, 2019
64adf4b
Permit proper copy and move
jmjatlanta Feb 5, 2019
8610119
Merge branch 'develop' into jmj_1548
jmjatlanta Feb 5, 2019
39e6793
revert unnecessary changes to fee_schedule
jmjatlanta Feb 5, 2019
49b6adb
Merge branch 'jmj_1548' of ssh://github.com/bitshares/bitshares-core …
jmjatlanta Feb 5, 2019
82baee3
add network_mapper
oxarbitrage Feb 5, 2019
c539336
Merge pull request #1549 from oxarbitrage/issue842_2
oxarbitrage Feb 5, 2019
cd26cad
Merge pull request #1555 from pmconrad/network_mapper
oxarbitrage Feb 5, 2019
5cefa46
change status of network mapper
oxarbitrage Feb 5, 2019
f66c9a5
bump FC for std::min macOS
jmjatlanta Feb 5, 2019
487bdcc
Merge pull request #1559 from bitshares/oxarbitrage-patch-4
oxarbitrage Feb 5, 2019
c9b3751
Merge pull request #1561 from bitshares/jmj_1560
jmjatlanta Feb 5, 2019
640253d
use move instead of assign
jmjatlanta Feb 5, 2019
d7ca28e
Merge pull request #1562 from bitshares/develop
oxarbitrage Feb 6, 2019
2d5eb6c
add default empty result to get_ticker
oxarbitrage Feb 12, 2019
359e199
Merge pull request #1579 from bitshares/oxarbitrage-patch-1
oxarbitrage Feb 12, 2019
8fea035
Merge pull request #1580 from bitshares/release
oxarbitrage Feb 12, 2019
05233f0
update full node specs
oxarbitrage Feb 13, 2019
8806e6f
add note to clarify new full node requirements
oxarbitrage Feb 13, 2019
27de122
update full nodes setup notes
oxarbitrage Feb 14, 2019
a75531e
Merge pull request #1583 from bitshares/oxarbitrage-patch-2
oxarbitrage Feb 15, 2019
2e708c1
remove last reference to smart_ref
jmjatlanta Feb 15, 2019
f32b981
Resolve #1591: Relocate genesis and add dev genesis
nathanielhourt Feb 15, 2019
e3a3f25
Fix issues according to review comments
Feb 16, 2019
ba463f1
Merge branch 'develop' into issue867
Feb 16, 2019
24f0827
bump fc
oxarbitrage Feb 16, 2019
34c5ad3
Merge pull request #1556 from bitshares/jmj_1548
jmjatlanta Feb 18, 2019
695f34b
Fix compiler warnings
abitmore Feb 16, 2019
35ef375
Merge pull request #1596 from oxarbitrage/bumpfc_websocket
oxarbitrage Feb 18, 2019
ad74de4
Merge pull request #1597 from bitshares/abitmore-patch-1
oxarbitrage Feb 18, 2019
d8999d9
Prove owner->active delegation as discussed in https://github.com/bit…
pmconrad Feb 18, 2019
7a45e60
Convert .txt to .md
nathanielhourt Feb 19, 2019
c337cfe
Merge pull request #1601 from pmconrad/bsips_94
pmconrad Feb 20, 2019
ef2d563
Merge pull request #1592 from nathanhourt/genesis-dev
nathanielhourt Feb 20, 2019
f561563
Improve performance of markets
nathanielhourt Feb 22, 2019
bf60ddd
Merge pull request #1608 from nathanhourt/market-performance
oxarbitrage Feb 22, 2019
1b140d2
Fixed saving keys in wallet
anzhy-chernyavski Feb 25, 2019
68d3e0b
Added test.
anzhy-chernyavski Feb 27, 2019
cf37742
Slightly improve limit order creation performance
abitmore Feb 27, 2019
fe510a2
Merge pull request #1621 from bitshares/abitmore-patch-1
abitmore Feb 27, 2019
fcb3c6b
initialize percent_change in market_ticker constructor
oxarbitrage Feb 27, 2019
0b7cc7e
reject oversized transactions
jmjatlanta Feb 27, 2019
16db597
Merge pull request #1624 from bitshares/jmj_trx_size
jmjatlanta Feb 27, 2019
6cf07a4
add a second contructor for empty ticker
oxarbitrage Feb 27, 2019
6581394
Add sleep to cli_test
abitmore Feb 27, 2019
7de4817
Remove trailing whitespaces in cli_test
abitmore Feb 28, 2019
8a8fc17
fix asset symbols in empty ticker contructor
oxarbitrage Feb 28, 2019
53cf53e
Update coding style
abitmore Feb 28, 2019
91a89a1
fc commit changed
anzhy-chernyavski Feb 28, 2019
f087fe8
initialize lowest_ask and highest_bid
oxarbitrage Feb 28, 2019
9807741
Removed initial_chain_id from example genesis file to avoid confusion
pmconrad Mar 1, 2019
458beae
Merge pull request #1626 from bitshares/1303-cli-test-issues
abitmore Mar 4, 2019
3cd75ae
Merge pull request #1613 from pixelplex/fixed-saving-keys-wallet
abitmore Mar 4, 2019
26ffeef
Merge branch 'develop' into issue867
Mar 4, 2019
fe01e06
Merge pull request #1623 from oxarbitrage/issue1620
oxarbitrage Mar 4, 2019
7e8a6b9
bump database to last release date
oxarbitrage Mar 4, 2019
998ccb8
Merge pull request #1632 from bitshares/oxarbitrage-patch-1
oxarbitrage Mar 4, 2019
5c7d538
Prevent Boost/WinSock.h multiple inclusion
jmjatlanta Mar 5, 2019
d3794a6
Fix uin64_t / safe<int64_t> comparision
jmjatlanta Mar 5, 2019
a328f8c
Merge pull request #1633 from bitshares/jmj_winbuildfix
jmjatlanta Mar 5, 2019
a710a42
Merge pull request #1634 from bitshares/release
oxarbitrage Mar 5, 2019
90ca8f2
Merge pull request #1628 from pmconrad/1069_remove_chain_id
pmconrad Mar 8, 2019
0c5a42f
Add plugin section headers to generated config.ini
abitmore Mar 9, 2019
9c47bbd
Highlight plugin section headers in config.ini
abitmore Mar 9, 2019
a91b447
Merge pull request #1641 from bitshares/1407-plugin-header
oxarbitrage Mar 10, 2019
1edab9d
Avoid segfault in CLI bid_collateral command
xuquan316 Dec 28, 2018
40d4b0b
remove comments and change error message.
xuquan316 Jan 2, 2019
42c19fa
Merge pull request #1649 from bitshares/cli-bid-collateral-error
abitmore Mar 13, 2019
5162ebe
Merge pull request #1515 from bitshares/jmj_macwarn
abitmore Mar 13, 2019
de31b56
Merge pull request #1032 from cifer-lee/issue867
abitmore Mar 13, 2019
a4108e0
Update as per the review comments 1513
manikey123 Jan 15, 2019
3014c38
Merge branch 'develop' into 782_test_p1
manikey123 Mar 18, 2019
df514ac
Update asset_api_tests.cpp
manikey123 Mar 18, 2019
c078ffb
Improve fee_schedule::calculate_fee() performance
abitmore Mar 18, 2019
78cb2c7
updated api.cpp for build failures
manikey123 Mar 19, 2019
ae78c2d
Merge pull request #1513 from manikey123/782_test_p1
pmconrad Mar 20, 2019
5e6e9a1
Merge pull request #1662 from bitshares/performance-calculate-fee
abitmore Mar 22, 2019
88a9a15
Merge branch 'develop' of github.com:bitshares/bitshares-core
nathanielhourt Mar 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Makefile
compile_commands.json
moc_*
*.moc

genesis.json
hardfork.hpp

libraries/utilities/git_revision.cpp
Expand Down
9 changes: 4 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
[submodule "docs"]
path = docs
url = https://github.com/cryptonomex/graphene.wiki.git
path = docs
url = https://github.com/bitshares/bitshares-core.wiki.git
ignore = dirty
[submodule "libraries/fc"]
path = libraries/fc
url = https://github.com/cryptonomex/fc.git
ignore = dirty
path = libraries/fc
url = https://github.com/followmyvote/fc
45 changes: 45 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
language: c++

cache: ccache

git:
depth: 1

dist: xenial

sudo: true

install:
- sudo apt-get install --allow-unauthenticated libboost-thread-dev libboost-iostreams-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-chrono-dev libboost-test-dev libboost-context-dev libboost-regex-dev libboost-coroutine-dev cmake parallel

addons:
sonarcloud:
organization: "flwyiq7go36p6lipr64tbesy5jayad3q"
token:
secure: "Ik4xQhs9imtsFIC1SMAPmdLId9lVadY/4PEgo5tM4M5cQRvyt4xeuMMV+CRIT6tGEEqF71ea74qVJTxT7qinWZ3kmHliFjbqDxk1FbjCpK6NGQDyTdfWMVJFIlk7WefvtGAwFBkf6pSTs553bKNNM0HbBYQGKe08waLwv7R+lOmVjTTKIRF/cCVw+C5QQZdXFnUMTg+mRuUqGk4WvNNPmcBfkX0ekHPrXwAD5ATVS1q0iloA0nzHq8CPNmPE+IyXdPw0EBp+fl3cL9MgrlwRbELxrnCKFy+ObdjhDj7z3FDIxDe+03gVlgd+6Fame+9EJCeeeNLF4G4qNR1sLEvHRqVz12/NYnRU9hQL0c/jJtiUquOJA5+HqrhhB9XUZjS1xbHV3aIU5PR0bdDP6MKatvIVwRhwxwhaDXh7VSimis8eL+LvXT7EO+rGjco0c17RuzZpFCsKmXCej4Q8iDBMdOIWwe2WuWi8zb6MFvnLyK2EcM53hAn2yMwU+nprbpHwzU5oJTFZLD+J78zCSGk7uu7vsF+EEnheMwfqafP9MpMEXGXaXZiq7QKy3KvxQTg+1ozPIu+fgxvY0xdyrjJHOSJlrvXN7osjD4IDTs6D5cLAZ04WGIKsulZDr7ZN5n3gmA9h4cfhJsIEia0uQzLmWnfF6RksxWElK1i1+xmse7E="

env:
global:
- CCACHE_COMPRESS=exists_means_true
- CCACHE_MAXSIZE=1Gi
- CCACHE_SLOPPINESS=include_file_ctime,include_file_mtime,time_macros

script:
- programs/build_helpers/buildstep -s 3500
- ccache -s
- programs/build_helpers/buildstep Prepare 1 "sed -i '/tests/d' libraries/fc/CMakeLists.txt"
- programs/build_helpers/buildstep cmake 5 "cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=--coverage -DCMAKE_CXX_FLAGS=--coverage -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_OUTPUT_EXTENSION_REPLACE=ON ."
- programs/build_helpers/buildstep make.cli_wallet 1600 "programs/build_helpers/make_with_sonar bw-output -j 2 cli_wallet"
- programs/build_helpers/buildstep make.witness_node 300 "programs/build_helpers/make_with_sonar bw-output -j 2 witness_node"
- programs/build_helpers/buildstep make.serializer 45 "programs/build_helpers/make_with_sonar bw-output -j 2 js_operation_serializer"
- programs/build_helpers/buildstep make.get_dev_key 10 "programs/build_helpers/make_with_sonar bw-output -j 2 get_dev_key"
- programs/build_helpers/buildstep make.chain_test 900 "programs/build_helpers/make_with_sonar bw-output -j 2 chain_test"
- programs/build_helpers/buildstep make.cli_test 200 "programs/build_helpers/make_with_sonar bw-output -j 2 cli_test"
- programs/build_helpers/buildstep make.perf_test 120 "programs/build_helpers/make_with_sonar bw-output -j 2 performance_test"
- set -o pipefail
- programs/build_helpers/buildstep run.chain_test 240 "libraries/fc/tests/run-parallel-tests.sh tests/chain_test"
- programs/build_helpers/buildstep run.cli_test 30 "libraries/fc/tests/run-parallel-tests.sh tests/cli_test"
- programs/build_helpers/buildstep prepare.sonar 20 'find libraries/[acdenptuw]*/CMakeFiles/*.dir programs/[cdgjsw]*/CMakeFiles/*.dir -type d | while read d; do gcov -o "$d" "${d/CMakeFiles*.dir//}"/*.cpp; done >/dev/null'
- programs/build_helpers/buildstep run.sonar 400 "which sonar-scanner && sonar-scanner || true"
- programs/build_helpers/buildstep end 0
- ccache -s
75 changes: 42 additions & 33 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Defines Graphene library target.
project( Graphene )
# Defines BitShares library target.
project( BitShares )
cmake_minimum_required( VERSION 2.8.12 )

set( BLOCKCHAIN_NAME "Graphene" )
set( BLOCKCHAIN_NAME "BitShares" )

set( CLI_CLIENT_EXECUTABLE_NAME graphene_client )
set( GUI_CLIENT_EXECUTABLE_NAME Graphene )
set( GUI_CLIENT_EXECUTABLE_NAME BitShares )
set( CUSTOM_URL_SCHEME "gcs" )
set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )

Expand All @@ -23,6 +23,7 @@ endif()
list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )

set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
set(GRAPHENE_EGENESIS_JSON "${CMAKE_CURRENT_SOURCE_DIR}/libraries/egenesis/genesis.json" )

#set (ENABLE_INSTALLER 1)
#set (USE_PCH 1)
Expand All @@ -31,23 +32,25 @@ if (USE_PCH)
include (cotire)
endif(USE_PCH)

list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules" )
option(USE_PROFILER "Build with GPROF support(Linux)." OFF)

IF( NOT WIN32 )
list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules" )
ENDIF( NOT WIN32 )
list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/GitVersionGen" )
include( GetGitRevisionDescription )
get_git_head_revision( GIT_REFSPEC GIT_SHA2 )

SET(BOOST_COMPONENTS)
LIST(APPEND BOOST_COMPONENTS thread
iostreams
date_time
system
filesystem
system
program_options
signals
serialization
chrono
unit_test_framework
context
locale)
context)
SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )

IF( WIN32 )
Expand All @@ -67,7 +70,7 @@ ENDIF()

if( WIN32 )

message( STATUS "Configuring Graphene on WIN32")
message( STATUS "Configuring BitShares on WIN32")
set( DB_VERSION 60 )
set( BDB_STATIC_LIBS 1 )

Expand All @@ -76,12 +79,15 @@ if( WIN32 )

set(CRYPTO_LIB)

#looks like this flag can have different default on some machines.
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
if( MSVC )
add_definitions(-DWIN32_LEAN_AND_MEAN)
#looks like this flag can have different default on some machines.
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")

# Probably cmake has a bug and vcxproj generated for executable in Debug conf. has disabled debug info
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")
# Probably cmake has a bug and vcxproj generated for executable in Debug conf. has disabled debug info
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")
endif ( MSVC )

# On windows tcl should be installed to the directory pointed by setenv.bat script
SET(TCL_INCLUDE_PATH $ENV{TCL_ROOT}/include)
Expand All @@ -100,20 +106,17 @@ if( WIN32 )

else( WIN32 ) # Apple AND Linux

find_library(READLINE_LIBRARIES NAMES readline)
find_path(READLINE_INCLUDE_DIR readline/readline.h)
#if(NOT READLINE_INCLUDE_DIR OR NOT READLINE_LIBRARIES)
# MESSAGE(FATAL_ERROR "Could not find lib readline.")
#endif()

if( APPLE )
# Apple Specific Options Here
message( STATUS "Configuring Graphene on OS X" )
message( STATUS "Configuring BitShares on OS X" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -stdlib=libc++ -Wall" )
else( APPLE )
# Linux Specific Options Here
message( STATUS "Configuring Graphene on Linux" )
message( STATUS "Configuring BitShares on Linux" )
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -Wall" )
if(USE_PROFILER)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg" )
endif( USE_PROFILER )
set( rt_library rt )
set( pthread_library pthread)
if ( NOT DEFINED crypto_library )
Expand All @@ -128,6 +131,10 @@ else( WIN32 ) # Apple AND Linux

if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-memcmp" )
elseif( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" )
endif()
endif()

if( "${CMAKE_GENERATOR}" STREQUAL "Ninja" )
Expand All @@ -142,9 +149,7 @@ else( WIN32 ) # Apple AND Linux

endif( WIN32 )

find_package( BerkeleyDB )

set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build Graphene for code coverage analysis")
set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build BitShares for code coverage analysis")

if(ENABLE_COVERAGE_TESTING)
SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
Expand Down Expand Up @@ -174,18 +179,18 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
set(CPACK_PACKAGE_DESCRIPTION "A client for the Graphene network")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the Graphene network")
set(CPACK_PACKAGE_DESCRIPTION "A client for the BitShares network")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the BitShares network")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Graphene ${CPACK_PACKAGE_VERSION}")
set(CPACK_PACKAGE_INSTALL_DIRECTORY "BitShares ${CPACK_PACKAGE_VERSION}")

if(WIN32)
SET(CPACK_GENERATOR "ZIP;NSIS")
set(CPACK_PACKAGE_NAME "Graphene") # override above
set(CPACK_PACKAGE_NAME "BitShares") # override above
set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
set(CPACK_NSIS_PACKAGE_NAME "Graphene v${CPACK_PACKAGE_VERSION}")
set(CPACK_NSIS_PACKAGE_NAME "BitShares v${CPACK_PACKAGE_VERSION}")
set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"Graphene\\\"")
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"BitShares\\\"")
# it seems like windows zip files usually don't have a single directory inside them, unix tgz frequently do
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)

Expand All @@ -203,3 +208,7 @@ endif(LINUX)

include(CPack)
endif(ENABLE_INSTALLER)

MESSAGE( STATUS "" )
MESSAGE( STATUS "PROFILER: ${USE_PROFILER}" )
MESSAGE( STATUS "" )
98 changes: 0 additions & 98 deletions CMakeModules/FindBerkeleyDB.cmake

This file was deleted.

8 changes: 0 additions & 8 deletions CMakeModules/FindLineman.cmake

This file was deleted.

4 changes: 0 additions & 4 deletions CMakeModules/FindNodeJs.cmake

This file was deleted.

Loading