Commit Graph

66 Commits

Author SHA1 Message Date
Paweł Bylica
95f6627a53 Clean up and remove some explicit dependencies in cmake files 2014-12-19 12:32:36 +01:00
Paweł Bylica
35d8b94e73 Merge branch 'develop' into develop-evmcc
Conflicts:
	CMakeLists.txt
	alethzero/CMakeLists.txt
	eth/CMakeLists.txt
	exp/CMakeLists.txt
	libethereum/CMakeLists.txt
	neth/CMakeLists.txt
	test/CMakeLists.txt
	test/TestHelper.cpp
	windows/Eth.vcxproj
	windows/Ethereum.sln
	windows/LibEthereum.vcxproj
	windows/LibEthereum.vcxproj.filters
	windows/TestEthereum.vcxproj
	windows/TestEthereum.vcxproj.filters
	windows/bootstrap.sh
2014-12-18 19:08:04 +01:00
ethdev
fd275b6d37 fixed msvc not expanding macros correctly 2014-12-17 16:47:22 +01:00
ethdev
8266da7f60 boost library -> libraries 2014-12-15 19:01:20 +01:00
Marek Kotewicz
84b0fc08b7 jsonrpc _library -> _libraries 2014-12-12 13:13:29 +01:00
Marek Kotewicz
3fefc4df0b renamed _DIR -> _DIRS && _LIBRARY -> _LIBRARIES according to cmake guidelines 2014-12-12 12:01:32 +01:00
Marek Kotewicz
bf8a6ed878 fixed styling issues 2014-12-11 15:06:11 +01:00
debris
1d8593a177 added curl libaries, which are required for testeth project 2014-12-09 13:08:02 +01:00
debris
4d00b3d6fe msvc changes in tests, but tests not yet working there 2014-12-09 00:58:02 +01:00
Artur Zawłocki
5353ba1b06 jit-related CMakeLists.txt fixes 2014-12-05 15:21:54 +01:00
Marek Kotewicz
f5ed8c8ce3 common changes 2014-12-01 21:30:00 +01:00
sveneh
8fd474d10b use CMAKE_PREFIX_PATH instead of CMAKE_FILE_ROOT_PATH; removed the
requirement to use EXACT version numbers for dependencies, cleanup
2014-11-27 20:01:34 +01:00
sveneh
5c19ce88ff Merge remote-tracking branch 'debris/mk_jsonrpc_upgrade' into build_enhancement
This basically pulls in libjson-rpc-cpp 0.3.2, updated from previous
0.2.1. v0.3.2 completely changes its own setup, hence such a massive
change

builds fine on Ubuntu, needs check on OS X

Conflicts:
	CMakeLists.txt
	cmake/EthDependenciesDeprecated.cmake
	eth/CMakeLists.txt
	libqethereum/CMakeLists.txt
	libweb3jsonrpc/CMakeLists.txt
	neth/CMakeLists.txt
	test/CMakeLists.txt
2014-11-20 10:55:36 +01:00
Marek Kotewicz
1d278d2857 Merge branch 'develop' into mk_jsonrpc_upgrade
Conflicts:
	alethzero/MainWin.cpp
	libweb3jsonrpc/WebThreeStubServer.cpp
	libweb3jsonrpc/abstractwebthreestubserver.h
	libweb3jsonrpc/spec.json
	test/jsonrpc.cpp
	test/webthreestubclient.h
2014-11-18 11:46:38 +01:00
Artur Zawłocki
07e6049967 fixed libevmjit dependencies in cmake files 2014-11-17 18:10:54 +01:00
sveneh
74a49676be Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
Conflicts:
	alethzero/CMakeLists.txt
	cmake/EthDependenciesDeprecated.cmake
	libdevcrypto/CryptoPP.h
	libdevcrypto/EC.cpp
	third/CMakeLists.txt
2014-11-11 15:04:19 +01:00
sveneh
c492df94fb compiles fine now (on Linux) with both cryptopp and json-rpc-cpp dependencies 2014-11-10 20:31:15 +01:00
Paweł Bylica
6d2979ed5c Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/VM.h
	test/vm.cpp
