Commit graph

99 commits

Author SHA1 Message Date
Doyle 86d77912ae Ability to vendor libsodium 1.0.18 -D DOWNLOAD_SODIUM=[ON|OFF|FORCE]
DownloadLibsodium taken from loki-network and mostly adapted from
libzmq's cmake file in lokimq.
2020-03-06 17:26:02 +11:00
Jason Rhinelander 04f614705e Use pkg-config for unbound and miniupnpc
We unnecessarily vendor this much of the time because the existing
search code is primitive; use pkg-config instead which works much
better, and lets us properly depend on particular versions.

This lets us reenable the system miniupnpc for >=2.1, saving an
unnecessary compilation most of the time.  From the git history it
appears that it is built from source always unconditionally in a fit of
rage.
2019-12-03 00:51:18 -04:00
Doyle 639d7456f7 Merge commit '1d5e8f4' into LokiMergeUpstream 2019-06-26 13:04:37 +10:00
Howard Chu 1dc4ebfd6c
Use 9 digit build IDs 2019-06-12 16:47:33 +01:00
Doyle 27dc2f88fa Merge commit 'c0bc6d9' into LokiMergeUpstream 2019-05-17 03:54:20 +10:00
Doyle 170e841a12
Merge pull request #590 from Doy-lee/LokiMergeUpstream
Loki Merge Upstream 2019-05-07 2bf855e
2019-05-16 13:15:49 -04:00
Doyle 277586417a Merge commit '96696d1' into LokiMergeUpstream 2019-05-02 11:13:33 +10:00
Jason Rhinelander 6d44629bd5 Add missing depends to version.cpp generator (#583)
When git is installed and you aren't building a release tag, the command
that generates build/version.cpp never gets reinvoked if the generated
version.cpp already exists, so if you build, pull a new update, then
rebuild you get the wrong version everywhere.

(This still isn't perfect--if you change commits within the same version
you end up with the wrong commit tag in the version--but at least the
version itself will be right.)
2019-05-02 11:13:03 +10:00
moneromooo-monero 7d5cc0358b
cmake: fix some case of "backtrace lib not found" breaking
It fixes at least one case of building on ARM with Docker
2019-05-01 10:11:41 +00:00
Doyle 5374632e2f Merge commit '1f809e7' into LokiMergeUpstream 2019-05-01 17:06:47 +10:00
Riccardo Spagni 613588e1a8
Merge pull request #5410
d4a78c74 build: libusb static compilation fix (Dusan Klinec)
2019-04-16 22:35:16 +02:00
Doyle 550e56ac1e Merge commit 'c88e9921043d7c40f023d24c3a3f39f2e96f8738' into LokiMergeUpstream 2019-04-12 14:17:05 +10:00
Martijn Otto 8df827075f
Fix linker issues using easylogging 2019-04-10 11:37:02 +02:00
Dusan Klinec d4a78c74ac
build: libusb static compilation fix 2019-04-07 18:52:25 +02:00
Riccardo Spagni 4c91eb23a0
Merge pull request #5061
1f2930ce Update 2019 copyright (binaryFate)
2019-03-17 17:49:30 +02:00
binaryFate 1f2930ce0b Update 2019 copyright 2019-03-05 22:05:34 +01:00
Dusan Klinec 5ea17909ca
device/trezor: debugging features, trezor tests 2019-03-05 14:02:45 +01:00
doy-lee 9eefb869f8 Merge commit '69e8567' into LokiMergeUpstream 2019-01-17 15:57:30 +11:00
doy-lee f5b17fc86e Merge commit '6bc0c7e' into LokiMergeUpstream 2018-12-19 12:25:48 +11:00
Dusan Klinec e37154a879
build: protobuf dependency fixes, libusb build
- docker protobuf dependencies, cross-compilation
- device/trezor protobuf build fixes, try_compile
- libusb built under all platforms, used by trezor for direct connect
2018-12-18 16:50:19 +01:00
doy-lee a07c5d9cba Merge commit '58ce16d' into LokiMergeUpstream 2018-12-10 14:54:27 +11:00
Dusan Klinec d71f89e2a2
device/trezor: device/trezor: correct device initialization, status check
- checks if the device is in the correct usable state
- implements check for the v2.0.9 firmware which does not support payment IDs
- simple transacttion check, payment id fmt consistency
- minor fixes, refactoring, webusb session counting fix
2018-12-04 20:12:03 +01:00
Dusan Klinec 2ffe53d9e6
device/trezor: webusb transport added, cmake fixes
- webusb transport based on libusb added. Provides direct access to Trezor via USB, no need for Trezor bridge.
- trezor protocol message handler improved, no recursion used. Ready for upcoming integration tests.
- libusb (for docker) bumped from v1.0.9 to v1.0.22, newer version required for webusb transport, for device enumeration.
- cmake improvements and fixes. Cmake Trezor checks are moved to a dedicated CheckTrezor.cmake file. In case of a problem Trezor is excluded from build.
- ifdefs made consistent to Ledger.
- UDP Transport enumeration disabled by default in release mode
2018-11-25 11:57:19 +01:00
doy-lee 8f03bb3fd7 Merge commit '8534f71' into LokiMergeUpstream 2018-11-12 14:55:42 +11:00
moneromooo-monero dff0adfee5
cmake: fix readline detection when the readline library is not found 2018-10-26 11:47:15 +00:00
doy-lee 339f96b0cc Merge commit 'c23b6f8' into LokiMergeUpstreamUntil_20181010_77e1ebf 2018-10-10 15:07:16 +11:00
doy-lee cf32598ec5 Merge commit 'cd8c7f6' into LokiMergeUpstreamUntil_20181010_77e1ebf 2018-10-10 14:38:40 +11:00
doy-lee d3501cfc73 Merge commit '4a1744e' into LokiMergeUpstreamUntil_20180911_e6d36c1 2018-10-10 13:28:43 +11:00
doy-lee 2d3adf003b Merge commit '7addabc' into LokiMergeUpstreamUntil_20180911_e6d36c1 2018-10-10 10:30:31 +11:00
iDunk5400 cbdd6b910b
Linux: Fix building of static binaries with hw device support
This should enable building static binaries on Linux systems where dependencies are already built with -fPIC, such as Ubuntu 18.04.
2018-10-06 16:48:14 +02:00
Riccardo Spagni 8e07e26555
Merge pull request #4425
a69271fa Fixed a typo (Piotr Kąkol)
2018-09-29 22:19:47 +02:00
cslashm bb6e3bbc0f Replace USB-CCID (smartcard) by USB-HID
Remove PCSC dependencies which is a bit hard (not user friendly) to install on linux and Mac

Split Ledger logic and device IO
2018-09-24 21:57:42 +02:00
doy-lee b64d7048a3 Merge commit '94ed562' into LokiMergeUpstream20180821 2018-09-19 14:15:55 +10:00
Riccardo Spagni 9c40bc62fc
Merge pull request #3430
42397359 Fixup 32bit arm build (TheCharlatan)
a06d2581 Fix Windows build (TheCharlatan)
ecaf5b3f Add libsodium to the packages, the arm build was complaining about it. (TheCharlatan)
cbbf4d24 Adapt translations to upstream changes (TheCharlatan)
db571546 Updated pcsc url (TheCharlatan)
f0ba19fd Add lrelease to the depends (TheCharlatan)
cfb30462 Add Miniupnp submodule (TheCharlatan)
5f7da005 Unbound is now a submodule. Adapt depends for this. (TheCharlatan)
d6b9bdd3 Update readmes to reflect the usage of depends (TheCharlatan)
56b6e41e Add support for apple and arm building (TheCharlatan)
29311fd1 Disable stack unwinding for mingw32 depends build. (TheCharlatan)
8db3d573 Modify depends for monero's dependencies (TheCharlatan)
0806a23a Initial depends addition (TheCharlatan)
2018-09-18 16:33:21 +02:00
TheCharlatan cfb3046222 Add Miniupnp submodule
Drop miniupnp and unbound depends builds. Make sure that build variables are propageted properly to unbound and miniupnp.
Rebase to after the v0.12 release
2018-09-10 22:05:37 +02:00
iDunk5400 6929b52426
Windows: don't preset CMAKE_SYSTEM_NAME
Let it be autodiscovered instead to avoid cmake thinking it's crosscompiling builds where host = target. This resolves a cmake configure error in MSYS2 caused by CMAKE_CROSSCOMPILING checks in #4294.
2018-09-06 12:56:21 +02:00
Doyle T 54d91548de Merge branch 'dev' into LokiMergeUpstream 2018-09-05 12:07:29 +10:00
Doyle T 06c80f48a5 Fix readline for linux by adding ncurses and finding libtinfo first 2018-08-22 11:12:38 +10:00
Doyle T fd381013aa Merge commit '9a3bd88' into LokiMergeUpstream 2018-08-21 13:17:22 +10:00
Doyle T 8c936836d2 Merge commit 'b3363e8' into LokiMergeUpstream 2018-08-17 14:49:12 +10:00
jcktm 4f5159c90a Revert "Fix readline not found on windows and linux"
This reverts commit 153b925f6b.
2018-08-15 14:46:13 +10:00
sachaaaaa 153b925f6b Fix readline not found on windows and linux 2018-08-15 13:56:23 +10:00
sachaaaaa dc7323ff34 Fix designated initializers + add CD/CI badge (#100)
* add gitlab config file for CD/CI

* formatting

* Update readme to display CI badge

* Replace designated initializers with aggregate initializers

* CD/CI for mac

* use git fetch for cli instead of clone

* CD/CI for windows
2018-07-20 15:16:12 +10:00
einsteinsfool 7cdd147da5 Changed URLs to HTTPS 2018-06-23 21:15:29 +02:00
luigi1111 61f3916b4a
Merge pull request #3844
bdf5a3a Fix PCSC compilation under windows (cslashm)
f17383a Fix CMAKE config for PCSC in order to avoid msys DLL dependencies (cslashm)
2018-06-19 12:49:30 -05:00
luigi1111 53b5d03b82
Merge pull request #3708
a7ce392 Updating the FindReadline CMake hint to search in homebrew's default directory (gene-telligent)
2018-06-16 13:57:54 -05:00
jcktm f0740b9a5e Merge remote-tracking branch 'monero/master' into dev 2018-06-08 16:40:07 +10:00
cslashm f17383afc2 Fix CMAKE config for PCSC in order to avoid msys DLL dependencies
merge of PR #3886
2018-05-31 15:30:16 +02:00
cslashm bdf5a3ad3f Fix PCSC compilation under windows
PR3843 based on release-v0.12 => rebased on master
2018-05-23 10:22:55 +02:00
moneromooo-monero a5c98609a1
version.cmake: fix configuring version.cpp without git 2018-05-15 18:40:16 +01:00