2014-11-06 17:58:13 +01:00
sveneh
0956402469 full project compile with crypto++ dependency 2014-11-06 15:56:00 +01:00
sveneh
935b56755d ... addition to last commit, these were lost. 2014-11-06 10:41:37 +01:00
Marek Kotewicz
de3e2acdca little cleanup after upgrading jsonrpc 2014-11-04 11:15:16 +01:00
Marek Kotewicz
cde59bdb90 jsonrpc 0.3.0 working, needs cleanup 2014-11-03 16:54:03 +01:00
Christoph Jentzsch
72c7132a3a Merge remote-tracking branch 'upstream/develop' into stateTests
Conflicts:
	test/vmBitwiseLogicOperationTestFiller.json
2014-11-03 16:34:40 +01:00
Christoph Jentzsch
6eeef2762c Clean up and organize tests + state class tests 2014-11-03 16:33:02 +01:00
Paweł Bylica
ea726b8ef8 Merge branch 'develop' into develop-evmcc
Conflicts:
	test/CMakeLists.txt
2014-11-03 10:30:59 +01:00
artur-zawlocki
609d460025 CMakeLists updated, should now build without LLVM when EVMJIT is not enabled [#81588646] 2014-10-30 16:42:44 +00:00
Paweł Bylica
f8c396c4c1 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/ExtVMFace.h
	libevm/VM.h
	test/vm.cpp
	test/vm.h
	windows/LibEthereum.vcxproj.filters
2014-10-28 12:26:45 +01:00
Marek Kotewicz
ac3ac9095a checked headless builds with and without jsonrpc 2014-10-24 16:14:00 +02:00
Marek Kotewicz
b072b8687a ethrpc -> web3jsonrpc, other issues fixed 2014-10-24 14:21:20 +02:00
Marek Kotewicz
b884866962 Merge branch 'develop' into mk_jsonrpc 2014-10-23 18:04:55 +02:00
Marek Kotewicz
fac4e8ffd6 jsonrpc library dependency made mandatory 2014-10-23 17:12:04 +02:00
Gav Wood
076f58fe24 Merge pull request #381 from chriseth/solidity
Solidity parser - not polished yet, but usable
2014-10-23 16:05:42 +02:00
artur-zawlocki
af47913b16 cmake: added dependency on libevmjit to target createRandomTest 2014-10-21 15:00:09 +01:00
Paweł Bylica
c50afdef18 Merge branch 'develop' into develop-evmcc
Conflicts:
	libevm/FeeStructure.cpp
	test/vm.cpp
2014-10-21 14:44:09 +02:00
artur-zawlocki
3fed069873 Updated cmake files after moving the jit compiler to a lib. 2014-10-20 16:12:00 +01:00
Marek Kotewicz
6adaa743f2 Merge branch 'develop' into mk_jsonrpc
Conflicts:
	alethzero/MainWin.cpp
	libqethereum/QEthereum.cpp
	libqethereum/QEthereum.h
	third/MainWin.cpp
2014-10-20 08:24:18 +02:00
Christoph Jentzsch
02f60e1a53 Update CMakeLists.txt 2014-10-18 14:32:26 +02:00
Christoph Jentzsch
21457052fd Make all exceptions dervie virtual 2014-10-18 14:27:23 +02:00
Marek Kotewicz
022300c1ca added headers to ethrpc cmake 2014-10-16 16:28:42 +02:00
subtly
1e29956b58 add headers to cmake 2014-10-16 15:10:54 +02:00
Christoph Jentzsch
5b3c47aa05 Added random test creater 2014-10-14 13:22:49 +02:00
Marek Kotewicz
d47f9be775 ethrpc separated && first tests 2014-10-13 12:28:53 +02:00
Marek Kotewicz
96f5f40dd8 preparing for tests 2014-10-13 11:22:28 +02:00
Christian
a1f32a0b26 Solidity scanner and some unit tests.
The scanner is a modified version of the v8 javascript scanner.
2014-10-08 11:11:50 +02:00
Gav Wood
45607201ab Build fixes. 2014-07-06 13:13:37 +02:00
Gav Wood
d9340fb74a Windows build coersions. 2014-07-03 15:00:22 +02:00
Gav Wood
d8e04c43b1 Full python serpent support.
Shared libs on all platforms.
2014-06-28 19:23:32 +02:00
Gav Wood
b9b7fa2078 Remove build cruft. 2014-05-05 16:49:56 +01:00
Gav Wood
3a2597d871 Split out libethcore from libethereum. 2014-04-23 15:08:11 +01:00
Jeffrey Lee
2b0b259f7b fixed Ubuntu12.04 compile error 2014-03-07 08:19:00 +08:00